@volar/typescript 2.2.0-alpha.0 → 2.2.0-alpha.2

package/lib/documentRegistry.d.ts

@@ -0,0 +1,2 @@
+import type * as ts from 'typescript';
+export declare function getDocumentRegistry(ts: typeof import('typescript'), useCaseSensitiveFileNames: boolean, currentDirectory: string): ts.DocumentRegistry;

package/lib/documentRegistry.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDocumentRegistry = void 0;
+const documentRegistries = [];
+function getDocumentRegistry(ts, useCaseSensitiveFileNames, currentDirectory) {
+    let documentRegistry = documentRegistries.find(item => item[0] === useCaseSensitiveFileNames && item[1] === currentDirectory)?.[2];
+    if (!documentRegistry) {
+        documentRegistry = ts.createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory);
+        documentRegistries.push([useCaseSensitiveFileNames, currentDirectory, documentRegistry]);
+    }
+    return documentRegistry;
+}
+exports.getDocumentRegistry = getDocumentRegistry;
+//# sourceMappingURL=documentRegistry.js.map

package/lib/node/decorateLanguageService.js

@@ -29,19 +29,92 @@ function decorateLanguageService(language, languageService) {
         }
     };
     // methods
-    const { findReferences, findRenameLocations, getCompletionEntryDetails, getCompletionsAtPosition, getDefinitionAndBoundSpan, getDefinitionAtPosition, getFileReferences, getImplementationAtPosition, getQuickInfoAtPosition, getReferencesAtPosition, getSemanticDiagnostics, getSyntacticDiagnostics, getSuggestionDiagnostics, getTypeDefinitionAtPosition, getEncodedSemanticClassifications, getDocumentHighlights, getApplicableRefactors, getEditsForRefactor, getRenameInfo, getCodeFixesAtPosition, prepareCallHierarchy, provideCallHierarchyIncomingCalls, provideCallHierarchyOutgoingCalls, provideInlayHints, organizeImports, } = languageService;
+    const { findReferences, findRenameLocations, getCompletionEntryDetails, getCompletionsAtPosition, getDefinitionAndBoundSpan, getDefinitionAtPosition, getFileReferences, getFormattingEditsForDocument, getFormattingEditsForRange, getFormattingEditsAfterKeystroke, getImplementationAtPosition, getLinkedEditingRangeAtPosition, getQuickInfoAtPosition, getReferencesAtPosition, getSemanticDiagnostics, getSyntacticDiagnostics, getSuggestionDiagnostics, getTypeDefinitionAtPosition, getEncodedSemanticClassifications, getDocumentHighlights, getApplicableRefactors, getEditsForFileRename, getEditsForRefactor, getRenameInfo, getCodeFixesAtPosition, prepareCallHierarchy, provideCallHierarchyIncomingCalls, provideCallHierarchyOutgoingCalls, provideInlayHints, organizeImports, } = languageService;
+    languageService.getFormattingEditsForDocument = (fileName, options) => {
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            if (!map.mappings.some(mapping => (0, language_core_1.isFormattingEnabled)(mapping.data))) {
+                return [];
+            }
+            const edits = getFormattingEditsForDocument(fileName, options);
+            return edits
+                .map(edit => (0, transform_1.transformTextChange)(sourceScript, map, edit, language_core_1.isFormattingEnabled))
+                .filter(utils_1.notEmpty);
+        }
+        else {
+            return getFormattingEditsForDocument(fileName, options);
+        }
+    };
+    languageService.getFormattingEditsForRange = (fileName, start, end, options) => {
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generateStart = (0, transform_1.toGeneratedOffset)(sourceScript, map, start, language_core_1.isFormattingEnabled);
+            const generateEnd = (0, transform_1.toGeneratedOffset)(sourceScript, map, end, language_core_1.isFormattingEnabled);
+            if (generateStart !== undefined && generateEnd !== undefined) {
+                const edits = getFormattingEditsForRange(fileName, generateStart, generateEnd, options);
+                return edits
+                    .map(edit => (0, transform_1.transformTextChange)(sourceScript, map, edit, language_core_1.isFormattingEnabled))
+                    .filter(utils_1.notEmpty);
+            }
+            return [];
+        }
+        else {
+            return getFormattingEditsForRange(fileName, start, end, options);
+        }
+    };
+    languageService.getFormattingEditsAfterKeystroke = (fileName, position, key, options) => {
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isFormattingEnabled);
+            if (generatePosition !== undefined) {
+                const edits = getFormattingEditsAfterKeystroke(fileName, generatePosition, key, options);
+                return edits
+                    .map(edit => (0, transform_1.transformTextChange)(sourceScript, map, edit, language_core_1.isFormattingEnabled))
+                    .filter(utils_1.notEmpty);
+            }
+            return [];
+        }
+        else {
+            return getFormattingEditsAfterKeystroke(fileName, position, key, options);
+        }
+    };
+    languageService.getEditsForFileRename = (oldFilePath, newFilePath, formatOptions, preferences) => {
+        const edits = getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences);
+        return edits
+            .map(edit => (0, transform_1.transformFileTextChanges)(language, edit, language_core_1.isRenameEnabled))
+            .filter(utils_1.notEmpty);
+    };
+    languageService.getLinkedEditingRangeAtPosition = (fileName, position) => {
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isLinkedEditingEnabled);
+            if (generatePosition !== undefined) {
+                const info = getLinkedEditingRangeAtPosition(fileName, generatePosition);
+                if (info) {
+                    return {
+                        ranges: info.ranges
+                            .map(span => (0, transform_1.transformTextSpan)(sourceScript, map, span, language_core_1.isLinkedEditingEnabled))
+                            .filter(utils_1.notEmpty),
+                        wordPattern: info.wordPattern,
+                    };
+                }
+            }
+        }
+        else {
+            return getLinkedEditingRangeAtPosition(fileName, position);
+        }
+    };
     languageService.prepareCallHierarchy = (fileName, position) => {
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
-                    const item = prepareCallHierarchy(fileName, generateOffset + sourceScript.snapshot.getLength());
-                    if (Array.isArray(item)) {
-                        return item.map(item => (0, transform_1.transformCallHierarchyItem)(language, item, language_core_1.isCallHierarchyEnabled));
-                    }
-                    else if (item) {
-                        return (0, transform_1.transformCallHierarchyItem)(language, item, language_core_1.isCallHierarchyEnabled);
-                    }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
+            if (generatePosition !== undefined) {
+                const item = prepareCallHierarchy(fileName, generatePosition);
+                if (Array.isArray(item)) {
+                    return item.map(item => (0, transform_1.transformCallHierarchyItem)(language, item, language_core_1.isCallHierarchyEnabled));
+                }
+                else if (item) {
+                    return (0, transform_1.transformCallHierarchyItem)(language, item, language_core_1.isCallHierarchyEnabled);
                 }
             }
         }
@@ -53,10 +126,9 @@ function decorateLanguageService(language, languageService) {
         let calls = [];
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
-                    calls = provideCallHierarchyIncomingCalls(fileName, generateOffset + sourceScript.snapshot.getLength());
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
+            if (generatePosition !== undefined) {
+                calls = provideCallHierarchyIncomingCalls(fileName, generatePosition);
             }
         }
         else {
@@ -78,10 +150,9 @@ function decorateLanguageService(language, languageService) {
         let calls = [];
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
-                    calls = provideCallHierarchyOutgoingCalls(fileName, generateOffset + sourceScript.snapshot.getLength());
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
+            if (generatePosition !== undefined) {
+                calls = provideCallHierarchyOutgoingCalls(fileName, generatePosition);
             }
         }
         else {
@@ -91,7 +162,9 @@ function decorateLanguageService(language, languageService) {
             .map(call => {
             const to = (0, transform_1.transformCallHierarchyItem)(language, call.to, language_core_1.isCallHierarchyEnabled);
             const fromSpans = call.fromSpans
-                .map(span => (0, transform_1.transformSpan)(language, fileName, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
+                .map(span => sourceScript
+                ? (0, transform_1.transformTextSpan)(sourceScript, map, span, language_core_1.isCallHierarchyEnabled)
+                : span)
                 .filter(utils_1.notEmpty);
             return {
                 to,
@@ -109,17 +182,16 @@ function decorateLanguageService(language, languageService) {
     languageService.getQuickInfoAtPosition = (fileName, position) => {
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isHoverEnabled)(mapping.data)) {
-                    const result = getQuickInfoAtPosition(fileName, generateOffset + sourceScript.snapshot.getLength());
-                    if (result) {
-                        const textSpan = (0, transform_1.transformSpan)(language, fileName, result.textSpan, language_core_1.isHoverEnabled)?.textSpan;
-                        if (textSpan) {
-                            return {
-                                ...result,
-                                textSpan,
-                            };
-                        }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isHoverEnabled);
+            if (generatePosition !== undefined) {
+                const result = getQuickInfoAtPosition(fileName, generatePosition);
+                if (result) {
+                    const textSpan = (0, transform_1.transformTextSpan)(sourceScript, map, result.textSpan, language_core_1.isHoverEnabled);
+                    if (textSpan) {
+                        return {
+                            ...result,
+                            textSpan,
+                        };
                     }
                 }
             }
@@ -160,16 +232,15 @@ function decorateLanguageService(language, languageService) {
     languageService.getApplicableRefactors = (fileName, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos)) {
-                if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
-                    const por = typeof positionOrRange === 'number'
-                        ? generateOffset + sourceScript.snapshot.getLength()
-                        : {
-                            pos: generateOffset + sourceScript.snapshot.getLength(),
-                            end: generateOffset + positionOrRange.end - positionOrRange.pos + sourceScript.snapshot.getLength(),
-                        };
-                    return getApplicableRefactors(fileName, por, preferences, triggerReason, kind, includeInteractiveActions);
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
+            if (generatePosition !== undefined) {
+                const por = typeof positionOrRange === 'number'
+                    ? generatePosition
+                    : {
+                        pos: generatePosition,
+                        end: generatePosition + positionOrRange.end - positionOrRange.pos,
+                    };
+                return getApplicableRefactors(fileName, por, preferences, triggerReason, kind, includeInteractiveActions);
             }
             return [];
         }
@@ -181,16 +252,17 @@ function decorateLanguageService(language, languageService) {
         let edits;
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos)) {
-                if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
-                    const por = typeof positionOrRange === 'number'
-                        ? generateOffset + sourceScript.snapshot.getLength()
-                        : {
-                            pos: generateOffset + sourceScript.snapshot.getLength(),
-                            end: generateOffset + positionOrRange.end - positionOrRange.pos + sourceScript.snapshot.getLength(),
-                        };
-                    edits = getEditsForRefactor(fileName, formatOptions, por, refactorName, actionName, preferences);
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, typeof positionOrRange === 'number'
+                ? positionOrRange
+                : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
+            if (generatePosition !== undefined) {
+                const por = typeof positionOrRange === 'number'
+                    ? generatePosition
+                    : {
+                        pos: generatePosition,
+                        end: generatePosition + positionOrRange.end - positionOrRange.pos,
+                    };
+                edits = getEditsForRefactor(fileName, formatOptions, por, refactorName, actionName, preferences);
             }
         }
         else {
@@ -206,20 +278,19 @@ function decorateLanguageService(language, languageService) {
     languageService.getRenameInfo = (fileName, position, options) => {
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isRenameEnabled)(mapping.data)) {
-                    const info = getRenameInfo(fileName, generateOffset + sourceScript.snapshot.getLength(), options);
-                    if (info.canRename) {
-                        const span = (0, transform_1.transformSpan)(language, fileName, info.triggerSpan, language_core_1.isRenameEnabled);
-                        if (span) {
-                            info.triggerSpan = span.textSpan;
-                            return info;
-                        }
-                    }
-                    else {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isRenameEnabled);
+            if (generatePosition !== undefined) {
+                const info = getRenameInfo(fileName, generatePosition, options);
+                if (info.canRename) {
+                    const span = (0, transform_1.transformTextSpan)(sourceScript, map, info.triggerSpan, language_core_1.isRenameEnabled);
+                    if (span) {
+                        info.triggerSpan = span;
                         return info;
                     }
                 }
+                else {
+                    return info;
+                }
             }
             return {
                 canRename: false,
@@ -234,16 +305,10 @@ function decorateLanguageService(language, languageService) {
         let fixes = [];
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateStart, mapping] of map.getGeneratedOffsets(start)) {
-                if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
-                    for (const [generateEnd, mapping] of map.getGeneratedOffsets(end)) {
-                        if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
-                            fixes = getCodeFixesAtPosition(fileName, generateStart + sourceScript.snapshot.getLength(), generateEnd + sourceScript.snapshot.getLength(), errorCodes, formatOptions, preferences);
-                            break;
-                        }
-                    }
-                    break;
-                }
+            const generateStart = (0, transform_1.toGeneratedOffset)(sourceScript, map, start, language_core_1.isCodeActionsEnabled);
+            const generateEnd = (0, transform_1.toGeneratedOffset)(sourceScript, map, end, language_core_1.isCodeActionsEnabled);
+            if (generateStart !== undefined && generateEnd !== undefined) {
+                fixes = getCodeFixesAtPosition(fileName, generateStart, generateEnd, errorCodes, formatOptions, preferences);
             }
         }
         else {
@@ -261,32 +326,25 @@ function decorateLanguageService(language, languageService) {
             let start;
             let end;
             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];
+                    end ??= mapping.generatedOffsets[mapping.generatedOffsets.length - 1] + mapping.lengths[mapping.lengths.length - 1];
                     start = Math.min(start, mapping.generatedOffsets[0]);
-                    end = Math.max(end, mapping.generatedOffsets[mapping.generatedOffsets.length - 1]);
+                    end = Math.max(end, mapping.generatedOffsets[mapping.generatedOffsets.length - 1] + mapping.lengths[mapping.lengths.length - 1]);
                 }
             }
-            if (start === undefined || end === undefined) {
-                start = 0;
-                end = 0;
-            }
+            start ??= 0;
+            end ??= sourceScript.snapshot.getLength();
             start += sourceScript.snapshot.getLength();
             end += sourceScript.snapshot.getLength();
             const result = getEncodedSemanticClassifications(fileName, { start, length: end - start }, format);
             const spans = [];
             for (let i = 0; i < result.spans.length; i += 3) {
-                for (const [sourceStart, mapping] of map.getSourceOffsets(result.spans[i] - sourceScript.snapshot.getLength())) {
-                    if ((0, language_core_1.isSemanticTokensEnabled)(mapping.data)) {
-                        for (const [sourceEnd, mapping] of map.getSourceOffsets(result.spans[i] + result.spans[i + 1] - sourceScript.snapshot.getLength())) {
-                            if ((0, language_core_1.isSemanticTokensEnabled)(mapping.data)) {
-                                spans.push(sourceStart, sourceEnd - sourceStart, result.spans[i + 2]);
-                                break;
-                            }
-                        }
-                        break;
-                    }
+                const sourceStart = (0, transform_1.toSourceOffset)(sourceScript, map, result.spans[i], language_core_1.isSemanticTokensEnabled);
+                const sourceEnd = (0, transform_1.toSourceOffset)(sourceScript, map, result.spans[i] + result.spans[i + 1], language_core_1.isSemanticTokensEnabled);
+                if (sourceStart !== undefined && sourceEnd !== undefined) {
+                    spans.push(sourceStart, sourceEnd - sourceStart, result.spans[i + 2]);
                 }
             }
             result.spans = spans;
@@ -423,24 +481,29 @@ function decorateLanguageService(language, languageService) {
         if (serviceScript) {
             let mainResult;
             let additionalResults = [];
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
-                    const isAdditional = typeof mapping.data.completion === 'object' && mapping.data.completion.isAdditional;
-                    if (!isAdditional && mainResult) {
-                        continue;
+            let isAdditional;
+            const generatedOffset = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, data => {
+                if (!(0, language_core_1.isCompletionEnabled)(data)) {
+                    return false;
+                }
+                isAdditional = typeof data.completion === 'object' && data.completion.isAdditional;
+                if (!isAdditional && mainResult) {
+                    return false;
+                }
+                return true;
+            });
+            if (generatedOffset !== undefined) {
+                const result = getCompletionsAtPosition(fileName, generatedOffset, options, formattingSettings);
+                if (result) {
+                    for (const entry of result.entries) {
+                        entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(sourceScript, map, entry.replacementSpan, language_core_1.isCompletionEnabled);
                     }
-                    const result = getCompletionsAtPosition(fileName, generateOffset + sourceScript.snapshot.getLength(), options, formattingSettings);
-                    if (result) {
-                        for (const entry of result.entries) {
-                            entry.replacementSpan = (0, transform_1.transformSpan)(language, fileName, entry.replacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
-                        }
-                        result.optionalReplacementSpan = (0, transform_1.transformSpan)(language, fileName, result.optionalReplacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
-                        if (isAdditional) {
-                            additionalResults.push(result);
-                        }
-                        else {
-                            mainResult = result;
-                        }
+                    result.optionalReplacementSpan = result.optionalReplacementSpan && (0, transform_1.transformTextSpan)(sourceScript, map, result.optionalReplacementSpan, language_core_1.isCompletionEnabled);
+                    if (isAdditional) {
+                        additionalResults.push(result);
+                    }
+                    else {
+                        mainResult = result;
                     }
                 }
             }
@@ -465,11 +528,9 @@ function decorateLanguageService(language, languageService) {
         let details;
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
-                    details = getCompletionEntryDetails(fileName, generateOffset + sourceScript.snapshot.getLength(), entryName, formatOptions, source, preferences, data);
-                    break;
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCompletionEnabled);
+            if (generatePosition !== undefined) {
+                details = getCompletionEntryDetails(fileName, generatePosition, entryName, formatOptions, source, preferences, data);
             }
         }
         else {
@@ -504,14 +565,12 @@ function decorateLanguageService(language, languageService) {
             const result = provideInlayHints(fileName, { start, length: end - start }, preferences);
             const hints = [];
             for (const hint of result) {
-                for (const [sourcePosition, mapping] of map.getSourceOffsets(hint.position - sourceScript.snapshot.getLength())) {
-                    if ((0, language_core_1.isInlayHintsEnabled)(mapping.data)) {
-                        hints.push({
-                            ...hint,
-                            position: sourcePosition,
-                        });
-                        break;
-                    }
+                const sourcePosition = (0, transform_1.toSourceOffset)(sourceScript, map, hint.position, language_core_1.isInlayHintsEnabled);
+                if (sourcePosition !== undefined) {
+                    hints.push({
+                        ...hint,
+                        position: sourcePosition,
+                    });
                 }
             }
             return hints;
@@ -532,9 +591,9 @@ function decorateLanguageService(language, languageService) {
         const processedFilePositions = new Set();
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
+            for (const [generatedOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if (filter(mapping.data)) {
-                    process(fileName, generateOffset + sourceScript.snapshot.getLength());
+                    process(fileName, generatedOffset + sourceScript.snapshot.getLength());
                 }
             }
         }
@@ -554,11 +613,11 @@ function decorateLanguageService(language, languageService) {
             results = results.concat(result);
             for (const ref of getLinkedCodes(result)) {
                 processedFilePositions.add(ref[0] + ':' + ref[1]);
-                const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, ref[0]);
-                if (!serviceScript) {
+                const [virtualFile, sourceScript] = (0, utils_1.getServiceScript)(language, ref[0]);
+                if (!virtualFile) {
                     continue;
                 }
-                const linkedCodeMap = language.linkedCodeMaps.get(serviceScript.code);
+                const linkedCodeMap = language.linkedCodeMaps.get(virtualFile.code);
                 if (!linkedCodeMap) {
                     continue;
                 }

package/lib/node/decorateLanguageServiceHost.d.ts

@@ -1,4 +1,4 @@
-import { type Language } from '@volar/language-core';
+import type { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function decorateLanguageServiceHost(language: Language, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript')): void;
+export declare function decorateLanguageServiceHost(ts: typeof import('typescript'), language: Language, languageServiceHost: ts.LanguageServiceHost, getLanguageId: (fileName: string) => string): void;
 export declare function searchExternalFiles(ts: typeof import('typescript'), project: ts.server.Project, exts: string[]): string[];

package/lib/node/decorateLanguageServiceHost.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchExternalFiles = exports.decorateLanguageServiceHost = void 0;
-const language_core_1 = require("@volar/language-core");
 const resolveModuleName_1 = require("../resolveModuleName");
-function decorateLanguageServiceHost(language, languageServiceHost, ts) {
+function decorateLanguageServiceHost(ts, language, languageServiceHost, getLanguageId) {
     let extraProjectVersion = 0;
     const exts = language.plugins
         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
@@ -57,35 +56,31 @@ function decorateLanguageServiceHost(language, languageServiceHost, ts) {
         };
     }
     languageServiceHost.getScriptSnapshot = fileName => {
-        if (exts.some(ext => fileName.endsWith(ext))) {
-            updateScript(fileName);
-            return scripts.get(fileName)?.snapshot;
+        const virtualScript = updateVirtualScript(fileName);
+        if (virtualScript) {
+            return virtualScript.snapshot;
         }
         return getScriptSnapshot(fileName);
     };
     if (getScriptKind) {
         languageServiceHost.getScriptKind = fileName => {
-            if (exts.some(ext => fileName.endsWith(ext))) {
-                updateScript(fileName);
-                const script = scripts.get(fileName);
-                if (script) {
-                    return script.kind;
-                }
-                return ts.ScriptKind.Deferred;
+            const virtualScript = updateVirtualScript(fileName);
+            if (virtualScript) {
+                return virtualScript.kind;
             }
             return getScriptKind(fileName);
         };
     }
-    function updateScript(fileName) {
+    function updateVirtualScript(fileName) {
         const version = languageServiceHost.getScriptVersion(fileName);
-        if (version !== scripts.get(fileName)?.version) {
+        if (version !== scripts.get(fileName)?.[0]) {
             let extension = '.ts';
             let snapshotSnapshot;
             let scriptKind = ts.ScriptKind.TS;
             const snapshot = getScriptSnapshot(fileName);
             if (snapshot) {
                 extraProjectVersion++;
-                const sourceScript = language.scripts.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                const sourceScript = language.scripts.set(fileName, getLanguageId(fileName), snapshot);
                 if (sourceScript.generated) {
                     const text = snapshot.getText(0, snapshot.getLength());
                     let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
@@ -105,14 +100,18 @@ function decorateLanguageServiceHost(language, languageServiceHost, ts) {
                 extraProjectVersion++;
                 language.scripts.delete(fileName);
             }
-            scripts.set(fileName, {
-                version,
-                extension,
-                snapshot: snapshotSnapshot,
-                kind: scriptKind,
-            });
+            if (snapshotSnapshot) {
+                scripts.set(fileName, [
+                    version,
+                    {
+                        extension,
+                        snapshot: snapshotSnapshot,
+                        kind: scriptKind,
+                    }
+                ]);
+            }
         }
-        return scripts.get(fileName);
+        return scripts.get(fileName)?.[1];
     }
 }
 exports.decorateLanguageServiceHost = decorateLanguageServiceHost;

package/lib/node/proxyCreateProgram.d.ts

@@ -1,3 +1,3 @@
 import type * as ts from 'typescript';
 import { LanguagePlugin } from '@volar/language-core';
-export declare function proxyCreateProgram(ts: typeof import('typescript'), original: typeof ts['createProgram'], extensions: string[], getLanguagePlugins: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin[]): typeof import("typescript").createProgram;
+export declare function proxyCreateProgram(ts: typeof import('typescript'), original: typeof ts['createProgram'], getLanguagePlugins: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin[], getLanguageId: (fileName: string) => string): typeof import("typescript").createProgram;

package/lib/node/proxyCreateProgram.js

@@ -3,13 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.proxyCreateProgram = void 0;
 const decorateProgram_1 = require("./decorateProgram");
 const language_core_1 = require("@volar/language-core");
-function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
+function proxyCreateProgram(ts, original, getLanguagePlugins, getLanguageId) {
     return new Proxy(original, {
         apply: (target, thisArg, args) => {
             const options = args[0];
             assert(!!options.host, '!!options.host');
+            const languagePlugins = getLanguagePlugins(ts, options);
+            const extensions = languagePlugins
+                .map(plugin => plugin.typescript?.extraFileExtensions.map(({ extension }) => `.${extension}`) ?? [])
+                .flat();
             const sourceFileToSnapshotMap = new WeakMap();
-            const language = (0, language_core_1.createLanguage)(getLanguagePlugins(ts, options), ts.sys.useCaseSensitiveFileNames, fileName => {
+            const language = (0, language_core_1.createLanguage)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
                 let snapshot;
                 assert(originalSourceFiles.has(fileName), `originalSourceFiles.has(${fileName})`);
                 const sourceFile = originalSourceFiles.get(fileName);
@@ -31,7 +35,7 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
                     }
                 }
                 if (snapshot) {
-                    language.scripts.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                    language.scripts.set(fileName, getLanguageId(fileName), snapshot);
                 }
                 else {
                     language.scripts.delete(fileName);
@@ -97,7 +101,7 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
             const program = Reflect.apply(target, thisArg, [options]);
             (0, decorateProgram_1.decorateProgram)(language, program);
             // TODO: #128
-            program.__volar__ = { files: language };
+            program.__volar__ = { language };
             return program;
             function resolveModuleName(name, containingFile, options, redirectedReference) {
                 const resolved = ts.resolveModuleName(name, containingFile, options, moduleResolutionHost, originalHost.getModuleResolutionCache?.(), redirectedReference);

package/lib/node/transform.d.ts

@@ -1,10 +1,15 @@
-import { Language, CodeInformation } from '@volar/language-core';
+import { Language, CodeInformation, SourceMap, SourceScript } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function transformCallHierarchyItem(files: Language, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
-export declare function transformDiagnostic<T extends ts.Diagnostic>(files: Language, diagnostic: T): T | undefined;
-export declare function transformFileTextChanges(files: Language, changes: ts.FileTextChanges, filter: (data: CodeInformation) => boolean): ts.FileTextChanges | undefined;
-export declare function transformDocumentSpan<T extends ts.DocumentSpan>(files: Language, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
-export declare function transformSpan(files: Language, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {
+export declare function transformCallHierarchyItem(language: Language, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
+export declare function transformDiagnostic<T extends ts.Diagnostic>(language: Language, diagnostic: T): T | undefined;
+export declare function transformSourceFile(sourceFile: ts.SourceFile, sourceText: string): ts.SourceFile;
+export declare function transformFileTextChanges(language: Language, changes: ts.FileTextChanges, filter: (data: CodeInformation) => boolean): ts.FileTextChanges | undefined;
+export declare function transformDocumentSpan<T extends ts.DocumentSpan>(language: Language, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
+export declare function transformSpan(language: Language, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {
     fileName: string;
     textSpan: ts.TextSpan;
 } | undefined;
+export declare function transformTextChange(sourceScript: SourceScript, map: SourceMap<CodeInformation>, textChange: ts.TextChange, filter: (data: CodeInformation) => boolean): ts.TextChange | undefined;
+export declare function transformTextSpan(sourceScript: SourceScript, map: SourceMap<CodeInformation>, textSpan: ts.TextSpan, filter: (data: CodeInformation) => boolean): ts.TextSpan | undefined;
+export declare function toSourceOffset(sourceScript: SourceScript, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
+export declare function toGeneratedOffset(sourceScript: SourceScript, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): number | undefined;

package/lib/node/transform.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
+exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.transformSourceFile = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
 const language_core_1 = require("@volar/language-core");
 const utils_1 = require("./utils");
 const transformedDiagnostics = new WeakMap();
-function transformCallHierarchyItem(files, item, filter) {
-    const span = transformSpan(files, item.file, item.span, filter);
-    const selectionSpan = transformSpan(files, item.file, item.selectionSpan, filter);
+const transformedSourceFiles = new WeakMap();
+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,
         span: span?.textSpan ?? { start: 0, length: 0 },
@@ -14,26 +15,27 @@ function transformCallHierarchyItem(files, item, filter) {
     };
 }
 exports.transformCallHierarchyItem = transformCallHierarchyItem;
-function transformDiagnostic(files, diagnostic) {
+function transformDiagnostic(language, diagnostic) {
     if (!transformedDiagnostics.has(diagnostic)) {
         transformedDiagnostics.set(diagnostic, undefined);
         const { relatedInformation } = diagnostic;
         if (relatedInformation) {
             diagnostic.relatedInformation = relatedInformation
-                .map(d => transformDiagnostic(files, d))
+                .map(d => transformDiagnostic(language, d))
                 .filter(utils_1.notEmpty);
         }
         if (diagnostic.file !== undefined
             && diagnostic.start !== undefined
             && diagnostic.length !== undefined) {
-            const [virtualCode, sourceScript, map] = (0, utils_1.getServiceScript)(files, diagnostic.file.fileName);
-            if (virtualCode) {
-                const sourceRange = transformRange(sourceScript, map, diagnostic.start, diagnostic.start + diagnostic.length, language_core_1.shouldReportDiagnostics);
-                if (sourceRange) {
+            const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, diagnostic.file.fileName);
+            if (serviceScript) {
+                const sourceSpan = transformTextSpan(sourceScript, map, { start: diagnostic.start, length: diagnostic.length }, language_core_1.shouldReportDiagnostics);
+                if (sourceSpan) {
                     transformedDiagnostics.set(diagnostic, {
                         ...diagnostic,
-                        start: sourceRange[0],
-                        length: sourceRange[1] - sourceRange[0],
+                        start: sourceSpan.start,
+                        length: sourceSpan.length,
+                        file: transformSourceFile(diagnostic.file, sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength())),
                     });
                 }
             }
@@ -48,13 +50,23 @@ function transformDiagnostic(files, diagnostic) {
     return transformedDiagnostics.get(diagnostic);
 }
 exports.transformDiagnostic = transformDiagnostic;
-function transformFileTextChanges(files, changes, filter) {
-    const [_, source] = (0, utils_1.getServiceScript)(files, changes.fileName);
+function transformSourceFile(sourceFile, sourceText) {
+    if (!transformedSourceFiles.has(sourceFile)) {
+        transformedSourceFiles.set(sourceFile, {
+            ...sourceFile,
+            text: sourceText,
+        });
+    }
+    return transformedSourceFiles.get(sourceFile);
+}
+exports.transformSourceFile = transformSourceFile;
+function transformFileTextChanges(language, changes, filter) {
+    const [_, source] = (0, utils_1.getServiceScript)(language, changes.fileName);
     if (source) {
         return {
             ...changes,
             textChanges: changes.textChanges.map(c => {
-                const span = transformSpan(files, changes.fileName, c.span, filter);
+                const span = transformSpan(language, changes.fileName, c.span, filter);
                 if (span) {
                     return {
                         ...c,
@@ -69,11 +81,11 @@ function transformFileTextChanges(files, changes, filter) {
     }
 }
 exports.transformFileTextChanges = transformFileTextChanges;
-function transformDocumentSpan(files, documentSpan, filter, shouldFallback) {
-    let textSpan = transformSpan(files, documentSpan.fileName, documentSpan.textSpan, filter);
+function transformDocumentSpan(language, documentSpan, filter, shouldFallback) {
+    let textSpan = transformSpan(language, documentSpan.fileName, documentSpan.textSpan, filter);
     if (!textSpan && shouldFallback) {
-        const [virtualCode] = (0, utils_1.getServiceScript)(files, documentSpan.fileName);
-        if (virtualCode) {
+        const [serviceScript] = (0, utils_1.getServiceScript)(language, documentSpan.fileName);
+        if (serviceScript) {
             textSpan = {
                 fileName: documentSpan.fileName,
                 textSpan: { start: 0, length: 0 },
@@ -83,9 +95,9 @@ function transformDocumentSpan(files, documentSpan, filter, shouldFallback) {
     if (!textSpan) {
         return;
     }
-    const contextSpan = transformSpan(files, documentSpan.fileName, documentSpan.contextSpan, filter);
-    const originalTextSpan = transformSpan(files, documentSpan.originalFileName, documentSpan.originalTextSpan, filter);
-    const originalContextSpan = transformSpan(files, 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,
@@ -97,23 +109,17 @@ function transformDocumentSpan(files, documentSpan, filter, shouldFallback) {
     };
 }
 exports.transformDocumentSpan = transformDocumentSpan;
-function transformSpan(files, fileName, textSpan, filter) {
-    if (!fileName) {
-        return;
-    }
-    if (!textSpan) {
+function transformSpan(language, fileName, textSpan, filter) {
+    if (!fileName || !textSpan) {
         return;
     }
-    const [virtualFile, sourceScript, map] = (0, utils_1.getServiceScript)(files, fileName);
+    const [virtualFile, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
     if (virtualFile) {
-        const sourceRange = transformRange(sourceScript, map, textSpan.start, textSpan.start + textSpan.length, filter);
-        if (sourceRange) {
+        const sourceSpan = transformTextSpan(sourceScript, map, textSpan, filter);
+        if (sourceSpan) {
             return {
                 fileName,
-                textSpan: {
-                    start: sourceRange[0],
-                    length: sourceRange[1] - sourceRange[0],
-                },
+                textSpan: sourceSpan,
             };
         }
     }
@@ -125,15 +131,43 @@ function transformSpan(files, fileName, textSpan, filter) {
     }
 }
 exports.transformSpan = transformSpan;
-function transformRange(sourceScript, map, start, end, filter) {
-    for (const sourceStart of map.getSourceOffsets(start - sourceScript.snapshot.getLength())) {
-        if (filter(sourceStart[1].data)) {
-            for (const sourceEnd of map.getSourceOffsets(end - sourceScript.snapshot.getLength())) {
-                if (sourceEnd[0] >= sourceStart[0] && filter(sourceEnd[1].data)) {
-                    return [sourceStart[0], sourceEnd[0]];
-                }
-            }
+function transformTextChange(sourceScript, map, textChange, filter) {
+    const sourceSpan = transformTextSpan(sourceScript, map, textChange.span, filter);
+    if (sourceSpan) {
+        return {
+            newText: textChange.newText,
+            span: sourceSpan,
+        };
+    }
+}
+exports.transformTextChange = transformTextChange;
+function transformTextSpan(sourceScript, map, textSpan, filter) {
+    const start = textSpan.start;
+    const end = textSpan.start + textSpan.length;
+    const sourceStart = toSourceOffset(sourceScript, map, start, filter);
+    const sourceEnd = toSourceOffset(sourceScript, map, end, filter);
+    if (sourceStart !== undefined && sourceEnd !== undefined && sourceEnd >= sourceStart) {
+        return {
+            start: sourceStart,
+            length: sourceEnd - sourceStart,
+        };
+    }
+}
+exports.transformTextSpan = transformTextSpan;
+function toSourceOffset(sourceScript, map, position, filter) {
+    for (const [sourceOffset, mapping] of map.getSourceOffsets(position - sourceScript.snapshot.getLength())) {
+        if (filter(mapping.data)) {
+            return sourceOffset;
+        }
+    }
+}
+exports.toSourceOffset = toSourceOffset;
+function toGeneratedOffset(sourceScript, map, position, filter) {
+    for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
+        if (filter(mapping.data)) {
+            return generateOffset + sourceScript.snapshot.getLength();
         }
     }
 }
+exports.toGeneratedOffset = toGeneratedOffset;
 //# sourceMappingURL=transform.js.map

package/lib/quickstart/createAsyncLanguageServicePlugin.d.ts

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

package/lib/quickstart/createAsyncLanguageServicePlugin.js

@@ -8,7 +8,7 @@ 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, loadLanguagePlugins, getLanguageId) {
     return modules => {
         const { typescript: ts } = modules;
         const pluginModule = {
@@ -55,14 +55,14 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                         const language = (0, language_core_1.createLanguage)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
                             const snapshot = getScriptSnapshot(fileName);
                             if (snapshot) {
-                                language.scripts.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                                language.scripts.set(fileName, getLanguageId(fileName), snapshot);
                             }
                             else {
                                 language.scripts.delete(fileName);
                             }
                         });
                         (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
-                        (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(language, info.languageServiceHost, ts);
+                        (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost, getLanguageId);
                         info.project.markAsDirty();
                         initialized = true;
                     });

package/lib/quickstart/createLanguageServicePlugin.d.ts

@@ -1,4 +1,4 @@
 import type * as ts from 'typescript';
 import { LanguagePlugin } from '@volar/language-core';
-export declare function createLanguageServicePlugin(loadLanguagePlugins: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => LanguagePlugin[]): ts.server.PluginModuleFactory;
+export declare function createLanguageServicePlugin(loadLanguagePlugins: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => LanguagePlugin[], getLanguageId: (fileName: string) => string): ts.server.PluginModuleFactory;
 export declare function arrayItemsEqual(a: string[], b: string[]): boolean;

package/lib/quickstart/createLanguageServicePlugin.js

@@ -8,7 +8,7 @@ const externalFiles = new WeakMap();
 const projectExternalFileExtensions = new WeakMap();
 const decoratedLanguageServices = new WeakSet();
 const decoratedLanguageServiceHosts = new WeakSet();
-function createLanguageServicePlugin(loadLanguagePlugins) {
+function createLanguageServicePlugin(loadLanguagePlugins, getLanguageId) {
     return modules => {
         const { typescript: ts } = modules;
         const pluginModule = {
@@ -26,14 +26,14 @@ function createLanguageServicePlugin(loadLanguagePlugins) {
                     const language = (0, language_core_1.createLanguage)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
                         const snapshot = getScriptSnapshot(fileName);
                         if (snapshot) {
-                            language.scripts.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                            language.scripts.set(fileName, getLanguageId(fileName), snapshot);
                         }
                         else {
                             language.scripts.delete(fileName);
                         }
                     });
                     (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
-                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(language, info.languageServiceHost, ts);
+                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost, getLanguageId);
                 }
                 return info.languageService;
             },

package/lib/quickstart/runTsc.d.ts

@@ -1,4 +1,5 @@
 import type * as ts from 'typescript';
 import type { LanguagePlugin } from '@volar/language-core';
 export declare let getLanguagePlugins: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin[];
-export declare function runTsc(tscPath: string, extensions: string[], _getLanguagePlugins: typeof getLanguagePlugins): void;
+export declare let getLanguageId: (fileName: string) => string;
+export declare function runTsc(tscPath: string, extensions: string[], _getLanguagePlugins: typeof getLanguagePlugins, _getLanguageId: typeof getLanguageId): void;

package/lib/quickstart/runTsc.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runTsc = exports.getLanguagePlugins = void 0;
+exports.runTsc = exports.getLanguageId = exports.getLanguagePlugins = void 0;
 const fs = require("fs");
 let getLanguagePlugins = () => [];
 exports.getLanguagePlugins = getLanguagePlugins;
-function runTsc(tscPath, extensions, _getLanguagePlugins) {
+let getLanguageId = () => 'ts';
+exports.getLanguageId = getLanguageId;
+function runTsc(tscPath, extensions, _getLanguagePlugins, _getLanguageId) {
     exports.getLanguagePlugins = _getLanguagePlugins;
+    exports.getLanguageId = _getLanguageId;
     const proxyApiPath = require.resolve('../node/proxyCreateProgram');
     const readFileSync = fs.readFileSync;
     fs.readFileSync = (...args) => {
@@ -18,10 +21,12 @@ function runTsc(tscPath, extensions, _getLanguagePlugins) {
             tsc = replace(tsc, /allSupportedExtensions = .*(?=;)/, s => s + `.concat([[${extsText}]])`);
             // proxy createProgram
             tsc = replace(tsc, /function createProgram\(.+\) {/, s => `var createProgram = require(${JSON.stringify(proxyApiPath)}).proxyCreateProgram(`
-                + `new Proxy({}, { get(_target, p, _receiver) { return eval(p); } } ), `
-                + `_createProgram, `
-                + `[${extsText}], `
-                + `require(${JSON.stringify(__filename)}).getLanguagePlugins`
+                + [
+                    `new Proxy({}, { get(_target, p, _receiver) { return eval(p); } } )`,
+                    `_createProgram`,
+                    `require(${JSON.stringify(__filename)}).getLanguagePlugins`,
+                    `require(${JSON.stringify(__filename)}).getLanguageId`,
+                ].join(', ')
                 + `);\n`
                 + s.replace('createProgram', '_createProgram'));
             return tsc;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.2.0-alpha.0",
+	"version": "2.2.0-alpha.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,13 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.2.0-alpha.0",
+		"@volar/language-core": "2.2.0-alpha.2",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.2.0-alpha.0"
+		"@volar/language-service": "2.2.0-alpha.2"
 	},
-	"gitHead": "95ffe51f944ee87f570be113541e17ddfe75f588"
+	"gitHead": "c6a538c915cc8b32ad9a7ca1092a29a326d49161"
 }