@volar/typescript 2.4.7 → 2.4.8

package/lib/node/proxyLanguageService.js

@@ -112,7 +112,7 @@ function getFormattingEditsForDocument(language, getFormattingEditsForDocument)
             }
             const edits = getFormattingEditsForDocument(targetScript.id, options);
             return edits
-                .map(edit => (0, transform_1.transformTextChange)(sourceScript, language, serviceScript, edit, language_core_1.isFormattingEnabled)?.[1])
+                .map(edit => (0, transform_1.transformTextChange)(sourceScript, language, serviceScript, edit, false, language_core_1.isFormattingEnabled)?.[1])
                 .filter(edit => !!edit);
         }
         else {
@@ -133,7 +133,7 @@ function getFormattingEditsForRange(language, getFormattingEditsForRange) {
             if (generateStart !== undefined && generateEnd !== undefined) {
                 const edits = getFormattingEditsForRange(targetScript.id, generateStart, generateEnd, options);
                 return edits
-                    .map(edit => (0, transform_1.transformTextChange)(sourceScript, language, serviceScript, edit, language_core_1.isFormattingEnabled)?.[1])
+                    .map(edit => (0, transform_1.transformTextChange)(sourceScript, language, serviceScript, edit, false, language_core_1.isFormattingEnabled)?.[1])
                     .filter(edit => !!edit);
             }
             return [];
@@ -155,7 +155,7 @@ function getFormattingEditsAfterKeystroke(language, getFormattingEditsAfterKeyst
             if (generatePosition !== undefined) {
                 const edits = getFormattingEditsAfterKeystroke(targetScript.id, generatePosition, key, options);
                 return edits
-                    .map(edit => (0, transform_1.transformTextChange)(sourceScript, language, serviceScript, edit, language_core_1.isFormattingEnabled)?.[1])
+                    .map(edit => (0, transform_1.transformTextChange)(sourceScript, language, serviceScript, edit, false, language_core_1.isFormattingEnabled)?.[1])
                     .filter(edit => !!edit);
             }
             return [];
@@ -168,7 +168,7 @@ function getFormattingEditsAfterKeystroke(language, getFormattingEditsAfterKeyst
 function getEditsForFileRename(language, getEditsForFileRename) {
     return (oldFilePath, newFilePath, formatOptions, preferences) => {
         const edits = getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences);
-        return (0, transform_1.transformFileTextChanges)(language, edits, language_core_1.isRenameEnabled);
+        return (0, transform_1.transformFileTextChanges)(language, edits, false, language_core_1.isRenameEnabled);
     };
 }
 function getLinkedEditingRangeAtPosition(language, getLinkedEditingRangeAtPosition) {
@@ -185,7 +185,7 @@ function getLinkedEditingRangeAtPosition(language, getLinkedEditingRangeAtPositi
                 if (info) {
                     return {
                         ranges: info.ranges
-                            .map(span => (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, span, language_core_1.isLinkedEditingEnabled)?.[1])
+                            .map(span => (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, span, false, language_core_1.isLinkedEditingEnabled)?.[1])
                             .filter(span => !!span),
                         wordPattern: info.wordPattern,
                     };
@@ -209,10 +209,10 @@ function prepareCallHierarchy(language, prepareCallHierarchy) {
             if (generatePosition !== undefined) {
                 const item = prepareCallHierarchy(targetScript.id, generatePosition);
                 if (Array.isArray(item)) {
-                    return item.map(item => (0, transform_1.transformCallHierarchyItem)(language, item, language_core_1.isCallHierarchyEnabled));
+                    return item.map(item => (0, transform_1.transformCallHierarchyItem)(language, item, true, language_core_1.isCallHierarchyEnabled));
                 }
                 else if (item) {
-                    return (0, transform_1.transformCallHierarchyItem)(language, item, language_core_1.isCallHierarchyEnabled);
+                    return (0, transform_1.transformCallHierarchyItem)(language, item, true, language_core_1.isCallHierarchyEnabled);
                 }
             }
         }
@@ -240,9 +240,9 @@ function provideCallHierarchyIncomingCalls(language, provideCallHierarchyIncomin
         }
         return calls
             .map(call => {
-            const from = (0, transform_1.transformCallHierarchyItem)(language, call.from, language_core_1.isCallHierarchyEnabled);
+            const from = (0, transform_1.transformCallHierarchyItem)(language, call.from, true, language_core_1.isCallHierarchyEnabled);
             const fromSpans = call.fromSpans
-                .map(span => (0, transform_1.transformSpan)(language, call.from.file, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
+                .map(span => (0, transform_1.transformSpan)(language, call.from.file, span, true, language_core_1.isCallHierarchyEnabled)?.textSpan)
                 .filter(span => !!span);
             return {
                 from,
@@ -270,10 +270,10 @@ function provideCallHierarchyOutgoingCalls(language, provideCallHierarchyOutgoin
         }
         return calls
             .map(call => {
-            const to = (0, transform_1.transformCallHierarchyItem)(language, call.to, language_core_1.isCallHierarchyEnabled);
+            const to = (0, transform_1.transformCallHierarchyItem)(language, call.to, true, language_core_1.isCallHierarchyEnabled);
             const fromSpans = call.fromSpans
                 .map(span => serviceScript
-                ? (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, span, language_core_1.isCallHierarchyEnabled)?.[1]
+                ? (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, span, true, language_core_1.isCallHierarchyEnabled)?.[1]
                 : span)
                 .filter(span => !!span);
             return {
@@ -286,7 +286,7 @@ function provideCallHierarchyOutgoingCalls(language, provideCallHierarchyOutgoin
 function organizeImports(language, organizeImports) {
     return (args, formatOptions, preferences) => {
         const unresolved = organizeImports(args, formatOptions, preferences);
-        return (0, transform_1.transformFileTextChanges)(language, unresolved, language_core_1.isCodeActionsEnabled);
+        return (0, transform_1.transformFileTextChanges)(language, unresolved, false, language_core_1.isCodeActionsEnabled);
     };
 }
 function getQuickInfoAtPosition(language, getQuickInfoAtPosition) {
@@ -301,7 +301,7 @@ function getQuickInfoAtPosition(language, getQuickInfoAtPosition) {
             for (const [generatePosition] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, sourceScript, position, language_core_1.isHoverEnabled)) {
                 const info = getQuickInfoAtPosition(targetScript.id, generatePosition);
                 if (info) {
-                    const textSpan = (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, info.textSpan, language_core_1.isHoverEnabled)?.[1];
+                    const textSpan = (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, info.textSpan, true, language_core_1.isHoverEnabled)?.[1];
                     if (textSpan) {
                         infos.push({
                             ...info,
@@ -366,7 +366,7 @@ function getSignatureHelpItems(language, getSignatureHelpItems) {
             if (generatePosition !== undefined) {
                 const result = getSignatureHelpItems(targetScript.id, generatePosition, options);
                 if (result) {
-                    const applicableSpan = (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, result.applicableSpan, language_core_1.isSignatureHelpEnabled)?.[1];
+                    const applicableSpan = (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, result.applicableSpan, true, language_core_1.isSignatureHelpEnabled)?.[1];
                     if (applicableSpan) {
                         return {
                             ...result,
@@ -398,11 +398,11 @@ function getDocumentHighlights(language, getDocumentHighlights) {
                 ...highlights,
                 highlightSpans: highlights.highlightSpans
                     .map(span => {
-                    const { textSpan } = (0, transform_1.transformSpan)(language, span.fileName ?? highlights.fileName, span.textSpan, language_core_1.isHighlightEnabled) ?? {};
+                    const { textSpan } = (0, transform_1.transformSpan)(language, span.fileName ?? highlights.fileName, span.textSpan, false, language_core_1.isHighlightEnabled) ?? {};
                     if (textSpan) {
                         return {
                             ...span,
-                            contextSpan: (0, transform_1.transformSpan)(language, span.fileName ?? highlights.fileName, span.contextSpan, language_core_1.isHighlightEnabled)?.textSpan,
+                            contextSpan: (0, transform_1.transformSpan)(language, span.fileName ?? highlights.fileName, span.contextSpan, false, language_core_1.isHighlightEnabled)?.textSpan,
                             textSpan,
                         };
                     }
@@ -464,7 +464,7 @@ function getEditsForRefactor(language, getEditsForRefactor) {
             edits = getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences);
         }
         if (edits) {
-            edits.edits = (0, transform_1.transformFileTextChanges)(language, edits.edits, language_core_1.isCodeActionsEnabled);
+            edits.edits = (0, transform_1.transformFileTextChanges)(language, edits.edits, false, language_core_1.isCodeActionsEnabled);
             return edits;
         }
     };
@@ -472,7 +472,7 @@ function getEditsForRefactor(language, getEditsForRefactor) {
 function getCombinedCodeFix(language, getCombinedCodeFix) {
     return (...args) => {
         const codeActions = getCombinedCodeFix(...args);
-        codeActions.changes = (0, transform_1.transformFileTextChanges)(language, codeActions.changes, language_core_1.isCodeActionsEnabled);
+        codeActions.changes = (0, transform_1.transformFileTextChanges)(language, codeActions.changes, false, language_core_1.isCodeActionsEnabled);
         return codeActions;
     };
 }
@@ -491,7 +491,7 @@ function getRenameInfo(language, getRenameInfo) {
             for (const [generateOffset] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, sourceScript, position, language_core_1.isRenameEnabled)) {
                 const info = getRenameInfo(targetScript.id, generateOffset, options);
                 if (info.canRename) {
-                    const span = (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, info.triggerSpan, language_core_1.isRenameEnabled)?.[1];
+                    const span = (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, info.triggerSpan, false, language_core_1.isRenameEnabled)?.[1];
                     if (span) {
                         info.triggerSpan = span;
                         return info;
@@ -533,7 +533,7 @@ function getCodeFixesAtPosition(language, getCodeFixesAtPosition) {
             fixes = getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences);
         }
         fixes = fixes.map(fix => {
-            fix.changes = (0, transform_1.transformFileTextChanges)(language, fix.changes, language_core_1.isCodeActionsEnabled);
+            fix.changes = (0, transform_1.transformFileTextChanges)(language, fix.changes, false, language_core_1.isCodeActionsEnabled);
             return fix;
         });
         return fixes;
@@ -570,7 +570,7 @@ function getEncodedSemanticClassifications(language, getEncodedSemanticClassific
             const result = getEncodedSemanticClassifications(targetScript.id, { start, length: end - start }, format);
             const spans = [];
             for (let i = 0; i < result.spans.length; i += 3) {
-                for (const [_, sourceStart, sourceEnd] of (0, transform_1.toSourceRanges)(sourceScript, language, serviceScript, result.spans[i], result.spans[i] + result.spans[i + 1], language_core_1.isSemanticTokensEnabled)) {
+                for (const [_, sourceStart, sourceEnd] of (0, transform_1.toSourceRanges)(sourceScript, language, serviceScript, result.spans[i], result.spans[i] + result.spans[i + 1], false, language_core_1.isSemanticTokensEnabled)) {
                     spans.push(sourceStart, sourceEnd - sourceStart, result.spans[i + 2]);
                     break;
                 }
@@ -631,14 +631,14 @@ function getDefinitionAndBoundSpan(language, getDefinitionAndBoundSpan) {
             }
         });
         const textSpan = unresolved
-            .map(s => (0, transform_1.transformSpan)(language, fileName, s.textSpan, language_core_1.isDefinitionEnabled)?.textSpan)
+            .map(s => (0, transform_1.transformSpan)(language, fileName, s.textSpan, true, language_core_1.isDefinitionEnabled)?.textSpan)
             .filter(s => !!s)[0];
         if (!textSpan) {
             return;
         }
         const definitions = unresolved
             .map(s => s.definitions
-            ?.map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
+            ?.map(s => (0, transform_1.transformDocumentSpan)(language, s, true, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
             .filter(s => !!s)
             ?? [])
             .flat();
@@ -661,11 +661,11 @@ function findReferences(language, findReferences) {
         const resolved = unresolved
             .flat()
             .map(symbol => {
-            const definition = (0, transform_1.transformDocumentSpan)(language, symbol.definition, language_core_1.isDefinitionEnabled, true);
+            const definition = (0, transform_1.transformDocumentSpan)(language, symbol.definition, true, language_core_1.isDefinitionEnabled, true);
             return {
                 definition,
                 references: symbol.references
-                    .map(r => (0, transform_1.transformDocumentSpan)(language, r, language_core_1.isReferencesEnabled))
+                    .map(r => (0, transform_1.transformDocumentSpan)(language, r, true, language_core_1.isReferencesEnabled))
                     .filter(r => !!r),
             };
         });
@@ -682,7 +682,7 @@ function getDefinitionAtPosition(language, getDefinitionAtPosition) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, true, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -697,7 +697,7 @@ function getTypeDefinitionAtPosition(language, getTypeDefinitionAtPosition) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isTypeDefinitionEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, true, language_core_1.isTypeDefinitionEnabled))
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -712,7 +712,7 @@ function getImplementationAtPosition(language, getImplementationAtPosition) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isImplementationEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, true, language_core_1.isImplementationEnabled))
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -727,7 +727,7 @@ function findRenameLocations(language, findRenameLocations) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isRenameEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, false, language_core_1.isRenameEnabled))
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -742,7 +742,7 @@ function getReferencesAtPosition(language, getReferencesAtPosition) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isReferencesEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, true, language_core_1.isReferencesEnabled))
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -770,10 +770,10 @@ function getCompletionsAtPosition(language, getCompletionsAtPosition) {
                     result.entries = result.entries.filter(entry => !!entry.sourceDisplay);
                 }
                 for (const entry of result.entries) {
-                    entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, entry.replacementSpan, language_core_1.isCompletionEnabled)?.[1];
+                    entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, entry.replacementSpan, false, language_core_1.isCompletionEnabled)?.[1];
                 }
                 result.optionalReplacementSpan = result.optionalReplacementSpan
-                    && (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, result.optionalReplacementSpan, language_core_1.isCompletionEnabled)?.[1];
+                    && (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, result.optionalReplacementSpan, false, language_core_1.isCompletionEnabled)?.[1];
                 if (isAdditional) {
                     additionalResults.push(result);
                 }
@@ -818,7 +818,7 @@ function getCompletionEntryDetails(language, getCompletionEntryDetails) {
         }
         if (details?.codeActions) {
             for (const codeAction of details.codeActions) {
-                codeAction.changes = (0, transform_1.transformFileTextChanges)(language, codeAction.changes, language_core_1.isCompletionEnabled);
+                codeAction.changes = (0, transform_1.transformFileTextChanges)(language, codeAction.changes, false, language_core_1.isCompletionEnabled);
             }
         }
         return details;
@@ -889,7 +889,7 @@ function getFileReferences(language, getFileReferences) {
         const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = getFileReferences(fileName);
         const resolved = unresolved
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isReferencesEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, true, language_core_1.isReferencesEnabled))
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -898,7 +898,7 @@ function getNavigateToItems(language, getNavigateToItems) {
     return (...args) => {
         const unresolved = getNavigateToItems(...args);
         const resolved = unresolved
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isReferencesEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, true, language_core_1.isReferencesEnabled))
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };

package/lib/node/transform.d.ts

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

package/lib/node/transform.js

@@ -19,9 +19,9 @@ const language_core_1 = require("@volar/language-core");
 const utils_1 = require("./utils");
 const transformedDiagnostics = new WeakMap();
 const transformedSourceFile = new WeakSet();
-function transformCallHierarchyItem(language, item, filter) {
-    const span = transformSpan(language, item.file, item.span, filter);
-    const selectionSpan = transformSpan(language, item.file, item.selectionSpan, filter);
+function transformCallHierarchyItem(language, item, fallbackToAnyMatch, filter) {
+    const span = transformSpan(language, item.file, item.span, fallbackToAnyMatch, filter);
+    const selectionSpan = transformSpan(language, item.file, item.selectionSpan, fallbackToAnyMatch, filter);
     return {
         ...item,
         file: span?.fileName ?? item.file,
@@ -46,7 +46,7 @@ function transformDiagnostic(language, diagnostic, program, isTsc) {
                 const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, {
                     start: diagnostic.start,
                     length: diagnostic.length
-                }, data => (0, language_core_1.shouldReportDiagnostics)(data, String(diagnostic.source), String(diagnostic.code))) ?? [];
+                }, true, data => (0, language_core_1.shouldReportDiagnostics)(data, String(diagnostic.source), String(diagnostic.code))) ?? [];
                 const actualDiagnosticFile = sourceSpanFileName
                     ? diagnostic.file.fileName === sourceSpanFileName
                         ? diagnostic.file
@@ -87,14 +87,14 @@ function fillSourceFileText(language, sourceFile) {
             + sourceFile.text.substring(sourceScript.snapshot.getLength());
     }
 }
-function transformFileTextChanges(language, changes, filter) {
+function transformFileTextChanges(language, changes, fallbackToAnyMatch, filter) {
     const changesPerFile = {};
     const newFiles = new Set();
     for (const fileChanges of changes) {
         const [_, source] = (0, utils_1.getServiceScript)(language, fileChanges.fileName);
         if (source) {
             fileChanges.textChanges.forEach(c => {
-                const { fileName, textSpan } = transformSpan(language, fileChanges.fileName, c.span, filter) ?? {};
+                const { fileName, textSpan } = transformSpan(language, fileChanges.fileName, c.span, fallbackToAnyMatch, filter) ?? {};
                 if (fileName && textSpan) {
                     (changesPerFile[fileName] ?? (changesPerFile[fileName] = [])).push({ ...c, span: textSpan });
                 }
@@ -120,8 +120,8 @@ function transformFileTextChanges(language, changes, filter) {
     }
     return result;
 }
-function transformDocumentSpan(language, documentSpan, filter, shouldFallback) {
-    let textSpan = transformSpan(language, documentSpan.fileName, documentSpan.textSpan, filter);
+function transformDocumentSpan(language, documentSpan, fallbackToAnyMatch, filter, shouldFallback) {
+    let textSpan = transformSpan(language, documentSpan.fileName, documentSpan.textSpan, fallbackToAnyMatch, filter);
     if (!textSpan && shouldFallback) {
         textSpan = {
             fileName: documentSpan.fileName,
@@ -131,9 +131,9 @@ function transformDocumentSpan(language, documentSpan, filter, shouldFallback) {
     if (!textSpan) {
         return;
     }
-    const contextSpan = transformSpan(language, documentSpan.fileName, documentSpan.contextSpan, filter);
-    const originalTextSpan = transformSpan(language, documentSpan.originalFileName, documentSpan.originalTextSpan, filter);
-    const originalContextSpan = transformSpan(language, documentSpan.originalFileName, documentSpan.originalContextSpan, filter);
+    const contextSpan = transformSpan(language, documentSpan.fileName, documentSpan.contextSpan, fallbackToAnyMatch, filter);
+    const originalTextSpan = transformSpan(language, documentSpan.originalFileName, documentSpan.originalTextSpan, fallbackToAnyMatch, filter);
+    const originalContextSpan = transformSpan(language, documentSpan.originalFileName, documentSpan.originalContextSpan, fallbackToAnyMatch, filter);
     return {
         ...documentSpan,
         fileName: textSpan.fileName,
@@ -144,13 +144,13 @@ function transformDocumentSpan(language, documentSpan, filter, shouldFallback) {
         originalContextSpan: originalContextSpan?.textSpan,
     };
 }
-function transformSpan(language, fileName, textSpan, filter) {
+function transformSpan(language, fileName, textSpan, fallbackToAnyMatch, filter) {
     if (!fileName || !textSpan) {
         return;
     }
     const [serviceScript] = (0, utils_1.getServiceScript)(language, fileName);
     if (serviceScript) {
-        const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, textSpan, filter) ?? [];
+        const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, textSpan, fallbackToAnyMatch, filter) ?? [];
         if (sourceSpan && sourceSpanFileName) {
             return {
                 fileName: sourceSpanFileName,
@@ -165,8 +165,8 @@ function transformSpan(language, fileName, textSpan, filter) {
         };
     }
 }
-function transformTextChange(sourceScript, language, serviceScript, textChange, filter) {
-    const [sourceSpanFileName, sourceSpan] = transformTextSpan(sourceScript, language, serviceScript, textChange.span, filter) ?? [];
+function transformTextChange(sourceScript, language, serviceScript, textChange, fallbackToAnyMatch, filter) {
+    const [sourceSpanFileName, sourceSpan] = transformTextSpan(sourceScript, language, serviceScript, textChange.span, fallbackToAnyMatch, filter) ?? [];
     if (sourceSpan && sourceSpanFileName) {
         return [sourceSpanFileName, {
                 newText: textChange.newText,
@@ -175,10 +175,10 @@ function transformTextChange(sourceScript, language, serviceScript, textChange,
     }
     return undefined;
 }
-function transformTextSpan(sourceScript, language, serviceScript, textSpan, filter) {
+function transformTextSpan(sourceScript, language, serviceScript, textSpan, fallbackToAnyMatch, filter) {
     const start = textSpan.start;
     const end = textSpan.start + textSpan.length;
-    for (const [fileName, sourceStart, sourceEnd] of toSourceRanges(sourceScript, language, serviceScript, start, end, filter)) {
+    for (const [fileName, sourceStart, sourceEnd] of toSourceRanges(sourceScript, language, serviceScript, start, end, fallbackToAnyMatch, filter)) {
         return [fileName, {
                 start: sourceStart,
                 length: sourceEnd - sourceStart,
@@ -190,16 +190,16 @@ function toSourceOffset(sourceScript, language, serviceScript, position, filter)
         return source;
     }
 }
-function* toSourceRanges(sourceScript, language, serviceScript, start, end, filter) {
+function* toSourceRanges(sourceScript, language, serviceScript, start, end, fallbackToAnyMatch, filter) {
     if (sourceScript) {
         const map = language.maps.get(serviceScript.code, sourceScript);
-        for (const [sourceStart, sourceEnd] of map.toSourceRange(start - getMappingOffset(language, serviceScript), end - getMappingOffset(language, serviceScript), true, filter)) {
+        for (const [sourceStart, sourceEnd] of map.toSourceRange(start - getMappingOffset(language, serviceScript), end - getMappingOffset(language, serviceScript), fallbackToAnyMatch, filter)) {
             yield [sourceScript.id, sourceStart, sourceEnd];
         }
     }
     else {
         for (const [sourceScript, map] of language.maps.forEach(serviceScript.code)) {
-            for (const [sourceStart, sourceEnd] of map.toSourceRange(start - getMappingOffset(language, serviceScript), end - getMappingOffset(language, serviceScript), true, filter)) {
+            for (const [sourceStart, sourceEnd] of map.toSourceRange(start - getMappingOffset(language, serviceScript), end - getMappingOffset(language, serviceScript), fallbackToAnyMatch, filter)) {
                 yield [sourceScript.id, sourceStart, sourceEnd];
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.4.7",
+	"version": "2.4.8",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.7",
+		"@volar/language-core": "2.4.8",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.4.7"
+		"@volar/language-service": "2.4.8"
 	},
-	"gitHead": "73a48189f9066883c90c6b29040a3301c6dc3195"
+	"gitHead": "bfa90aec50b975189f574b47affb619b9e1d679d"
 }