@volar/language-server
Advanced tools
Comparing version
@@ -137,5 +137,5 @@ Object.defineProperty(exports, "__esModule", { value: true }); | ||
for (const plugin of plugins) { | ||
if ((_u = plugin.languageService) === null || _u === void 0 ? void 0 : _u.semanticTokenLegend) { | ||
server.semanticTokensProvider.legend.tokenModifiers = server.semanticTokensProvider.legend.tokenModifiers.concat(plugin.languageService.semanticTokenLegend.tokenModifiers); | ||
server.semanticTokensProvider.legend.tokenTypes = server.semanticTokensProvider.legend.tokenTypes.concat(plugin.languageService.semanticTokenLegend.tokenTypes); | ||
if ((_u = plugin.semanticService) === null || _u === void 0 ? void 0 : _u.semanticTokenLegend) { | ||
server.semanticTokensProvider.legend.tokenModifiers = server.semanticTokensProvider.legend.tokenModifiers.concat(plugin.semanticService.semanticTokenLegend.tokenModifiers); | ||
server.semanticTokensProvider.legend.tokenTypes = server.semanticTokensProvider.legend.tokenTypes.concat(plugin.semanticService.semanticTokenLegend.tokenTypes); | ||
} | ||
@@ -142,0 +142,0 @@ } |
@@ -97,3 +97,3 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { | ||
for (const plugin of plugins) { | ||
(_b = (_a = plugin.documentService) === null || _a === void 0 ? void 0 : _a.onInitialize) === null || _b === void 0 ? void 0 : _b.call(_a, connection); | ||
(_b = (_a = plugin.syntacticService) === null || _a === void 0 ? void 0 : _a.onInitialize) === null || _b === void 0 ? void 0 : _b.call(_a, connection); | ||
} | ||
@@ -117,3 +117,3 @@ }); | ||
for (const plugin of plugins) { | ||
(_b = (_a = plugin.languageService) === null || _a === void 0 ? void 0 : _a.onInitialize) === null || _b === void 0 ? void 0 : _b.call(_a, connection, getLanguageService); | ||
(_b = (_a = plugin.semanticService) === null || _a === void 0 ? void 0 : _a.onInitialize) === null || _b === void 0 ? void 0 : _b.call(_a, connection, getLanguageService); | ||
} | ||
@@ -120,0 +120,0 @@ function getLanguageService(uri) { |
@@ -29,3 +29,3 @@ /// <reference types="node" /> | ||
extraFileExtensions: ts.FileExtensionInfo[]; | ||
languageService?: { | ||
semanticService?: { | ||
semanticTokenLegend?: vscode.SemanticTokensLegend; | ||
@@ -37,3 +37,3 @@ resolveLanguageServiceHost?(ts: typeof import('typescript/lib/tsserverlibrary'), sys: FileSystem, tsConfig: string | ts.CompilerOptions, host: embedded.LanguageServiceHost): B; | ||
}; | ||
documentService?: { | ||
syntacticService?: { | ||
getLanguageModules?(ts: typeof import('typescript/lib/tsserverlibrary'), env: embeddedLS.LanguageServicePluginContext['env']): embedded.EmbeddedLanguageModule[]; | ||
@@ -40,0 +40,0 @@ getServicePlugins?(context: embeddedLS.DocumentServiceRuntimeContext): embeddedLS.LanguageServicePlugin[]; |
@@ -38,3 +38,3 @@ Object.defineProperty(exports, "__esModule", { value: true }); | ||
getLanguageModules() { | ||
return plugins.map(plugin => { var _a, _b, _c; return (_c = (_b = (_a = plugin.documentService) === null || _a === void 0 ? void 0 : _a.getLanguageModules) === null || _b === void 0 ? void 0 : _b.call(_a, ts, env)) !== null && _c !== void 0 ? _c : []; }).flat(); | ||
return plugins.map(plugin => { var _a, _b, _c; return (_c = (_b = (_a = plugin.syntacticService) === null || _a === void 0 ? void 0 : _a.getLanguageModules) === null || _b === void 0 ? void 0 : _b.call(_a, ts, env)) !== null && _c !== void 0 ? _c : []; }).flat(); | ||
}, | ||
@@ -44,3 +44,3 @@ getPlugins() { | ||
...(0, config_1.loadCustomPlugins)(rootUri.fsPath), | ||
...plugins.map(plugin => { var _a, _b, _c; return (_c = (_b = (_a = plugin.documentService) === null || _a === void 0 ? void 0 : _a.getServicePlugins) === null || _b === void 0 ? void 0 : _b.call(_a, serviceContext)) !== null && _c !== void 0 ? _c : []; }).flat(), | ||
...plugins.map(plugin => { var _a, _b, _c; return (_c = (_b = (_a = plugin.syntacticService) === null || _a === void 0 ? void 0 : _a.getServicePlugins) === null || _b === void 0 ? void 0 : _b.call(_a, serviceContext)) !== null && _c !== void 0 ? _c : []; }).flat(), | ||
]; | ||
@@ -47,0 +47,0 @@ }, |
@@ -44,3 +44,3 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { | ||
if (!vueLs) { | ||
const languageModules = plugins.map(plugin => { var _a, _b, _c; return (_c = (_b = (_a = plugin.languageService) === null || _a === void 0 ? void 0 : _a.getLanguageModules) === null || _b === void 0 ? void 0 : _b.call(_a, languageServiceHost)) !== null && _c !== void 0 ? _c : []; }).flat(); | ||
const languageModules = plugins.map(plugin => { var _a, _b, _c; return (_c = (_b = (_a = plugin.semanticService) === null || _a === void 0 ? void 0 : _a.getLanguageModules) === null || _b === void 0 ? void 0 : _b.call(_a, languageServiceHost)) !== null && _c !== void 0 ? _c : []; }).flat(); | ||
const languageContext = embedded.createEmbeddedLanguageServiceHost(languageServiceHost, languageModules); | ||
@@ -53,3 +53,3 @@ const languageServiceContext = embeddedLS.createLanguageServiceContext({ | ||
...(0, config_1.loadCustomPlugins)(languageServiceHost.getCurrentDirectory()), | ||
...plugins.map(plugin => { var _a, _b, _c; return (_c = (_b = (_a = plugin.languageService) === null || _a === void 0 ? void 0 : _a.getServicePlugins) === null || _b === void 0 ? void 0 : _b.call(_a, languageServiceHost, vueLs)) !== null && _c !== void 0 ? _c : []; }).flat(), | ||
...plugins.map(plugin => { var _a, _b, _c; return (_c = (_b = (_a = plugin.semanticService) === null || _a === void 0 ? void 0 : _a.getServicePlugins) === null || _b === void 0 ? void 0 : _b.call(_a, languageServiceHost, vueLs)) !== null && _c !== void 0 ? _c : []; }).flat(), | ||
]; | ||
@@ -147,4 +147,4 @@ }, | ||
for (const plugin of plugins) { | ||
if ((_a = plugin.languageService) === null || _a === void 0 ? void 0 : _a.resolveLanguageServiceHost) { | ||
host = plugin.languageService.resolveLanguageServiceHost(ts, sys, tsConfig, host); | ||
if ((_a = plugin.semanticService) === null || _a === void 0 ? void 0 : _a.resolveLanguageServiceHost) { | ||
host = plugin.semanticService.resolveLanguageServiceHost(ts, sys, tsConfig, host); | ||
} | ||
@@ -151,0 +151,0 @@ } |
{ | ||
"name": "@volar/language-server", | ||
"version": "1.0.0-beta.8", | ||
"version": "1.0.0-rc.0", | ||
"main": "out/index.js", | ||
@@ -20,7 +20,7 @@ "license": "MIT", | ||
"dependencies": { | ||
"@volar/language-core": "1.0.0-beta.8", | ||
"@volar/language-service": "1.0.0-beta.8", | ||
"@volar/shared": "1.0.0-beta.8", | ||
"@volar/language-core": "1.0.0-rc.0", | ||
"@volar/language-service": "1.0.0-rc.0", | ||
"@volar/shared": "1.0.0-rc.0", | ||
"request-light": "^0.5.8", | ||
"typesafe-path": "^0.2.0", | ||
"typesafe-path": "^0.2.1", | ||
"vscode-html-languageservice": "^5.0.1", | ||
@@ -32,3 +32,3 @@ "vscode-languageserver": "^8.0.2", | ||
}, | ||
"gitHead": "7c437b60144d4160410eb96e644e09665daeee6d" | ||
"gitHead": "bababc1749ade3db8ea967fb16130fa6b09d4992" | ||
} |
248881
0+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
Updated
Updated