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

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, getSignatureHelpItems, 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,
+                        };
                     }
                 }
             }
@@ -128,6 +200,27 @@ function decorateLanguageService(language, languageService) {
             return getQuickInfoAtPosition(fileName, position);
         }
     };
+    languageService.getSignatureHelpItems = (fileName, position, 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.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 = (fileName, position, filesToSearch) => {
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isHighlightEnabled, position => getDocumentHighlights(fileName, position, filesToSearch), function* (result) {
             for (const ref of result) {
@@ -160,16 +253,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 +273,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 +299,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 +326,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 +347,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;
@@ -298,17 +377,17 @@ function decorateLanguageService(language, languageService) {
     };
     languageService.getSyntacticDiagnostics = fileName => {
         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 => {
         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 => {
         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) => {
@@ -345,18 +424,15 @@ 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) => {
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, position => getDefinitionAtPosition(fileName, position), function* (result) {
@@ -423,24 +499,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);
+                    }
+                    result.optionalReplacementSpan = result.optionalReplacementSpan && (0, transform_1.transformTextSpan)(sourceScript, map, result.optionalReplacementSpan, language_core_1.isCompletionEnabled);
+                    if (isAdditional) {
+                        additionalResults.push(result);
                     }
-                    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;
-                        }
+                    else {
+                        mainResult = result;
                     }
                 }
             }
@@ -465,11 +546,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 +583,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;
@@ -528,13 +605,13 @@ 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) {
-            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());
                 }
             }
         }
@@ -551,14 +628,14 @@ 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 [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): void;
 export declare function searchExternalFiles(ts: typeof import('typescript'), project: ts.server.Project, exts: string[]): string[];