@volar/typescript 2.2.0-alpha.10 → 2.2.0-alpha.12

package/lib/common.d.ts

@@ -0,0 +1,2 @@
+import type { LanguagePlugin } from "@volar/language-core";
+export declare const fileLanguageIdProviderPlugin: LanguagePlugin;

package/lib/common.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fileLanguageIdProviderPlugin = void 0;
+exports.fileLanguageIdProviderPlugin = {
+    getLanguageId(scriptId) {
+        const ext = scriptId.split('.').pop();
+        switch (ext) {
+            case 'js': return 'javascript';
+            case 'cjs': return 'javascript';
+            case 'mjs': return 'javascript';
+            case 'ts': return 'typescript';
+            case 'cts': return 'typescript';
+            case 'mts': return 'typescript';
+            case 'jsx': return 'javascriptreact';
+            case 'tsx': return 'typescriptreact';
+            case 'json': return 'json';
+        }
+    },
+};
+//# sourceMappingURL=common.js.map

package/lib/node/decorateLanguageService.js

@@ -5,10 +5,12 @@ const language_core_1 = require("@volar/language-core");
 const dedupe_1 = require("./dedupe");
 const utils_1 = require("./utils");
 const transform_1 = require("./transform");
+const windowsPathReg = /\\/g;
 function decorateLanguageService(language, languageService) {
     // ignored methods
     const { getNavigationTree, getOutliningSpans, } = languageService;
-    languageService.getNavigationTree = fileName => {
+    languageService.getNavigationTree = filePath => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const tree = getNavigationTree(fileName);
@@ -19,7 +21,8 @@ function decorateLanguageService(language, languageService) {
             return getNavigationTree(fileName);
         }
     };
-    languageService.getOutliningSpans = fileName => {
+    languageService.getOutliningSpans = filePath => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             return [];
@@ -30,7 +33,8 @@ function decorateLanguageService(language, languageService) {
     };
     // methods
     const { findReferences, findRenameLocations, getCompletionEntryDetails, getCompletionsAtPosition, getDefinitionAndBoundSpan, getDefinitionAtPosition, getFileReferences, getFormattingEditsForDocument, getFormattingEditsForRange, getFormattingEditsAfterKeystroke, getImplementationAtPosition, getLinkedEditingRangeAtPosition, getQuickInfoAtPosition, getSignatureHelpItems, getReferencesAtPosition, getSemanticDiagnostics, getSyntacticDiagnostics, getSuggestionDiagnostics, getTypeDefinitionAtPosition, getEncodedSemanticClassifications, getDocumentHighlights, getApplicableRefactors, getEditsForFileRename, getEditsForRefactor, getRenameInfo, getCodeFixesAtPosition, prepareCallHierarchy, provideCallHierarchyIncomingCalls, provideCallHierarchyOutgoingCalls, provideInlayHints, organizeImports, } = languageService;
-    languageService.getFormattingEditsForDocument = (fileName, options) => {
+    languageService.getFormattingEditsForDocument = (filePath, options) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             if (!map.mappings.some(mapping => (0, language_core_1.isFormattingEnabled)(mapping.data))) {
@@ -45,7 +49,8 @@ function decorateLanguageService(language, languageService) {
             return getFormattingEditsForDocument(fileName, options);
         }
     };
-    languageService.getFormattingEditsForRange = (fileName, start, end, options) => {
+    languageService.getFormattingEditsForRange = (filePath, start, end, options) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         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);
@@ -62,7 +67,8 @@ function decorateLanguageService(language, languageService) {
             return getFormattingEditsForRange(fileName, start, end, options);
         }
     };
-    languageService.getFormattingEditsAfterKeystroke = (fileName, position, key, options) => {
+    languageService.getFormattingEditsAfterKeystroke = (filePath, position, key, options) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         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);
@@ -84,7 +90,8 @@ function decorateLanguageService(language, languageService) {
             .map(edit => (0, transform_1.transformFileTextChanges)(language, edit, language_core_1.isRenameEnabled))
             .filter(utils_1.notEmpty);
     };
-    languageService.getLinkedEditingRangeAtPosition = (fileName, position) => {
+    languageService.getLinkedEditingRangeAtPosition = (filePath, position) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         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);
@@ -104,7 +111,8 @@ function decorateLanguageService(language, languageService) {
             return getLinkedEditingRangeAtPosition(fileName, position);
         }
     };
-    languageService.prepareCallHierarchy = (fileName, position) => {
+    languageService.prepareCallHierarchy = (filePath, position) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
@@ -122,8 +130,9 @@ function decorateLanguageService(language, languageService) {
             return prepareCallHierarchy(fileName, position);
         }
     };
-    languageService.provideCallHierarchyIncomingCalls = (fileName, position) => {
+    languageService.provideCallHierarchyIncomingCalls = (filePath, position) => {
         let calls = [];
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
@@ -146,8 +155,9 @@ function decorateLanguageService(language, languageService) {
             };
         });
     };
-    languageService.provideCallHierarchyOutgoingCalls = (fileName, position) => {
+    languageService.provideCallHierarchyOutgoingCalls = (filePath, position) => {
         let calls = [];
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
@@ -179,7 +189,8 @@ function decorateLanguageService(language, languageService) {
             .filter(utils_1.notEmpty);
         return resolved;
     };
-    languageService.getQuickInfoAtPosition = (fileName, position) => {
+    languageService.getQuickInfoAtPosition = (filePath, position) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isHoverEnabled);
@@ -200,7 +211,8 @@ function decorateLanguageService(language, languageService) {
             return getQuickInfoAtPosition(fileName, position);
         }
     };
-    languageService.getSignatureHelpItems = (fileName, position, options) => {
+    languageService.getSignatureHelpItems = (filePath, position, options) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isSignatureHelpEnabled);
@@ -221,7 +233,8 @@ function decorateLanguageService(language, languageService) {
             return getSignatureHelpItems(fileName, position, options);
         }
     };
-    languageService.getDocumentHighlights = (fileName, position, filesToSearch) => {
+    languageService.getDocumentHighlights = (filePath, position, filesToSearch) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isHighlightEnabled, position => getDocumentHighlights(fileName, position, filesToSearch), function* (result) {
             for (const ref of result) {
                 for (const reference of ref.highlightSpans) {
@@ -250,7 +263,8 @@ function decorateLanguageService(language, languageService) {
         });
         return resolved;
     };
-    languageService.getApplicableRefactors = (fileName, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
+    languageService.getApplicableRefactors = (filePath, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
@@ -269,8 +283,9 @@ function decorateLanguageService(language, languageService) {
             return getApplicableRefactors(fileName, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions);
         }
     };
-    languageService.getEditsForRefactor = (fileName, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
+    languageService.getEditsForRefactor = (filePath, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
         let edits;
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, typeof positionOrRange === 'number'
@@ -296,12 +311,13 @@ function decorateLanguageService(language, languageService) {
             return edits;
         }
     };
-    languageService.getRenameInfo = (fileName, position, options) => {
+    languageService.getRenameInfo = (filePath, position, options) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isRenameEnabled);
-            if (generatePosition !== undefined) {
-                const info = getRenameInfo(fileName, generatePosition, options);
+            let failed;
+            for (const generateOffset of (0, transform_1.forEachGeneratedOffset)(sourceScript, map, position, language_core_1.isRenameEnabled)) {
+                const info = getRenameInfo(fileName, generateOffset, options);
                 if (info.canRename) {
                     const span = (0, transform_1.transformTextSpan)(sourceScript, map, info.triggerSpan, language_core_1.isRenameEnabled);
                     if (span) {
@@ -310,9 +326,12 @@ function decorateLanguageService(language, languageService) {
                     }
                 }
                 else {
-                    return info;
+                    failed = info;
                 }
             }
+            if (failed) {
+                return failed;
+            }
             return {
                 canRename: false,
                 localizedErrorMessage: 'Failed to get rename locations',
@@ -322,8 +341,9 @@ function decorateLanguageService(language, languageService) {
             return getRenameInfo(fileName, position, options);
         }
     };
-    languageService.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
+    languageService.getCodeFixesAtPosition = (filePath, start, end, errorCodes, formatOptions, preferences) => {
         let fixes = [];
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const generateStart = (0, transform_1.toGeneratedOffset)(sourceScript, map, start, language_core_1.isCodeActionsEnabled);
@@ -341,7 +361,8 @@ function decorateLanguageService(language, languageService) {
         });
         return fixes;
     };
-    languageService.getEncodedSemanticClassifications = (fileName, span, format) => {
+    languageService.getEncodedSemanticClassifications = (filePath, span, format) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             let start;
@@ -375,22 +396,26 @@ function decorateLanguageService(language, languageService) {
             return getEncodedSemanticClassifications(fileName, span, format);
         }
     };
-    languageService.getSyntacticDiagnostics = fileName => {
+    languageService.getSyntacticDiagnostics = filePath => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         return getSyntacticDiagnostics(fileName)
             .map(d => (0, transform_1.transformDiagnostic)(language, d, false))
             .filter(utils_1.notEmpty);
     };
-    languageService.getSemanticDiagnostics = fileName => {
+    languageService.getSemanticDiagnostics = filePath => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         return getSemanticDiagnostics(fileName)
             .map(d => (0, transform_1.transformDiagnostic)(language, d, false))
             .filter(utils_1.notEmpty);
     };
-    languageService.getSuggestionDiagnostics = fileName => {
+    languageService.getSuggestionDiagnostics = filePath => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         return getSuggestionDiagnostics(fileName)
             .map(d => (0, transform_1.transformDiagnostic)(language, d, false))
             .filter(utils_1.notEmpty);
     };
-    languageService.getDefinitionAndBoundSpan = (fileName, position) => {
+    languageService.getDefinitionAndBoundSpan = (filePath, position) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, position => getDefinitionAndBoundSpan(fileName, position), function* (result) {
             for (const ref of result.definitions ?? []) {
                 yield [ref.fileName, ref.textSpan.start];
@@ -413,7 +438,8 @@ function decorateLanguageService(language, languageService) {
             definitions: (0, dedupe_1.dedupeDocumentSpans)(definitions),
         };
     };
-    languageService.findReferences = (fileName, position) => {
+    languageService.findReferences = (filePath, position) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isReferencesEnabled, position => findReferences(fileName, position), function* (result) {
             for (const ref of result) {
                 for (const reference of ref.references) {
@@ -434,7 +460,8 @@ function decorateLanguageService(language, languageService) {
         });
         return resolved;
     };
-    languageService.getDefinitionAtPosition = (fileName, position) => {
+    languageService.getDefinitionAtPosition = (filePath, position) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, position => getDefinitionAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
@@ -446,7 +473,8 @@ function decorateLanguageService(language, languageService) {
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.getTypeDefinitionAtPosition = (fileName, position) => {
+    languageService.getTypeDefinitionAtPosition = (filePath, position) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isTypeDefinitionEnabled, position => getTypeDefinitionAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
@@ -458,7 +486,8 @@ function decorateLanguageService(language, languageService) {
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.getImplementationAtPosition = (fileName, position) => {
+    languageService.getImplementationAtPosition = (filePath, position) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isImplementationEnabled, position => getImplementationAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
@@ -470,7 +499,8 @@ function decorateLanguageService(language, languageService) {
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.findRenameLocations = (fileName, position, findInStrings, findInComments, preferences) => {
+    languageService.findRenameLocations = (filePath, position, findInStrings, findInComments, preferences) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isRenameEnabled, position => findRenameLocations(fileName, position, findInStrings, findInComments, preferences), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
@@ -482,7 +512,8 @@ function decorateLanguageService(language, languageService) {
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.getReferencesAtPosition = (fileName, position) => {
+    languageService.getReferencesAtPosition = (filePath, position) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isReferencesEnabled, position => getReferencesAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
@@ -494,7 +525,8 @@ function decorateLanguageService(language, languageService) {
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
+    languageService.getCompletionsAtPosition = (filePath, position, options, formattingSettings) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             let mainResult;
@@ -542,8 +574,9 @@ function decorateLanguageService(language, languageService) {
             return getCompletionsAtPosition(fileName, position, options, formattingSettings);
         }
     };
-    languageService.getCompletionEntryDetails = (fileName, position, entryName, formatOptions, source, preferences, data) => {
+    languageService.getCompletionEntryDetails = (filePath, position, entryName, formatOptions, source, preferences, data) => {
         let details;
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCompletionEnabled);
@@ -561,7 +594,8 @@ function decorateLanguageService(language, languageService) {
         }
         return details;
     };
-    languageService.provideInlayHints = (fileName, span, preferences) => {
+    languageService.provideInlayHints = (filePath, span, preferences) => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             let start;
@@ -597,7 +631,8 @@ function decorateLanguageService(language, languageService) {
             return provideInlayHints(fileName, span, preferences);
         }
     };
-    languageService.getFileReferences = fileName => {
+    languageService.getFileReferences = filePath => {
+        const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = getFileReferences(fileName);
         const resolved = unresolved
             .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isReferencesEnabled))

package/lib/node/proxyCreateProgram.d.ts

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

package/lib/node/proxyCreateProgram.js

@@ -4,6 +4,7 @@ exports.proxyCreateProgram = void 0;
 const language_core_1 = require("@volar/language-core");
 const resolveModuleName_1 = require("../resolveModuleName");
 const decorateProgram_1 = require("./decorateProgram");
+const common_1 = require("../common");
 const arrayEqual = (a, b) => {
     if (a.length !== b.length) {
         return false;
@@ -28,7 +29,7 @@ const objectEqual = (a, b) => {
     }
     return true;
 };
-function proxyCreateProgram(ts, original, getLanguagePlugins, getLanguageId) {
+function proxyCreateProgram(ts, original, getLanguagePlugins) {
     const sourceFileSnapshots = new Map();
     const parsedSourceFiles = new WeakMap();
     let lastOptions;
@@ -47,7 +48,10 @@ function proxyCreateProgram(ts, original, getLanguagePlugins, getLanguageId) {
                 moduleResolutionCache = ts.createModuleResolutionCache(options.host.getCurrentDirectory(), options.host.getCanonicalFileName, options.options);
                 lastOptions = options;
                 languagePlugins = getLanguagePlugins(ts, options);
-                language = (0, language_core_1.createLanguage)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
+                language = (0, language_core_1.createLanguage)([
+                    ...languagePlugins,
+                    common_1.fileLanguageIdProviderPlugin,
+                ], ts.sys.useCaseSensitiveFileNames, fileName => {
                     if (!sourceFileSnapshots.has(fileName)) {
                         const sourceFileText = originalHost.readFile(fileName);
                         if (sourceFileText !== undefined) {
@@ -69,7 +73,7 @@ function proxyCreateProgram(ts, original, getLanguagePlugins, getLanguageId) {
                     }
                     const snapshot = sourceFileSnapshots.get(fileName)?.[1];
                     if (snapshot) {
-                        language.scripts.set(fileName, getLanguageId(fileName), snapshot);
+                        language.scripts.set(fileName, snapshot);
                     }
                     else {
                         language.scripts.delete(fileName);

package/lib/node/transform.d.ts

@@ -13,3 +13,4 @@ export declare function transformTextChange(sourceScript: SourceScript, map: Sou
 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;
+export declare function forEachGeneratedOffset(sourceScript: SourceScript, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): Generator<number, void, unknown>;

package/lib/node/transform.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
+exports.forEachGeneratedOffset = exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
 const language_core_1 = require("@volar/language-core");
 const utils_1 = require("./utils");
 const transformedDiagnostics = new WeakMap();
@@ -172,4 +172,12 @@ function toGeneratedOffset(sourceScript, map, position, filter) {
     }
 }
 exports.toGeneratedOffset = toGeneratedOffset;
+function* forEachGeneratedOffset(sourceScript, map, position, filter) {
+    for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
+        if (filter(mapping.data)) {
+            yield generateOffset + sourceScript.snapshot.getLength();
+        }
+    }
+}
+exports.forEachGeneratedOffset = forEachGeneratedOffset;
 //# sourceMappingURL=transform.js.map

package/lib/protocol/createProject.js

@@ -5,10 +5,14 @@ const language_core_1 = require("@volar/language-core");
 const language_core_2 = require("@volar/language-core");
 const path = require("path-browserify");
 const resolveModuleName_1 = require("../resolveModuleName");
+const common_1 = require("../common");
 const scriptVersions = new Map();
 const fsFileSnapshots = new Map();
 function createTypeScriptLanguage(ts, languagePlugins, projectHost) {
-    const language = (0, language_core_1.createLanguage)(languagePlugins, projectHost.useCaseSensitiveFileNames, scriptId => {
+    const language = (0, language_core_1.createLanguage)([
+        ...languagePlugins,
+        common_1.fileLanguageIdProviderPlugin,
+    ], projectHost.useCaseSensitiveFileNames, scriptId => {
         const fileName = projectHost.scriptIdToFileName(scriptId);
         // opened files
         let snapshot = projectHost.getScriptSnapshot(fileName);
@@ -29,7 +33,7 @@ function createTypeScriptLanguage(ts, languagePlugins, projectHost) {
             snapshot = fsFileSnapshots.get(fileName)?.[1];
         }
         if (snapshot) {
-            language.scripts.set(scriptId, projectHost.getLanguageId(scriptId), snapshot);
+            language.scripts.set(scriptId, snapshot);
         }
         else {
             language.scripts.delete(scriptId);

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[]>, getLanguageId: (fileName: string) => string): ts.server.PluginModuleFactory;
+export declare function createAsyncLanguageServicePlugin(extensions: string[], scriptKind: ts.ScriptKind, loadLanguagePlugins: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<LanguagePlugin[]>): ts.server.PluginModuleFactory;

package/lib/quickstart/createAsyncLanguageServicePlugin.js

@@ -5,10 +5,11 @@ const decorateLanguageService_1 = require("../node/decorateLanguageService");
 const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
 const language_core_1 = require("@volar/language-core");
 const createLanguageServicePlugin_1 = require("./createLanguageServicePlugin");
+const common_1 = require("../common");
 const externalFiles = new WeakMap();
 const decoratedLanguageServices = new WeakSet();
 const decoratedLanguageServiceHosts = new WeakSet();
-function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePlugins, getLanguageId) {
+function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePlugins) {
     return modules => {
         const { typescript: ts } = modules;
         const pluginModule = {
@@ -52,10 +53,19 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                         };
                     }
                     loadLanguagePlugins(ts, info).then(languagePlugins => {
-                        const language = (0, language_core_1.createLanguage)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
+                        const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
+                        const language = (0, language_core_1.createLanguage)([
+                            ...languagePlugins,
+                            common_1.fileLanguageIdProviderPlugin,
+                        ], ts.sys.useCaseSensitiveFileNames, fileName => {
+                            const version = getScriptVersion(fileName);
+                            if (syncedScriptVersions.get(fileName) === version) {
+                                return;
+                            }
+                            syncedScriptVersions.set(fileName, version);
                             const snapshot = getScriptSnapshot(fileName);
                             if (snapshot) {
-                                language.scripts.set(fileName, getLanguageId(fileName), snapshot);
+                                language.scripts.set(fileName, snapshot);
                             }
                             else {
                                 language.scripts.delete(fileName);

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[], getLanguageId: (fileName: string) => string): ts.server.PluginModuleFactory;
+export declare function createLanguageServicePlugin(loadLanguagePlugins: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => LanguagePlugin[]): ts.server.PluginModuleFactory;
 export declare function arrayItemsEqual(a: string[], b: string[]): boolean;

package/lib/quickstart/createLanguageServicePlugin.js

@@ -4,11 +4,12 @@ exports.arrayItemsEqual = exports.createLanguageServicePlugin = void 0;
 const decorateLanguageService_1 = require("../node/decorateLanguageService");
 const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
 const language_core_1 = require("@volar/language-core");
+const common_1 = require("../common");
 const externalFiles = new WeakMap();
 const projectExternalFileExtensions = new WeakMap();
 const decoratedLanguageServices = new WeakSet();
 const decoratedLanguageServiceHosts = new WeakSet();
-function createLanguageServicePlugin(loadLanguagePlugins, getLanguageId) {
+function createLanguageServicePlugin(loadLanguagePlugins) {
     return modules => {
         const { typescript: ts } = modules;
         const pluginModule = {
@@ -23,10 +24,20 @@ function createLanguageServicePlugin(loadLanguagePlugins, getLanguageId) {
                         .flat();
                     projectExternalFileExtensions.set(info.project, extensions);
                     const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
-                    const language = (0, language_core_1.createLanguage)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
+                    const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
+                    const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
+                    const language = (0, language_core_1.createLanguage)([
+                        ...languagePlugins,
+                        common_1.fileLanguageIdProviderPlugin,
+                    ], ts.sys.useCaseSensitiveFileNames, fileName => {
+                        const version = getScriptVersion(fileName);
+                        if (syncedScriptVersions.get(fileName) === version) {
+                            return;
+                        }
+                        syncedScriptVersions.set(fileName, version);
                         const snapshot = getScriptSnapshot(fileName);
                         if (snapshot) {
-                            language.scripts.set(fileName, getLanguageId(fileName), snapshot);
+                            language.scripts.set(fileName, snapshot);
                         }
                         else {
                             language.scripts.delete(fileName);

package/lib/quickstart/runTsc.d.ts

@@ -1,5 +1,4 @@
 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 let getLanguageId: (fileName: string) => string;
-export declare function runTsc(tscPath: string, extensions: string[], _getLanguagePlugins: typeof getLanguagePlugins, _getLanguageId: typeof getLanguageId): void;
+export declare function runTsc(tscPath: string, extensions: string[], _getLanguagePlugins: typeof getLanguagePlugins): void;

package/lib/quickstart/runTsc.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runTsc = exports.getLanguageId = exports.getLanguagePlugins = void 0;
+exports.runTsc = exports.getLanguagePlugins = void 0;
 const fs = require("fs");
 let getLanguagePlugins = () => [];
 exports.getLanguagePlugins = getLanguagePlugins;
-let getLanguageId = () => 'ts';
-exports.getLanguageId = getLanguageId;
-function runTsc(tscPath, extensions, _getLanguagePlugins, _getLanguageId) {
+function runTsc(tscPath, extensions, _getLanguagePlugins) {
     exports.getLanguagePlugins = _getLanguagePlugins;
-    exports.getLanguageId = _getLanguageId;
     const proxyApiPath = require.resolve('../node/proxyCreateProgram');
     const readFileSync = fs.readFileSync;
     fs.readFileSync = (...args) => {
@@ -25,7 +22,6 @@ function runTsc(tscPath, extensions, _getLanguagePlugins, _getLanguageId) {
                     `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'));

package/package.json

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

package/lib/documentRegistry.d.ts

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

package/lib/documentRegistry.js

@@ -1,14 +0,0 @@
-"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