@volar/typescript 2.3.0-alpha.9 → 2.3.1

package/lib/node/decorateLanguageServiceHost.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchExternalFiles = exports.decorateLanguageServiceHost = void 0;
+exports.decorateLanguageServiceHost = decorateLanguageServiceHost;
+exports.searchExternalFiles = searchExternalFiles;
 const resolveModuleName_1 = require("../resolveModuleName");
 function decorateLanguageServiceHost(ts, language, languageServiceHost) {
     const pluginExtensions = language.plugins
@@ -119,7 +120,6 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
         return script[1];
     }
 }
-exports.decorateLanguageServiceHost = decorateLanguageServiceHost;
 function searchExternalFiles(ts, project, exts) {
     if (project.projectKind !== ts.server.ProjectKind.Configured) {
         return [];
@@ -138,5 +138,4 @@ function searchExternalFiles(ts, project, exts) {
     const parsed = ts.parseJsonSourceFileConfigFileContent(config, parseHost, project.getCurrentDirectory());
     return parsed.fileNames;
 }
-exports.searchExternalFiles = searchExternalFiles;
 //# sourceMappingURL=decorateLanguageServiceHost.js.map

package/lib/node/decorateProgram.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateProgram = void 0;
+exports.decorateProgram = decorateProgram;
 const transform_1 = require("./transform");
 const utils_1 = require("./utils");
 function decorateProgram(language, program) {
@@ -18,45 +18,60 @@ function decorateProgram(language, program) {
         return {
             ...result,
             diagnostics: result.diagnostics
-                .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
-                .filter(utils_1.notEmpty),
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(d => !!d),
         };
     };
     program.getSyntacticDiagnostics = (sourceFile, cancellationToken) => {
         if (!sourceFile) {
-            return [];
+            return getSyntacticDiagnostics(undefined, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(d => !!d);
+        }
+        else {
+            const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+            const actualSourceFile = targetScript ? program.getSourceFile(targetScript.id) : sourceFile;
+            return getSyntacticDiagnostics(actualSourceFile, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(d => !!d)
+                .filter(d => !serviceScript || !d.file || language.scripts.get(d.file.fileName) === sourceScript);
         }
-        const [_serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
-        const actualSourceFile = sourceScript ? program.getSourceFile(sourceScript.id) : sourceFile;
-        return getSyntacticDiagnostics(actualSourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, program, true))
-            .filter(utils_1.notEmpty);
     };
     program.getSemanticDiagnostics = (sourceFile, cancellationToken) => {
         if (!sourceFile) {
-            return [];
+            return getSemanticDiagnostics(undefined, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(d => !!d);
+        }
+        else {
+            const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+            const actualSourceFile = targetScript ? program.getSourceFile(targetScript.id) : sourceFile;
+            return getSemanticDiagnostics(actualSourceFile, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(d => !!d)
+                .filter(d => !serviceScript || !d.file || language.scripts.get(d.file.fileName) === sourceScript);
         }
-        const [_serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
-        const actualSourceFile = sourceScript ? program.getSourceFile(sourceScript.id) : sourceFile;
-        return getSemanticDiagnostics(actualSourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, program, true))
-            .filter(utils_1.notEmpty);
     };
     program.getGlobalDiagnostics = cancellationToken => {
         return getGlobalDiagnostics(cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
-            .filter(utils_1.notEmpty);
+            .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+            .filter(d => !!d);
     };
     // @ts-ignore
     program.getBindAndCheckDiagnostics = (sourceFile, cancellationToken) => {
         if (!sourceFile) {
-            return [];
+            return getBindAndCheckDiagnostics(undefined, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(d => !!d);
+        }
+        else {
+            const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+            const actualSourceFile = targetScript ? program.getSourceFile(targetScript.id) : sourceFile;
+            return getBindAndCheckDiagnostics(actualSourceFile, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(d => !!d)
+                .filter(d => !serviceScript || language.scripts.get(d.file.fileName) === sourceScript);
         }
-        const [_serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
-        const actualSourceFile = sourceScript ? program.getSourceFile(sourceScript.id) : sourceFile;
-        return getBindAndCheckDiagnostics(actualSourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, program, true))
-            .filter(utils_1.notEmpty);
     };
     // fix https://github.com/vuejs/language-tools/issues/4099 with `incremental`
     program.getSourceFileByPath = path => {
@@ -67,5 +82,4 @@ function decorateProgram(language, program) {
         return sourceFile;
     };
 }
-exports.decorateProgram = decorateProgram;
 //# sourceMappingURL=decorateProgram.js.map

package/lib/node/dedupe.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dedupeDocumentSpans = void 0;
+exports.dedupeDocumentSpans = dedupeDocumentSpans;
 function dedupeDocumentSpans(items) {
     return dedupe(items, item => [
         item.fileName,
@@ -8,7 +8,6 @@ function dedupeDocumentSpans(items) {
         item.textSpan.length,
     ].join(':'));
 }
-exports.dedupeDocumentSpans = dedupeDocumentSpans;
 function dedupe(items, getKey) {
     const map = new Map();
     for (const item of items.reverse()) {

package/lib/node/proxyCreateProgram.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyCreateProgram = void 0;
+exports.proxyCreateProgram = proxyCreateProgram;
 const language_core_1 = require("@volar/language-core");
 const resolveModuleName_1 = require("../resolveModuleName");
 const decorateProgram_1 = require("./decorateProgram");
@@ -163,7 +163,6 @@ function proxyCreateProgram(ts, original, getLanguagePlugins) {
         },
     });
 }
-exports.proxyCreateProgram = proxyCreateProgram;
 function assert(condition, message) {
     if (!condition) {
         console.error(message);

package/lib/node/transform.d.ts

@@ -1,19 +1,21 @@
 import type { CodeInformation, SourceScript, TypeScriptServiceScript } from '@volar/language-core';
 import { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function transformCallHierarchyItem(targetScript: SourceScript<string> | undefined, language: Language<string>, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
-export declare function transformDiagnostic<T extends ts.Diagnostic>(targetScript: SourceScript<string> | undefined, language: Language<string>, diagnostic: T, program: ts.Program | undefined, isTsc: boolean): T | undefined;
+export declare function transformCallHierarchyItem(language: Language<string>, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
+export declare function transformDiagnostic<T extends ts.Diagnostic>(language: Language<string>, diagnostic: T, program: ts.Program | undefined, isTsc: boolean): T | undefined;
 export declare function fillSourceFileText(language: Language<string>, sourceFile: ts.SourceFile): void;
-export declare function transformFileTextChanges(targetScript: SourceScript<string> | undefined, language: Language<string>, changes: readonly ts.FileTextChanges[], filter: (data: CodeInformation) => boolean): ts.FileTextChanges[];
-export declare function transformDocumentSpan<T extends ts.DocumentSpan>(targetScript: SourceScript<string> | undefined, language: Language<string>, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
-export declare function transformSpan(targetScript: SourceScript<string> | undefined, language: Language<string>, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {
+export declare function transformFileTextChanges(language: Language<string>, changes: readonly ts.FileTextChanges[], filter: (data: CodeInformation) => boolean): ts.FileTextChanges[];
+export declare function transformDocumentSpan<T extends ts.DocumentSpan>(language: Language<string>, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
+export declare function transformSpan(language: Language<string>, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {
     fileName: string;
     textSpan: ts.TextSpan;
 } | undefined;
-export declare function transformTextChange(targetScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, textChange: ts.TextChange, filter: (data: CodeInformation) => boolean): [string, ts.TextChange] | undefined;
-export declare function transformTextSpan(targetScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, textSpan: ts.TextSpan, filter: (data: CodeInformation) => boolean): [string, ts.TextSpan] | undefined;
-export declare function toSourceOffset(targetScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, position: number, filter: (data: CodeInformation) => boolean): [fileName: string, offset: number] | undefined;
-export declare function toSourceOffsets(targetScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, position: number, filter: (data: CodeInformation) => boolean): Generator<[fileName: string, offset: number]>;
+export declare function transformTextChange(sourceScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, textChange: ts.TextChange, filter: (data: CodeInformation) => boolean): [string, ts.TextChange] | undefined;
+export declare function transformTextSpan(sourceScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, textSpan: ts.TextSpan, filter: (data: CodeInformation) => boolean): [string, ts.TextSpan] | undefined;
+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, 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 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>;
 export declare function getMappingOffset(language: Language, serviceScript: TypeScriptServiceScript): number;

package/lib/node/transform.js

@@ -1,13 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMappingOffset = exports.toGeneratedOffsets = exports.toGeneratedOffset = exports.toSourceOffsets = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
+exports.transformCallHierarchyItem = transformCallHierarchyItem;
+exports.transformDiagnostic = transformDiagnostic;
+exports.fillSourceFileText = fillSourceFileText;
+exports.transformFileTextChanges = transformFileTextChanges;
+exports.transformDocumentSpan = transformDocumentSpan;
+exports.transformSpan = transformSpan;
+exports.transformTextChange = transformTextChange;
+exports.transformTextSpan = transformTextSpan;
+exports.toSourceOffset = toSourceOffset;
+exports.toSourceRanges = toSourceRanges;
+exports.toSourceOffsets = toSourceOffsets;
+exports.toGeneratedRanges = toGeneratedRanges;
+exports.toGeneratedOffset = toGeneratedOffset;
+exports.toGeneratedOffsets = toGeneratedOffsets;
+exports.getMappingOffset = getMappingOffset;
 const language_core_1 = require("@volar/language-core");
 const utils_1 = require("./utils");
 const transformedDiagnostics = new WeakMap();
 const transformedSourceFile = new WeakSet();
-function transformCallHierarchyItem(targetScript, language, item, filter) {
-    const span = transformSpan(targetScript, language, item.file, item.span, filter);
-    const selectionSpan = transformSpan(targetScript, language, item.file, item.selectionSpan, filter);
+function transformCallHierarchyItem(language, item, filter) {
+    const span = transformSpan(language, item.file, item.span, filter);
+    const selectionSpan = transformSpan(language, item.file, item.selectionSpan, filter);
     return {
         ...item,
         file: span?.fileName ?? item.file,
@@ -15,22 +29,21 @@ function transformCallHierarchyItem(targetScript, language, item, filter) {
         selectionSpan: selectionSpan?.textSpan ?? { start: 0, length: 0 },
     };
 }
-exports.transformCallHierarchyItem = transformCallHierarchyItem;
-function transformDiagnostic(targetScript, language, diagnostic, program, isTsc) {
+function transformDiagnostic(language, diagnostic, program, isTsc) {
     if (!transformedDiagnostics.has(diagnostic)) {
         transformedDiagnostics.set(diagnostic, undefined);
         const { relatedInformation } = diagnostic;
         if (relatedInformation) {
             diagnostic.relatedInformation = relatedInformation
-                .map(d => transformDiagnostic(targetScript, language, d, program, isTsc))
-                .filter(utils_1.notEmpty);
+                .map(d => transformDiagnostic(language, d, program, isTsc))
+                .filter(d => !!d);
         }
         if (diagnostic.file !== undefined
             && diagnostic.start !== undefined
             && diagnostic.length !== undefined) {
-            const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, diagnostic.file.fileName);
+            const [serviceScript] = (0, utils_1.getServiceScript)(language, diagnostic.file.fileName);
             if (serviceScript) {
-                const [sourceSpanFileName, sourceSpan] = transformTextSpan(sourceScript, language, serviceScript, {
+                const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, {
                     start: diagnostic.start,
                     length: diagnostic.length
                 }, language_core_1.shouldReportDiagnostics) ?? [];
@@ -61,28 +74,27 @@ function transformDiagnostic(targetScript, language, diagnostic, program, isTsc)
     }
     return transformedDiagnostics.get(diagnostic);
 }
-exports.transformDiagnostic = transformDiagnostic;
 // fix https://github.com/vuejs/language-tools/issues/4099 without `incremental`
 function fillSourceFileText(language, sourceFile) {
     if (transformedSourceFile.has(sourceFile)) {
         return;
     }
     transformedSourceFile.add(sourceFile);
-    const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+    const [serviceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
     if (serviceScript && !serviceScript.preventLeadingOffset) {
+        const sourceScript = language.scripts.fromVirtualCode(serviceScript.code);
         sourceFile.text = sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength())
             + sourceFile.text.substring(sourceScript.snapshot.getLength());
     }
 }
-exports.fillSourceFileText = fillSourceFileText;
-function transformFileTextChanges(targetScript, language, changes, filter) {
+function transformFileTextChanges(language, changes, filter) {
     const changesPerFile = {};
     const newFiles = new Set();
     for (const fileChanges of changes) {
         const [_, source] = (0, utils_1.getServiceScript)(language, fileChanges.fileName);
         if (source) {
             fileChanges.textChanges.forEach(c => {
-                const { fileName, textSpan } = transformSpan(targetScript, language, fileChanges.fileName, c.span, filter) ?? {};
+                const { fileName, textSpan } = transformSpan(language, fileChanges.fileName, c.span, filter) ?? {};
                 if (fileName && textSpan) {
                     (changesPerFile[fileName] ?? (changesPerFile[fileName] = [])).push({ ...c, span: textSpan });
                 }
@@ -108,9 +120,8 @@ function transformFileTextChanges(targetScript, language, changes, filter) {
     }
     return result;
 }
-exports.transformFileTextChanges = transformFileTextChanges;
-function transformDocumentSpan(targetScript, language, documentSpan, filter, shouldFallback) {
-    let textSpan = transformSpan(targetScript, language, documentSpan.fileName, documentSpan.textSpan, filter);
+function transformDocumentSpan(language, documentSpan, filter, shouldFallback) {
+    let textSpan = transformSpan(language, documentSpan.fileName, documentSpan.textSpan, filter);
     if (!textSpan && shouldFallback) {
         textSpan = {
             fileName: documentSpan.fileName,
@@ -120,9 +131,9 @@ function transformDocumentSpan(targetScript, language, documentSpan, filter, sho
     if (!textSpan) {
         return;
     }
-    const contextSpan = transformSpan(targetScript, language, documentSpan.fileName, documentSpan.contextSpan, filter);
-    const originalTextSpan = transformSpan(targetScript, language, documentSpan.originalFileName, documentSpan.originalTextSpan, filter);
-    const originalContextSpan = transformSpan(targetScript, language, documentSpan.originalFileName, documentSpan.originalContextSpan, filter);
+    const contextSpan = transformSpan(language, documentSpan.fileName, documentSpan.contextSpan, filter);
+    const originalTextSpan = transformSpan(language, documentSpan.originalFileName, documentSpan.originalTextSpan, filter);
+    const originalContextSpan = transformSpan(language, documentSpan.originalFileName, documentSpan.originalContextSpan, filter);
     return {
         ...documentSpan,
         fileName: textSpan.fileName,
@@ -133,17 +144,13 @@ function transformDocumentSpan(targetScript, language, documentSpan, filter, sho
         originalContextSpan: originalContextSpan?.textSpan,
     };
 }
-exports.transformDocumentSpan = transformDocumentSpan;
-function transformSpan(targetScript, language, fileName, textSpan, filter) {
+function transformSpan(language, fileName, textSpan, filter) {
     if (!fileName || !textSpan) {
         return;
     }
-    const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
-    if (sourceScript?.associatedOnly) {
-        return;
-    }
-    else if (serviceScript) {
-        const [sourceSpanFileName, sourceSpan] = transformTextSpan(targetScript, language, serviceScript, textSpan, filter) ?? [];
+    const [serviceScript] = (0, utils_1.getServiceScript)(language, fileName);
+    if (serviceScript) {
+        const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, textSpan, filter) ?? [];
         if (sourceSpan && sourceSpanFileName) {
             return {
                 fileName: sourceSpanFileName,
@@ -158,9 +165,8 @@ function transformSpan(targetScript, language, fileName, textSpan, filter) {
         };
     }
 }
-exports.transformSpan = transformSpan;
-function transformTextChange(targetScript, language, serviceScript, textChange, filter) {
-    const [sourceSpanFileName, sourceSpan] = transformTextSpan(targetScript, language, serviceScript, textChange.span, filter) ?? [];
+function transformTextChange(sourceScript, language, serviceScript, textChange, filter) {
+    const [sourceSpanFileName, sourceSpan] = transformTextSpan(sourceScript, language, serviceScript, textChange.span, filter) ?? [];
     if (sourceSpan && sourceSpanFileName) {
         return [sourceSpanFileName, {
                 newText: textChange.newText,
@@ -169,64 +175,77 @@ function transformTextChange(targetScript, language, serviceScript, textChange,
     }
     return undefined;
 }
-exports.transformTextChange = transformTextChange;
-function transformTextSpan(targetScript, language, serviceScript, textSpan, filter) {
+function transformTextSpan(sourceScript, language, serviceScript, textSpan, filter) {
     const start = textSpan.start;
     const end = textSpan.start + textSpan.length;
-    for (const sourceStart of toSourceOffsets(targetScript, language, serviceScript, start, filter)) {
-        for (const sourceEnd of toSourceOffsets(targetScript, language, serviceScript, end, filter)) {
-            if (sourceStart[0] === sourceEnd[0]
-                && sourceEnd[1] >= sourceStart[1]) {
-                return [sourceStart[0], {
-                        start: sourceStart[1],
-                        length: sourceEnd[1] - sourceStart[1],
-                    }];
-            }
-        }
+    for (const [fileName, sourceStart, sourceEnd] of toSourceRanges(sourceScript, language, serviceScript, start, end, filter)) {
+        return [fileName, {
+                start: sourceStart,
+                length: sourceEnd - sourceStart,
+            }];
     }
 }
-exports.transformTextSpan = transformTextSpan;
-function toSourceOffset(targetScript, language, serviceScript, position, filter) {
-    for (const source of toSourceOffsets(targetScript, language, serviceScript, position, filter)) {
+function toSourceOffset(sourceScript, language, serviceScript, position, filter) {
+    for (const source of toSourceOffsets(sourceScript, language, serviceScript, position, filter)) {
         return source;
     }
 }
-exports.toSourceOffset = toSourceOffset;
-function* toSourceOffsets(targetScript, language, serviceScript, position, filter) {
-    if (targetScript) {
-        const map = language.maps.get(serviceScript.code, targetScript);
-        for (const [sourceOffset, mapping] of map.getSourceOffsets(position - getMappingOffset(language, serviceScript))) {
+function* toSourceRanges(sourceScript, language, serviceScript, start, end, filter) {
+    if (sourceScript) {
+        const map = language.maps.get(serviceScript.code, sourceScript);
+        for (const [sourceStart, sourceEnd] of map.toSourceRange(start - getMappingOffset(language, serviceScript), end - getMappingOffset(language, serviceScript), true, filter)) {
+            yield [sourceScript.id, sourceStart, sourceEnd];
+        }
+    }
+    else {
+        for (const [sourceScript, map] of language.maps.forEach(serviceScript.code)) {
+            for (const [sourceStart, sourceEnd] of map.toSourceRange(start - getMappingOffset(language, serviceScript), end - getMappingOffset(language, serviceScript), true, filter)) {
+                yield [sourceScript.id, sourceStart, sourceEnd];
+            }
+        }
+    }
+}
+function* toSourceOffsets(sourceScript, language, serviceScript, position, filter) {
+    if (sourceScript) {
+        const map = language.maps.get(serviceScript.code, sourceScript);
+        for (const [sourceOffset, mapping] of map.toSourceLocation(position - getMappingOffset(language, serviceScript))) {
             if (filter(mapping.data)) {
-                yield [targetScript.id, sourceOffset];
+                yield [sourceScript.id, sourceOffset];
             }
         }
     }
     else {
-        for (const [fileName, _snapshot, map] of language.maps.forEach(serviceScript.code)) {
-            for (const [sourceOffset, mapping] of map.getSourceOffsets(position - getMappingOffset(language, serviceScript))) {
+        for (const [sourceScript, map] of language.maps.forEach(serviceScript.code)) {
+            for (const [sourceOffset, mapping] of map.toSourceLocation(position - getMappingOffset(language, serviceScript))) {
                 if (filter(mapping.data)) {
-                    yield [fileName, sourceOffset];
+                    yield [sourceScript.id, sourceOffset];
                 }
             }
         }
     }
 }
-exports.toSourceOffsets = toSourceOffsets;
+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)) {
+        yield [
+            generateStart + getMappingOffset(language, serviceScript),
+            generateEnd + getMappingOffset(language, serviceScript),
+        ];
+    }
+}
 function toGeneratedOffset(language, serviceScript, sourceScript, position, filter) {
     for (const [generateOffset] of toGeneratedOffsets(language, serviceScript, sourceScript, position, filter)) {
         return generateOffset;
     }
 }
-exports.toGeneratedOffset = toGeneratedOffset;
 function* toGeneratedOffsets(language, serviceScript, sourceScript, position, filter) {
     const map = language.maps.get(serviceScript.code, sourceScript);
-    for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
+    for (const [generateOffset, mapping] of map.toGeneratedLocation(position)) {
         if (filter(mapping.data)) {
             yield [generateOffset + getMappingOffset(language, serviceScript), mapping];
         }
     }
 }
-exports.toGeneratedOffsets = toGeneratedOffsets;
 function getMappingOffset(language, serviceScript) {
     if (serviceScript.preventLeadingOffset) {
         return 0;
@@ -234,5 +253,4 @@ function getMappingOffset(language, serviceScript) {
     const sourceScript = language.scripts.fromVirtualCode(serviceScript.code);
     return sourceScript.snapshot.getLength();
 }
-exports.getMappingOffset = getMappingOffset;
 //# sourceMappingURL=transform.js.map

package/lib/node/utils.d.ts

@@ -1,3 +1,2 @@
 import type { Language, SourceScript, TypeScriptServiceScript } from '@volar/language-core';
-export declare function notEmpty<T>(value: T | null | undefined): value is T;
-export declare function getServiceScript(language: Language<string>, fileName: string): [TypeScriptServiceScript, SourceScript<string>] | [undefined, SourceScript<string>] | [undefined, undefined];
+export declare function getServiceScript(language: Language<string>, fileName: string): [serviceScript: TypeScriptServiceScript, targetScript: SourceScript<string>, sourceScript: SourceScript<string>] | [serviceScript: undefined, sourceScript: SourceScript<string>, sourceScript: SourceScript<string>] | [serviceScript: undefined, sourceScript: undefined, targetScript: undefined];

package/lib/node/utils.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServiceScript = exports.notEmpty = void 0;
-function notEmpty(value) {
-    return value !== null && value !== undefined;
-}
-exports.notEmpty = notEmpty;
+exports.getServiceScript = getServiceScript;
 function getServiceScript(language, fileName) {
     const sourceScript = language.scripts.get(fileName);
     if (sourceScript?.targetIds.size) {
@@ -13,21 +9,20 @@ function getServiceScript(language, fileName) {
             if (targetScript?.generated) {
                 const serviceScript = targetScript.generated.languagePlugin.typescript?.getServiceScript(targetScript.generated.root);
                 if (serviceScript) {
-                    return [serviceScript, targetScript];
+                    return [serviceScript, targetScript, sourceScript];
                 }
             }
         }
     }
     if (sourceScript?.associatedOnly) {
-        return [undefined, sourceScript];
+        return [undefined, sourceScript, sourceScript];
     }
     if (sourceScript?.generated) {
         const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
         if (serviceScript) {
-            return [serviceScript, sourceScript];
+            return [serviceScript, sourceScript, sourceScript];
         }
     }
-    return [undefined, undefined];
+    return [undefined, undefined, undefined];
 }
-exports.getServiceScript = getServiceScript;
 //# sourceMappingURL=utils.js.map

package/lib/protocol/createProject.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLanguageServiceHost = void 0;
+exports.createLanguageServiceHost = createLanguageServiceHost;
 const language_core_1 = require("@volar/language-core");
 const path = require("path-browserify");
 const resolveModuleName_1 = require("../resolveModuleName");
@@ -249,7 +249,6 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
         return '';
     }
 }
-exports.createLanguageServiceHost = createLanguageServiceHost;
 function setEquals(a, b) {
     if (a.size !== b.size) {
         return false;

package/lib/protocol/createSys.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSys = void 0;
+exports.createSys = createSys;
 const path = require("path-browserify");
 const utilities_1 = require("../typescript/utilities");
 const vscode_uri_1 = require("vscode-uri");
@@ -368,5 +368,4 @@ function createSys(sys, env, workspaceFolder, uriConverter) {
         return caseSensitive ? fileName : fileName.toLowerCase();
     }
 }
-exports.createSys = createSys;
 //# sourceMappingURL=createSys.js.map

package/lib/quickstart/createAsyncLanguageServicePlugin.d.ts

@@ -1,3 +1,6 @@
-import { LanguagePlugin } from '@volar/language-core';
+import { Language, LanguagePlugin } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function createAsyncLanguageServicePlugin(extensions: string[], scriptKind: ts.ScriptKind, loadLanguagePlugins: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<LanguagePlugin<string>[]>): ts.server.PluginModuleFactory;
+export declare function createAsyncLanguageServicePlugin(extensions: string[], scriptKind: ts.ScriptKind, create: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<{
+    languagePlugins: LanguagePlugin<string>[];
+    setup?: (language: Language<string>) => void;
+}>): ts.server.PluginModuleFactory;

package/lib/quickstart/createAsyncLanguageServicePlugin.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAsyncLanguageServicePlugin = void 0;
+exports.createAsyncLanguageServicePlugin = createAsyncLanguageServicePlugin;
 const language_core_1 = require("@volar/language-core");
 const common_1 = require("../common");
 const decorateLanguageService_1 = require("../node/decorateLanguageService");
 const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
 const createLanguageServicePlugin_1 = require("./createLanguageServicePlugin");
-const externalFiles = new WeakMap();
-const decoratedLanguageServices = new WeakSet();
-const decoratedLanguageServiceHosts = new WeakSet();
-function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePlugins) {
+function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
     return modules => {
         const { typescript: ts } = modules;
         const pluginModule = {
             create(info) {
-                if (!decoratedLanguageServices.has(info.languageService)
-                    && !decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
-                    decoratedLanguageServices.add(info.languageService);
-                    decoratedLanguageServiceHosts.add(info.languageServiceHost);
+                if (!createLanguageServicePlugin_1.decoratedLanguageServices.has(info.languageService)
+                    && !createLanguageServicePlugin_1.decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
+                    createLanguageServicePlugin_1.decoratedLanguageServices.add(info.languageService);
+                    createLanguageServicePlugin_1.decoratedLanguageServiceHosts.add(info.languageServiceHost);
                     const emptySnapshot = ts.ScriptSnapshot.fromString('');
                     const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
                     const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
@@ -52,7 +49,7 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                             return getProjectVersion();
                         };
                     }
-                    loadLanguagePlugins(ts, info).then(languagePlugins => {
+                    create(ts, info).then(({ languagePlugins, setup }) => {
                         const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
                         const language = (0, language_core_1.createLanguage)([
                             ...languagePlugins,
@@ -73,27 +70,29 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                         });
                         (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
                         (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
-                        info.project.markAsDirty();
+                        setup?.(language);
+                        if ('markAsDirty' in info.project && typeof info.project.markAsDirty === 'function') {
+                            info.project.markAsDirty();
+                        }
                         initialized = true;
                     });
                 }
                 return info.languageService;
             },
             getExternalFiles(project, updateLevel = 0) {
-                if (updateLevel >= (1)
-                    || !externalFiles.has(project)) {
-                    const oldFiles = externalFiles.get(project);
+                if (updateLevel >= 1
+                    || !createLanguageServicePlugin_1.externalFiles.has(project)) {
+                    const oldFiles = createLanguageServicePlugin_1.externalFiles.get(project);
                     const newFiles = extensions.length ? (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions) : [];
-                    externalFiles.set(project, newFiles);
+                    createLanguageServicePlugin_1.externalFiles.set(project, newFiles);
                     if (oldFiles && !(0, createLanguageServicePlugin_1.arrayItemsEqual)(oldFiles, newFiles)) {
                         project.refreshDiagnostics();
                     }
                 }
-                return externalFiles.get(project);
+                return createLanguageServicePlugin_1.externalFiles.get(project);
             },
         };
         return pluginModule;
     };
 }
-exports.createAsyncLanguageServicePlugin = createAsyncLanguageServicePlugin;
 //# sourceMappingURL=createAsyncLanguageServicePlugin.js.map

package/lib/quickstart/createLanguageServicePlugin.d.ts

@@ -1,4 +1,11 @@
-import { LanguagePlugin } from '@volar/language-core';
+import { Language, LanguagePlugin } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function createLanguageServicePlugin(loadLanguagePlugins: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => LanguagePlugin<string>[]): ts.server.PluginModuleFactory;
+export declare const externalFiles: WeakMap<ts.server.Project, string[]>;
+export declare const projectExternalFileExtensions: WeakMap<ts.server.Project, string[]>;
+export declare const decoratedLanguageServices: WeakSet<ts.LanguageService>;
+export declare const decoratedLanguageServiceHosts: WeakSet<ts.LanguageServiceHost>;
+export declare function createLanguageServicePlugin(create: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => {
+    languagePlugins: LanguagePlugin<string>[];
+    setup?: (language: Language<string>) => void;
+}): ts.server.PluginModuleFactory;
 export declare function arrayItemsEqual(a: string[], b: string[]): boolean;