@volar/typescript 2.2.3 → 2.2.5

package/lib/node/decorateLanguageService.js

@@ -415,9 +415,9 @@ function decorateLanguageService(language, languageService) {
                 // TODO reuse the logic from language service
                 if ((0, language_core_1.isSemanticTokensEnabled)(mapping.data) && mapping.sourceOffsets[0] >= span.start && mapping.sourceOffsets[0] <= span.start + span.length) {
                     start ??= mapping.generatedOffsets[0];
-                    end ??= mapping.generatedOffsets[mapping.generatedOffsets.length - 1] + mapping.lengths[mapping.lengths.length - 1];
+                    end ??= mapping.generatedOffsets[mapping.generatedOffsets.length - 1] + (mapping.generatedLengths ?? mapping.lengths)[mapping.lengths.length - 1];
                     start = Math.min(start, mapping.generatedOffsets[0]);
-                    end = Math.max(end, mapping.generatedOffsets[mapping.generatedOffsets.length - 1] + mapping.lengths[mapping.lengths.length - 1]);
+                    end = Math.max(end, mapping.generatedOffsets[mapping.generatedOffsets.length - 1] + (mapping.generatedLengths ?? mapping.lengths)[mapping.lengths.length - 1]);
                 }
             }
             start ??= 0;

package/lib/node/decorateLanguageServiceHost.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchExternalFiles = exports.decorateLanguageServiceHost = void 0;
 const resolveModuleName_1 = require("../resolveModuleName");
 function decorateLanguageServiceHost(ts, language, languageServiceHost) {
-    const extensions = language.plugins
+    const pluginExtensions = language.plugins
         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
         .flat();
     const scripts = new Map();
@@ -17,16 +17,16 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
     if (readDirectory) {
         languageServiceHost.readDirectory = (path, extensions, exclude, include, depth) => {
             if (extensions) {
-                for (const ext of extensions) {
+                for (const ext of pluginExtensions) {
                     if (!extensions.includes(ext)) {
-                        extensions = [...extensions, ...ext];
+                        extensions = [...extensions, ext];
                     }
                 }
             }
             return readDirectory(path, extensions, exclude, include, depth);
         };
     }
-    if (extensions.length) {
+    if (pluginExtensions.length) {
         const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, language.plugins, fileName => language.scripts.get(fileName));
         const getCanonicalFileName = languageServiceHost.useCaseSensitiveFileNames?.()
             ? (fileName) => fileName
@@ -34,7 +34,7 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
         const moduleResolutionCache = ts.createModuleResolutionCache(languageServiceHost.getCurrentDirectory(), getCanonicalFileName, languageServiceHost.getCompilationSettings());
         if (resolveModuleNameLiterals) {
             languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, ...rest) => {
-                if (moduleLiterals.every(name => !extensions.some(ext => name.text.endsWith(ext)))) {
+                if (moduleLiterals.every(name => !pluginExtensions.some(ext => name.text.endsWith(ext)))) {
                     return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, ...rest);
                 }
                 return moduleLiterals.map(moduleLiteral => {
@@ -44,7 +44,7 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
         }
         if (resolveModuleNames) {
             languageServiceHost.resolveModuleNames = (moduleNames, containingFile, reusedNames, redirectedReference, options, containingSourceFile) => {
-                if (moduleNames.every(name => !extensions.some(ext => name.endsWith(ext)))) {
+                if (moduleNames.every(name => !pluginExtensions.some(ext => name.endsWith(ext)))) {
                     return resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, options, containingSourceFile);
                 }
                 return moduleNames.map(moduleName => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.2.3",
+	"version": "2.2.5",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,13 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.2.3",
+		"@volar/language-core": "2.2.5",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.2.3"
+		"@volar/language-service": "2.2.5"
 	},
-	"gitHead": "189ea5c663630358a9ad965c50d2bee69a9d84eb"
+	"gitHead": "ee4aaa9da58c4c942d6cb74f9028d19b7ef4465d"
 }