@volar/typescript 2.4.14 → 2.4.16

package/lib/node/proxyCreateProgram.js

@@ -151,12 +151,12 @@ function proxyCreateProgram(ts, original, create) {
                 const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, ts.sys.getFileSize, originalHost, language.plugins, fileName => language.scripts.get(fileName));
                 const resolveModuleNameLiterals = originalHost.resolveModuleNameLiterals;
                 const resolveModuleNames = originalHost.resolveModuleNames;
-                options.host.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, compilerOptions, ...rest) => {
+                options.host.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, compilerOptions, containingSourceFile, ...rest) => {
                     if (resolveModuleNameLiterals && moduleLiterals.every(name => !extensions.some(ext => name.text.endsWith(ext)))) {
-                        return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, compilerOptions, ...rest);
+                        return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, compilerOptions, containingSourceFile, ...rest);
                     }
                     return moduleLiterals.map(moduleLiteral => {
-                        return resolveModuleName(moduleLiteral.text, containingFile, compilerOptions, moduleResolutionCache, redirectedReference);
+                        return resolveModuleName(moduleLiteral.text, containingFile, compilerOptions, moduleResolutionCache, redirectedReference, containingSourceFile.impliedNodeFormat);
                     });
                 };
                 options.host.resolveModuleNames = (moduleNames, containingFile, reusedNames, redirectedReference, compilerOptions, containingSourceFile) => {
@@ -164,7 +164,7 @@ function proxyCreateProgram(ts, original, create) {
                         return resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, compilerOptions, containingSourceFile);
                     }
                     return moduleNames.map(moduleName => {
-                        return resolveModuleName(moduleName, containingFile, compilerOptions, moduleResolutionCache, redirectedReference).resolvedModule;
+                        return resolveModuleName(moduleName, containingFile, compilerOptions, moduleResolutionCache, redirectedReference, containingSourceFile?.impliedNodeFormat).resolvedModule;
                     });
                 };
             }

package/lib/node/proxyLanguageService.js

@@ -836,40 +836,14 @@ function provideInlayHints(language, provideInlayHints) {
             return [];
         }
         if (serviceScript) {
-            let start;
-            let end;
             const map = language.maps.get(serviceScript.code, sourceScript);
-            for (const mapping of map.mappings) {
-                if (!(0, language_core_1.isInlayHintsEnabled)(mapping.data)) {
-                    continue;
-                }
-                let mappingStart = mapping.sourceOffsets[0];
-                let genStart;
-                let genEnd;
-                if (mappingStart >= span.start && mappingStart <= span.start + span.length) {
-                    genStart = mapping.generatedOffsets[0];
-                    genEnd = mapping.generatedOffsets[mapping.generatedOffsets.length - 1]
-                        + (mapping.generatedLengths ?? mapping.lengths)[mapping.generatedOffsets.length - 1];
-                }
-                else if (mappingStart < span.start && span.start < mappingStart + mapping.lengths[0]
-                    && mapping.sourceOffsets.length == 1
-                    && (!mapping.generatedLengths || mapping.generatedLengths[0] === mapping.lengths[0])) {
-                    genStart = mapping.generatedOffsets[0] + span.start - mappingStart;
-                    genEnd = Math.min(genStart + span.length, mapping.generatedOffsets[0] + mapping.lengths[0]);
-                }
-                else {
-                    continue;
-                }
-                start = Math.min(start ?? genStart, genStart);
-                end = Math.max(end ?? genEnd, genEnd);
-            }
-            if (start === undefined || end === undefined) {
-                start = 0;
-                end = 0;
+            const mapped = (0, language_core_1.findOverlapCodeRange)(span.start, span.start + span.length, map, language_core_1.isSemanticTokensEnabled);
+            if (!mapped) {
+                return [];
             }
             const mappingOffset = (0, transform_1.getMappingOffset)(language, serviceScript);
-            start += mappingOffset;
-            end += mappingOffset;
+            const start = mapped.start + mappingOffset;
+            const end = mapped.end + mappingOffset;
             const result = provideInlayHints(targetScript.id, { start, length: end - start }, preferences);
             const hints = [];
             for (const hint of result) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.4.14",
+	"version": "2.4.16",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.14",
+		"@volar/language-core": "2.4.16",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.4.14"
+		"@volar/language-service": "2.4.16"
 	},
-	"gitHead": "e8280897a7bc0e0366f657b6aefd4230ad5ee027"
+	"gitHead": "e0233d53110b4d59ecf6f40844bf3aa53b155653"
 }