@volar/typescript 2.2.0-alpha.1 → 2.2.0-alpha.11

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,19 @@
+"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';
+        }
+    },
+};
+//# 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 [];
@@ -29,8 +32,9 @@ function decorateLanguageService(language, languageService) {
         }
     };
     // methods
-    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 { 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 = (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,30 @@ function decorateLanguageService(language, languageService) {
             return getQuickInfoAtPosition(fileName, position);
         }
     };
-    languageService.getDocumentHighlights = (fileName, position, filesToSearch) => {
+    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);
+            if (generatePosition !== undefined) {
+                const result = getSignatureHelpItems(fileName, generatePosition, options);
+                if (result) {
+                    const applicableSpan = (0, transform_1.transformTextSpan)(sourceScript, map, result.applicableSpan, language_core_1.isSignatureHelpEnabled);
+                    if (applicableSpan) {
+                        return {
+                            ...result,
+                            applicableSpan,
+                        };
+                    }
+                }
+            }
+        }
+        else {
+            return getSignatureHelpItems(fileName, position, options);
+        }
+    };
+    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) {
@@ -229,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);
@@ -248,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'
@@ -275,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) {
@@ -289,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',
@@ -301,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);
@@ -320,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;
@@ -354,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))
+            .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))
+            .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))
+            .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];
@@ -392,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) {
@@ -403,20 +450,18 @@ function decorateLanguageService(language, languageService) {
         const resolved = unresolved
             .flat()
             .map(symbol => {
-            const definition = (0, transform_1.transformDocumentSpan)(language, symbol.definition, language_core_1.isDefinitionEnabled);
-            if (definition) {
-                return {
-                    definition,
-                    references: symbol.references
-                        .map(r => (0, transform_1.transformDocumentSpan)(language, r, language_core_1.isReferencesEnabled))
-                        .filter(utils_1.notEmpty),
-                };
-            }
-        })
-            .filter(utils_1.notEmpty);
-        return (0, dedupe_1.dedupeReferencedSymbols)(resolved);
+            const definition = (0, transform_1.transformDocumentSpan)(language, symbol.definition, language_core_1.isDefinitionEnabled, true);
+            return {
+                definition,
+                references: symbol.references
+                    .map(r => (0, transform_1.transformDocumentSpan)(language, r, language_core_1.isReferencesEnabled))
+                    .filter(utils_1.notEmpty),
+            };
+        });
+        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];
@@ -428,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];
@@ -440,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];
@@ -452,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];
@@ -464,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];
@@ -476,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;
@@ -524,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);
@@ -543,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;
@@ -579,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))
@@ -587,7 +640,7 @@ function decorateLanguageService(language, languageService) {
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     function linkedCodeFeatureWorker(fileName, position, filter, worker, getLinkedCodes) {
-        let results = [];
+        const results = [];
         const processedFilePositions = new Set();
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
@@ -610,7 +663,7 @@ function decorateLanguageService(language, languageService) {
             if (!result) {
                 return;
             }
-            results = results.concat(result);
+            results.push(result);
             for (const ref of getLinkedCodes(result)) {
                 processedFilePositions.add(ref[0] + ':' + ref[1]);
                 const [virtualFile, sourceScript] = (0, utils_1.getServiceScript)(language, ref[0]);

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): void;
 export declare function searchExternalFiles(ts: typeof import('typescript'), project: ts.server.Project, exts: string[]): string[];

package/lib/node/decorateLanguageServiceHost.js

@@ -1,25 +1,23 @@
 "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) {
-    let extraProjectVersion = 0;
-    const exts = language.plugins
+function decorateLanguageServiceHost(ts, language, languageServiceHost) {
+    const extensions = language.plugins
         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
         .flat();
     const scripts = new Map();
+    const crashFileNames = new Set();
     const readDirectory = languageServiceHost.readDirectory?.bind(languageServiceHost);
     const resolveModuleNameLiterals = languageServiceHost.resolveModuleNameLiterals?.bind(languageServiceHost);
     const resolveModuleNames = languageServiceHost.resolveModuleNames?.bind(languageServiceHost);
-    const getProjectVersion = languageServiceHost.getProjectVersion?.bind(languageServiceHost);
     const getScriptSnapshot = languageServiceHost.getScriptSnapshot.bind(languageServiceHost);
     const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost);
     // path completion
     if (readDirectory) {
         languageServiceHost.readDirectory = (path, extensions, exclude, include, depth) => {
             if (extensions) {
-                for (const ext of exts) {
+                for (const ext of extensions) {
                     if (!extensions.includes(ext)) {
                         extensions = [...extensions, ...ext];
                     }
@@ -28,34 +26,33 @@ function decorateLanguageServiceHost(language, languageServiceHost, ts) {
             return readDirectory(path, extensions, exclude, include, depth);
         };
     }
-    if (language.plugins.some(language => language.typescript?.extraFileExtensions.length)) {
+    if (extensions.length) {
         const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, language.plugins, fileName => language.scripts.get(fileName));
+        const getCanonicalFileName = languageServiceHost.useCaseSensitiveFileNames?.()
+            ? (fileName) => fileName
+            : (fileName) => fileName.toLowerCase();
+        const moduleResolutionCache = ts.createModuleResolutionCache(languageServiceHost.getCurrentDirectory(), getCanonicalFileName, languageServiceHost.getCompilationSettings());
         if (resolveModuleNameLiterals) {
             languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, ...rest) => {
-                if (moduleLiterals.every(name => !exts.some(ext => name.text.endsWith(ext)))) {
+                if (moduleLiterals.every(name => !extensions.some(ext => name.text.endsWith(ext)))) {
                     return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, ...rest);
                 }
                 return moduleLiterals.map(moduleLiteral => {
-                    return resolveModuleName(moduleLiteral.text, containingFile, options, undefined, redirectedReference);
+                    return resolveModuleName(moduleLiteral.text, containingFile, options, moduleResolutionCache, redirectedReference);
                 });
             };
         }
         if (resolveModuleNames) {
             languageServiceHost.resolveModuleNames = (moduleNames, containingFile, reusedNames, redirectedReference, options, containingSourceFile) => {
-                if (moduleNames.every(name => !exts.some(ext => name.endsWith(ext)))) {
+                if (moduleNames.every(name => !extensions.some(ext => name.endsWith(ext)))) {
                     return resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, options, containingSourceFile);
                 }
                 return moduleNames.map(moduleName => {
-                    return resolveModuleName(moduleName, containingFile, options, undefined, redirectedReference).resolvedModule;
+                    return resolveModuleName(moduleName, containingFile, options, moduleResolutionCache, redirectedReference).resolvedModule;
                 });
             };
         }
     }
-    if (getProjectVersion) {
-        languageServiceHost.getProjectVersion = () => {
-            return getProjectVersion() + ':' + extraProjectVersion;
-        };
-    }
     languageServiceHost.getScriptSnapshot = fileName => {
         const virtualScript = updateVirtualScript(fileName);
         if (virtualScript) {
@@ -73,46 +70,44 @@ function decorateLanguageServiceHost(language, languageServiceHost, ts) {
         };
     }
     function updateVirtualScript(fileName) {
-        const version = languageServiceHost.getScriptVersion(fileName);
-        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);
-                if (sourceScript.generated) {
-                    const text = snapshot.getText(0, snapshot.getLength());
-                    let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
-                    const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
-                    if (serviceScript) {
-                        extension = serviceScript.extension;
-                        scriptKind = serviceScript.scriptKind;
-                        patchedText += serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
-                    }
-                    snapshotSnapshot = ts.ScriptSnapshot.fromString(patchedText);
-                    if (sourceScript.generated.languagePlugin.typescript?.getExtraServiceScripts) {
-                        console.warn('getExtraScripts() is not available in this use case.');
-                    }
+        if (crashFileNames.has(fileName)) {
+            return;
+        }
+        let version;
+        try {
+            version = languageServiceHost.getScriptVersion(fileName);
+        }
+        catch {
+            // fix https://github.com/vuejs/language-tools/issues/4278
+            crashFileNames.add(fileName);
+        }
+        if (version === undefined) {
+            // somehow getScriptVersion returns undefined
+            return;
+        }
+        let script = scripts.get(fileName);
+        if (!script || script[0] !== version) {
+            script = [version];
+            const sourceScript = language.scripts.get(fileName);
+            if (sourceScript?.generated) {
+                const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
+                if (serviceScript) {
+                    const sourceContents = sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength());
+                    let virtualContents = sourceContents.split('\n').map(line => ' '.repeat(line.length)).join('\n');
+                    virtualContents += serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
+                    script[1] = {
+                        extension: serviceScript.extension,
+                        kind: serviceScript.scriptKind,
+                        snapshot: ts.ScriptSnapshot.fromString(virtualContents),
+                    };
+                }
+                if (sourceScript.generated.languagePlugin.typescript?.getExtraServiceScripts) {
+                    console.warn('getExtraServiceScripts() is not available in TS plugin.');
                 }
             }
-            else if (language.scripts.get(fileName)) {
-                extraProjectVersion++;
-                language.scripts.delete(fileName);
-            }
-            if (snapshotSnapshot) {
-                scripts.set(fileName, [
-                    version,
-                    {
-                        extension,
-                        snapshot: snapshotSnapshot,
-                        kind: scriptKind,
-                    }
-                ]);
-            }
+            scripts.set(fileName, script);
         }
-        return scripts.get(fileName)?.[1];
+        return script[1];
     }
 }
 exports.decorateLanguageServiceHost = decorateLanguageServiceHost;

package/lib/node/decorateProgram.js

@@ -9,6 +9,7 @@ function decorateProgram(language, program) {
     const getSyntacticDiagnostics = program.getSyntacticDiagnostics;
     const getSemanticDiagnostics = program.getSemanticDiagnostics;
     const getGlobalDiagnostics = program.getGlobalDiagnostics;
+    const getSourceFileByPath = program.getSourceFileByPath;
     // for tsc --noEmit --watch
     // @ts-ignore
     const getBindAndCheckDiagnostics = program.getBindAndCheckDiagnostics;
@@ -17,31 +18,39 @@ function decorateProgram(language, program) {
         return {
             ...result,
             diagnostics: result.diagnostics
-                .map(d => (0, transform_1.transformDiagnostic)(language, d))
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
                 .filter(utils_1.notEmpty),
         };
     };
     program.getSyntacticDiagnostics = (sourceFile, cancellationToken) => {
         return getSyntacticDiagnostics(sourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d))
+            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
             .filter(utils_1.notEmpty);
     };
     program.getSemanticDiagnostics = (sourceFile, cancellationToken) => {
         return getSemanticDiagnostics(sourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d))
+            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
             .filter(utils_1.notEmpty);
     };
     program.getGlobalDiagnostics = cancellationToken => {
         return getGlobalDiagnostics(cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d))
+            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
             .filter(utils_1.notEmpty);
     };
     // @ts-ignore
     program.getBindAndCheckDiagnostics = (sourceFile, cancellationToken) => {
         return getBindAndCheckDiagnostics(sourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d))
+            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
             .filter(utils_1.notEmpty);
     };
+    // fix https://github.com/vuejs/language-tools/issues/4099 with `incremental`
+    program.getSourceFileByPath = path => {
+        const sourceFile = getSourceFileByPath(path);
+        if (sourceFile) {
+            (0, transform_1.fillSourceFileText)(language, sourceFile);
+        }
+        return sourceFile;
+    };
 }
 exports.decorateProgram = decorateProgram;
 //# sourceMappingURL=decorateProgram.js.map

package/lib/node/dedupe.d.ts

@@ -1,3 +1,2 @@
 import type * as ts from 'typescript';
-export declare function dedupeReferencedSymbols<T extends ts.ReferencedSymbol>(items: T[]): T[];
 export declare function dedupeDocumentSpans<T extends ts.DocumentSpan>(items: T[]): T[];

package/lib/node/dedupe.js

@@ -1,14 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dedupeDocumentSpans = exports.dedupeReferencedSymbols = void 0;
-function dedupeReferencedSymbols(items) {
-    return dedupe(items, item => [
-        item.definition.fileName,
-        item.definition.textSpan.start,
-        item.definition.textSpan.length,
-    ].join(':'));
-}
-exports.dedupeReferencedSymbols = dedupeReferencedSymbols;
+exports.dedupeDocumentSpans = void 0;
 function dedupeDocumentSpans(items) {
     return dedupe(items, item => [
         item.fileName,