@volar/typescript 2.4.12 → 2.4.14

package/lib/node/proxyCreateProgram.js

@@ -170,8 +170,6 @@ function proxyCreateProgram(ts, original, create) {
             }
             const program = Reflect.apply(target, thisArg, args);
             (0, decorateProgram_1.decorateProgram)(language, program);
-            // TODO: #128
-            program.__volar__ = { language };
             return program;
         },
     });

package/lib/node/proxyLanguageService.js

@@ -140,10 +140,9 @@ function getFormattingEditsForRange(language, getFormattingEditsForRange) {
             return [];
         }
         if (serviceScript) {
-            const generateStart = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, start, language_core_1.isFormattingEnabled);
-            const generateEnd = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, end, language_core_1.isFormattingEnabled);
-            if (generateStart !== undefined && generateEnd !== undefined) {
-                const edits = getFormattingEditsForRange(targetScript.id, generateStart, generateEnd, options);
+            const generatedRange = (0, transform_1.toGeneratedRange)(language, serviceScript, sourceScript, start, end, language_core_1.isFormattingEnabled);
+            if (generatedRange !== undefined) {
+                const edits = getFormattingEditsForRange(targetScript.id, generatedRange[0], generatedRange[1], options);
                 return edits
                     .map(edit => (0, transform_1.transformTextChange)(sourceScript, language, serviceScript, edit, false, language_core_1.isFormattingEnabled)?.[1])
                     .filter(edit => !!edit);
@@ -535,10 +534,9 @@ function getCodeFixesAtPosition(language, getCodeFixesAtPosition) {
             return [];
         }
         if (serviceScript) {
-            const generateStart = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, start, language_core_1.isCodeActionsEnabled);
-            const generateEnd = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, end, language_core_1.isCodeActionsEnabled);
-            if (generateStart !== undefined && generateEnd !== undefined) {
-                fixes = getCodeFixesAtPosition(targetScript.id, generateStart, generateEnd, errorCodes, formatOptions, preferences);
+            const generateRange = (0, transform_1.toGeneratedRange)(language, serviceScript, sourceScript, start, end, language_core_1.isCodeActionsEnabled);
+            if (generateRange !== undefined) {
+                fixes = getCodeFixesAtPosition(targetScript.id, generateRange[0], generateRange[1], errorCodes, formatOptions, preferences);
             }
         }
         else {
@@ -562,23 +560,17 @@ function getEncodedSemanticClassifications(language, getEncodedSemanticClassific
             };
         }
         if (serviceScript) {
-            let start;
-            let end;
             const map = language.maps.get(serviceScript.code, targetScript);
-            for (const mapping of map.mappings) {
-                // 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.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.generatedLengths ?? mapping.lengths)[mapping.lengths.length - 1]);
-                }
+            const mapped = (0, language_core_1.findOverlapCodeRange)(span.start, span.start + span.length, map, language_core_1.isSemanticTokensEnabled);
+            if (!mapped) {
+                return {
+                    spans: [],
+                    endOfLineState: 0
+                };
             }
-            start ??= 0;
-            end ??= targetScript.snapshot.getLength();
             const mappingOffset = (0, transform_1.getMappingOffset)(language, serviceScript);
-            start += mappingOffset;
-            end += mappingOffset;
+            const start = mapped.start + mappingOffset;
+            const end = mapped.end + mappingOffset;
             const result = getEncodedSemanticClassifications(targetScript.id, { start, length: end - start }, format);
             const spans = [];
             for (let i = 0; i < result.spans.length; i += 3) {

package/lib/node/transform.d.ts

@@ -22,6 +22,7 @@ export declare function transformTextSpan(sourceScript: SourceScript<string> | u
 export declare function toSourceOffset(sourceScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, position: number, filter: (data: CodeInformation) => boolean): [fileName: string, offset: number] | undefined;
 export declare function toSourceRanges(sourceScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, start: number, end: number, fallbackToAnyMatch: boolean, filter: (data: CodeInformation) => boolean): Generator<[fileName: string, start: number, end: number]>;
 export declare function toSourceOffsets(sourceScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, position: number, filter: (data: CodeInformation) => boolean): Generator<[fileName: string, offset: number]>;
+export declare function toGeneratedRange(language: Language, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, start: number, end: number, filter: (data: CodeInformation) => boolean): readonly [number, number] | undefined;
 export declare function toGeneratedRanges(language: Language, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, start: number, end: number, filter: (data: CodeInformation) => boolean): Generator<readonly [number, number], void, unknown>;
 export declare function toGeneratedOffset(language: Language, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
 export declare function toGeneratedOffsets(language: Language, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, position: number, filter: (data: CodeInformation) => boolean): Generator<readonly [number, import("@volar/language-core").Mapping<CodeInformation>], void, unknown>;

package/lib/node/transform.js

@@ -11,6 +11,7 @@ exports.transformTextSpan = transformTextSpan;
 exports.toSourceOffset = toSourceOffset;
 exports.toSourceRanges = toSourceRanges;
 exports.toSourceOffsets = toSourceOffsets;
+exports.toGeneratedRange = toGeneratedRange;
 exports.toGeneratedRanges = toGeneratedRanges;
 exports.toGeneratedOffset = toGeneratedOffset;
 exports.toGeneratedOffsets = toGeneratedOffsets;
@@ -230,6 +231,11 @@ function* toSourceOffsets(sourceScript, language, serviceScript, position, filte
         }
     }
 }
+function toGeneratedRange(language, serviceScript, sourceScript, start, end, filter) {
+    for (const result of toGeneratedRanges(language, serviceScript, sourceScript, start, end, filter)) {
+        return result;
+    }
+}
 function* toGeneratedRanges(language, serviceScript, sourceScript, start, end, filter) {
     const map = language.maps.get(serviceScript.code, sourceScript);
     for (const [generateStart, generateEnd] of map.toGeneratedRange(start, end, true, filter)) {

package/package.json

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