npm - @volar/typescript - Versions diffs - 2.3.0-alpha.6 → 2.3.0-alpha.8 - Mend

@volar/typescript 2.3.0-alpha.6 → 2.3.0-alpha.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/lib/node/decorateLanguageService.js +152 -93
package/lib/node/decorateProgram.js +24 -9
package/lib/node/transform.d.ts +14 -9
package/lib/node/transform.js +115 -62
package/lib/node/utils.d.ts +2 -2
package/lib/node/utils.js +21 -1
package/lib/protocol/createProject.d.ts +1 -1
package/lib/quickstart/createAsyncLanguageServicePlugin.js +1 -1
package/lib/quickstart/createLanguageServicePlugin.js +2 -1
package/package.json +4 -4

package/lib/node/decorateLanguageService.js CHANGED Viewed

@@ -11,9 +11,9 @@ function decorateLanguageService(language, languageService) {
     const { getNavigationTree, getOutliningSpans, } = languageService;
     languageService.getNavigationTree = filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const [serviceScript] = (0, utils_1.getServiceScript)(language, fileName);
-        if (serviceScript) {
-            const tree = getNavigationTree(fileName);
+        const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript || sourceScript?.associatedOnly) {
+            const tree = getNavigationTree(sourceScript.id);
             tree.childItems = undefined;
             return tree;
         }
@@ -23,8 +23,8 @@ function decorateLanguageService(language, languageService) {
     };
     languageService.getOutliningSpans = filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const [serviceScript] = (0, utils_1.getServiceScript)(language, fileName);
-        if (serviceScript) {
+        const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript || sourceScript?.associatedOnly) {
             return [];
         }
         else {
@@ -36,13 +36,16 @@ function decorateLanguageService(language, languageService) {
     languageService.getFormattingEditsForDocument = (filePath, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         if (serviceScript) {
             if (!map.mappings.some(mapping => (0, language_core_1.isFormattingEnabled)(mapping.data))) {
                 return [];
             }
-            const edits = getFormattingEditsForDocument(fileName, options);
+            const edits = getFormattingEditsForDocument(sourceScript.id, options);
             return edits
-                .map(edit => (0, transform_1.transformTextChange)(serviceScript, sourceScript, map, edit, language_core_1.isFormattingEnabled))
+                .map(edit => (0, transform_1.transformTextChange)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, edit, language_core_1.isFormattingEnabled)?.[1])
                 .filter(utils_1.notEmpty);
         }
         else {
@@ -52,13 +55,16 @@ function decorateLanguageService(language, languageService) {
     languageService.getFormattingEditsForRange = (filePath, start, end, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         if (serviceScript) {
             const generateStart = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, start, language_core_1.isFormattingEnabled);
             const generateEnd = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, end, language_core_1.isFormattingEnabled);
             if (generateStart !== undefined && generateEnd !== undefined) {
-                const edits = getFormattingEditsForRange(fileName, generateStart, generateEnd, options);
+                const edits = getFormattingEditsForRange(sourceScript.id, generateStart, generateEnd, options);
                 return edits
-                    .map(edit => (0, transform_1.transformTextChange)(serviceScript, sourceScript, map, edit, language_core_1.isFormattingEnabled))
+                    .map(edit => (0, transform_1.transformTextChange)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, edit, language_core_1.isFormattingEnabled)?.[1])
                     .filter(utils_1.notEmpty);
             }
             return [];
@@ -70,12 +76,15 @@ function decorateLanguageService(language, languageService) {
     languageService.getFormattingEditsAfterKeystroke = (filePath, position, key, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, position, language_core_1.isFormattingEnabled);
             if (generatePosition !== undefined) {
-                const edits = getFormattingEditsAfterKeystroke(fileName, generatePosition, key, options);
+                const edits = getFormattingEditsAfterKeystroke(sourceScript.id, generatePosition, key, options);
                 return edits
-                    .map(edit => (0, transform_1.transformTextChange)(serviceScript, sourceScript, map, edit, language_core_1.isFormattingEnabled))
+                    .map(edit => (0, transform_1.transformTextChange)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, edit, language_core_1.isFormattingEnabled)?.[1])
                     .filter(utils_1.notEmpty);
             }
             return [];
@@ -86,21 +95,22 @@ function decorateLanguageService(language, languageService) {
     };
     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);
+        return (0, transform_1.transformFileTextChanges)(transform_1.ToSourceMode.IncludeAssciated, language, edits, language_core_1.isRenameEnabled);
     };
     languageService.getLinkedEditingRangeAtPosition = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return undefined;
+        }
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, position, language_core_1.isLinkedEditingEnabled);
             if (generatePosition !== undefined) {
-                const info = getLinkedEditingRangeAtPosition(fileName, generatePosition);
+                const info = getLinkedEditingRangeAtPosition(sourceScript.id, generatePosition);
                 if (info) {
                     return {
                         ranges: info.ranges
-                            .map(span => (0, transform_1.transformTextSpan)(serviceScript, sourceScript, map, span, language_core_1.isLinkedEditingEnabled))
+                            .map(span => (0, transform_1.transformTextSpan)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, span, language_core_1.isLinkedEditingEnabled)?.[1])
                             .filter(utils_1.notEmpty),
                         wordPattern: info.wordPattern,
                     };
@@ -114,15 +124,18 @@ function decorateLanguageService(language, languageService) {
     languageService.prepareCallHierarchy = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return undefined;
+        }
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
             if (generatePosition !== undefined) {
-                const item = prepareCallHierarchy(fileName, generatePosition);
+                const item = prepareCallHierarchy(sourceScript.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)(transform_1.ToSourceMode.IncludeAssciated, language, item, language_core_1.isCallHierarchyEnabled));
                 }
                 else if (item) {
-                    return (0, transform_1.transformCallHierarchyItem)(language, item, language_core_1.isCallHierarchyEnabled);
+                    return (0, transform_1.transformCallHierarchyItem)(transform_1.ToSourceMode.IncludeAssciated, language, item, language_core_1.isCallHierarchyEnabled);
                 }
             }
         }
@@ -134,10 +147,13 @@ function decorateLanguageService(language, languageService) {
         let calls = [];
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
             if (generatePosition !== undefined) {
-                calls = provideCallHierarchyIncomingCalls(fileName, generatePosition);
+                calls = provideCallHierarchyIncomingCalls(sourceScript.id, generatePosition);
             }
         }
         else {
@@ -145,9 +161,9 @@ function decorateLanguageService(language, languageService) {
         }
         return calls
             .map(call => {
-            const from = (0, transform_1.transformCallHierarchyItem)(language, call.from, language_core_1.isCallHierarchyEnabled);
+            const from = (0, transform_1.transformCallHierarchyItem)(transform_1.ToSourceMode.IncludeAssciated, language, call.from, 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)(transform_1.ToSourceMode.IncludeAssciated, language, call.from.file, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
                 .filter(utils_1.notEmpty);
             return {
                 from,
@@ -159,6 +175,9 @@ function decorateLanguageService(language, languageService) {
         let calls = [];
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
             if (generatePosition !== undefined) {
@@ -170,10 +189,10 @@ function decorateLanguageService(language, languageService) {
         }
         return calls
             .map(call => {
-            const to = (0, transform_1.transformCallHierarchyItem)(language, call.to, language_core_1.isCallHierarchyEnabled);
+            const to = (0, transform_1.transformCallHierarchyItem)(transform_1.ToSourceMode.IncludeAssciated, language, call.to, language_core_1.isCallHierarchyEnabled);
             const fromSpans = call.fromSpans
-                .map(span => sourceScript
-                ? (0, transform_1.transformTextSpan)(serviceScript, sourceScript, map, span, language_core_1.isCallHierarchyEnabled)
+                .map(span => serviceScript
+                ? (0, transform_1.transformTextSpan)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, span, language_core_1.isCallHierarchyEnabled)?.[1]
                 : span)
                 .filter(utils_1.notEmpty);
             return {
@@ -184,27 +203,24 @@ function decorateLanguageService(language, languageService) {
     };
     languageService.organizeImports = (args, formatOptions, preferences) => {
         const unresolved = organizeImports(args, formatOptions, preferences);
-        const resolved = unresolved
-            .map(changes => (0, transform_1.transformFileTextChanges)(language, changes, language_core_1.isCodeActionsEnabled))
-            .filter(utils_1.notEmpty);
-        return resolved;
+        return (0, transform_1.transformFileTextChanges)(transform_1.ToSourceMode.IncludeAssciated, language, unresolved, language_core_1.isCodeActionsEnabled);
     };
     languageService.getQuickInfoAtPosition = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return undefined;
+        }
         if (serviceScript) {
             const infos = [];
-            for (const [generatePosition, mapping] of (0, transform_1.toGeneratedOffsets)(serviceScript, sourceScript, map, position)) {
-                if (!(0, language_core_1.isHoverEnabled)(mapping.data)) {
-                    continue;
-                }
-                const info = getQuickInfoAtPosition(fileName, generatePosition);
+            for (const [generatePosition] of (0, transform_1.toGeneratedOffsets)(serviceScript, sourceScript, map, position, language_core_1.isHoverEnabled)) {
+                const info = getQuickInfoAtPosition(sourceScript.id, generatePosition);
                 if (info) {
-                    const textSpan = (0, transform_1.transformTextSpan)(serviceScript, sourceScript, map, info.textSpan, language_core_1.isHoverEnabled);
+                    const textSpan = (0, transform_1.transformTextSpan)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, info.textSpan, language_core_1.isHoverEnabled)?.[1];
                     if (textSpan) {
                         infos.push({
                             ...info,
-                            textSpan,
+                            textSpan: textSpan,
                         });
                     }
                 }
@@ -255,12 +271,15 @@ function decorateLanguageService(language, languageService) {
     languageService.getSignatureHelpItems = (filePath, position, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return undefined;
+        }
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, position, language_core_1.isSignatureHelpEnabled);
             if (generatePosition !== undefined) {
-                const result = getSignatureHelpItems(fileName, generatePosition, options);
+                const result = getSignatureHelpItems(sourceScript.id, generatePosition, options);
                 if (result) {
-                    const applicableSpan = (0, transform_1.transformTextSpan)(serviceScript, sourceScript, map, result.applicableSpan, language_core_1.isSignatureHelpEnabled);
+                    const applicableSpan = (0, transform_1.transformTextSpan)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, result.applicableSpan, language_core_1.isSignatureHelpEnabled)?.[1];
                     if (applicableSpan) {
                         return {
                             ...result,
@@ -276,7 +295,7 @@ function decorateLanguageService(language, languageService) {
     };
     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) {
+        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isHighlightEnabled, (fileName, position) => getDocumentHighlights(fileName, position, filesToSearch), function* (result) {
             for (const ref of result) {
                 for (const reference of ref.highlightSpans) {
                     yield [reference.fileName ?? ref.fileName, reference.textSpan.start];
@@ -290,11 +309,11 @@ function decorateLanguageService(language, languageService) {
                 ...highlights,
                 highlightSpans: highlights.highlightSpans
                     .map(span => {
-                    const textSpan = (0, transform_1.transformSpan)(language, span.fileName ?? highlights.fileName, span.textSpan, language_core_1.isHighlightEnabled)?.textSpan;
+                    const { textSpan } = (0, transform_1.transformSpan)(transform_1.ToSourceMode.IncludeAssciated, language, span.fileName ?? highlights.fileName, span.textSpan, 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)(transform_1.ToSourceMode.IncludeAssciated, language, span.fileName ?? highlights.fileName, span.contextSpan, language_core_1.isHighlightEnabled)?.textSpan,
                             textSpan,
                         };
                     }
@@ -307,6 +326,9 @@ function decorateLanguageService(language, languageService) {
     languageService.getApplicableRefactors = (filePath, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
             if (generatePosition !== undefined) {
@@ -316,7 +338,7 @@ function decorateLanguageService(language, languageService) {
                         pos: generatePosition,
                         end: generatePosition + positionOrRange.end - positionOrRange.pos,
                     };
-                return getApplicableRefactors(fileName, por, preferences, triggerReason, kind, includeInteractiveActions);
+                return getApplicableRefactors(sourceScript.id, por, preferences, triggerReason, kind, includeInteractiveActions);
             }
             return [];
         }
@@ -328,6 +350,9 @@ function decorateLanguageService(language, languageService) {
         let edits;
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return undefined;
+        }
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, typeof positionOrRange === 'number'
                 ? positionOrRange
@@ -339,31 +364,32 @@ function decorateLanguageService(language, languageService) {
                         pos: generatePosition,
                         end: generatePosition + positionOrRange.end - positionOrRange.pos,
                     };
-                edits = getEditsForRefactor(fileName, formatOptions, por, refactorName, actionName, preferences);
+                edits = getEditsForRefactor(sourceScript.id, formatOptions, por, refactorName, actionName, preferences);
             }
         }
         else {
             edits = getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences);
         }
         if (edits) {
-            edits.edits = edits.edits
-                .map(edit => (0, transform_1.transformFileTextChanges)(language, edit, language_core_1.isCodeActionsEnabled))
-                .filter(utils_1.notEmpty);
+            edits.edits = (0, transform_1.transformFileTextChanges)(transform_1.ToSourceMode.IncludeAssciated, language, edits.edits, language_core_1.isCodeActionsEnabled);
             return edits;
         }
     };
     languageService.getRenameInfo = (filePath, position, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return {
+                canRename: false,
+                localizedErrorMessage: "Cannot rename"
+            };
+        }
         if (serviceScript) {
             let failed;
-            for (const [generateOffset, mapping] of (0, transform_1.toGeneratedOffsets)(serviceScript, sourceScript, map, position)) {
-                if (!(0, language_core_1.isRenameEnabled)(mapping.data)) {
-                    continue;
-                }
-                const info = getRenameInfo(fileName, generateOffset, options);
+            for (const [generateOffset] of (0, transform_1.toGeneratedOffsets)(serviceScript, sourceScript, map, position, language_core_1.isRenameEnabled)) {
+                const info = getRenameInfo(sourceScript.id, generateOffset, options);
                 if (info.canRename) {
-                    const span = (0, transform_1.transformTextSpan)(serviceScript, sourceScript, map, info.triggerSpan, language_core_1.isRenameEnabled);
+                    const span = (0, transform_1.transformTextSpan)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, info.triggerSpan, language_core_1.isRenameEnabled)?.[1];
                     if (span) {
                         info.triggerSpan = span;
                         return info;
@@ -389,18 +415,21 @@ function decorateLanguageService(language, languageService) {
         let fixes = [];
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         if (serviceScript) {
             const generateStart = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, start, language_core_1.isCodeActionsEnabled);
             const generateEnd = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, end, language_core_1.isCodeActionsEnabled);
             if (generateStart !== undefined && generateEnd !== undefined) {
-                fixes = getCodeFixesAtPosition(fileName, generateStart, generateEnd, errorCodes, formatOptions, preferences);
+                fixes = getCodeFixesAtPosition(sourceScript.id, generateStart, generateEnd, errorCodes, formatOptions, preferences);
             }
         }
         else {
             fixes = getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences);
         }
         fixes = fixes.map(fix => {
-            fix.changes = fix.changes.map(edit => (0, transform_1.transformFileTextChanges)(language, edit, language_core_1.isCodeActionsEnabled)).filter(utils_1.notEmpty);
+            fix.changes = (0, transform_1.transformFileTextChanges)(transform_1.ToSourceMode.IncludeAssciated, language, fix.changes, language_core_1.isCodeActionsEnabled);
             return fix;
         });
         return fixes;
@@ -408,6 +437,12 @@ function decorateLanguageService(language, languageService) {
     languageService.getEncodedSemanticClassifications = (filePath, span, format) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return {
+                spans: [],
+                endOfLineState: 0
+            };
+        }
         if (serviceScript) {
             let start;
             let end;
@@ -425,13 +460,19 @@ function decorateLanguageService(language, languageService) {
             const mappingOffset = (0, transform_1.getMappingOffset)(serviceScript, sourceScript);
             start += mappingOffset;
             end += mappingOffset;
-            const result = getEncodedSemanticClassifications(fileName, { start, length: end - start }, format);
+            const result = getEncodedSemanticClassifications(sourceScript.id, { start, length: end - start }, format);
             const spans = [];
             for (let i = 0; i < result.spans.length; i += 3) {
-                const sourceStart = (0, transform_1.toSourceOffset)(serviceScript, sourceScript, map, result.spans[i], language_core_1.isSemanticTokensEnabled);
-                const sourceEnd = (0, transform_1.toSourceOffset)(serviceScript, 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]);
+                for (const sourceStart of (0, transform_1.toSourceOffsets)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, result.spans[i], language_core_1.isSemanticTokensEnabled)) {
+                    for (const sourceEnd of (0, transform_1.toSourceOffsets)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, result.spans[i] + result.spans[i + 1], language_core_1.isSemanticTokensEnabled)) {
+                        if (sourceStart[0] === sourceEnd[0] && sourceEnd[1] >= sourceStart[1]) {
+                            spans.push(sourceStart[1], sourceEnd[1] - sourceStart[1], result.spans[i + 2]);
+                            break;
+                        }
+                    }
+                    if (spans.length) {
+                        break;
+                    }
                 }
             }
             result.spans = spans;
@@ -443,38 +484,50 @@ function decorateLanguageService(language, languageService) {
     };
     languageService.getSyntacticDiagnostics = filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
+        const [_serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         return getSyntacticDiagnostics(fileName)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, false))
+            .map(d => (0, transform_1.transformDiagnostic)(transform_1.ToSourceMode.SkipAssciated, language, d, languageService.getProgram(), false))
             .filter(utils_1.notEmpty);
     };
     languageService.getSemanticDiagnostics = filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
+        const [_serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         return getSemanticDiagnostics(fileName)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, false))
+            .map(d => (0, transform_1.transformDiagnostic)(transform_1.ToSourceMode.SkipAssciated, language, d, languageService.getProgram(), false))
             .filter(utils_1.notEmpty);
     };
     languageService.getSuggestionDiagnostics = filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
+        const [_serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         return getSuggestionDiagnostics(fileName)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, false))
+            .map(d => (0, transform_1.transformDiagnostic)(transform_1.ToSourceMode.SkipAssciated, language, d, languageService.getProgram(), false))
             .filter(utils_1.notEmpty);
     };
     languageService.getDefinitionAndBoundSpan = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, position => getDefinitionAndBoundSpan(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, (fileName, position) => getDefinitionAndBoundSpan(fileName, position), function* (result) {
             for (const ref of result.definitions ?? []) {
                 yield [ref.fileName, ref.textSpan.start];
             }
         });
         const textSpan = unresolved
-            .map(s => (0, transform_1.transformSpan)(language, fileName, s.textSpan, language_core_1.isDefinitionEnabled)?.textSpan)
+            .map(s => (0, transform_1.transformSpan)(transform_1.ToSourceMode.IncludeAssciated, language, fileName, s.textSpan, language_core_1.isDefinitionEnabled)?.textSpan)
             .filter(utils_1.notEmpty)[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)(transform_1.ToSourceMode.IncludeAssciated, language, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
             .filter(utils_1.notEmpty))
             .filter(utils_1.notEmpty)
             .flat();
@@ -485,7 +538,7 @@ function decorateLanguageService(language, languageService) {
     };
     languageService.findReferences = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isReferencesEnabled, position => findReferences(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isReferencesEnabled, (fileName, position) => findReferences(fileName, position), function* (result) {
             for (const ref of result) {
                 for (const reference of ref.references) {
                     yield [reference.fileName, reference.textSpan.start];
@@ -495,11 +548,11 @@ function decorateLanguageService(language, languageService) {
         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)(transform_1.ToSourceMode.IncludeAssciated, 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))
+                    .map(r => (0, transform_1.transformDocumentSpan)(transform_1.ToSourceMode.IncludeAssciated, language, r, language_core_1.isReferencesEnabled))
                     .filter(utils_1.notEmpty),
             };
         });
@@ -507,79 +560,79 @@ function decorateLanguageService(language, languageService) {
     };
     languageService.getDefinitionAtPosition = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, position => getDefinitionAtPosition(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, (fileName, position) => getDefinitionAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
         });
         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)(transform_1.ToSourceMode.IncludeAssciated, language, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getTypeDefinitionAtPosition = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isTypeDefinitionEnabled, position => getTypeDefinitionAtPosition(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isTypeDefinitionEnabled, (fileName, position) => getTypeDefinitionAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isTypeDefinitionEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(transform_1.ToSourceMode.IncludeAssciated, language, s, language_core_1.isTypeDefinitionEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getImplementationAtPosition = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isImplementationEnabled, position => getImplementationAtPosition(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isImplementationEnabled, (fileName, position) => getImplementationAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isImplementationEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(transform_1.ToSourceMode.IncludeAssciated, language, s, language_core_1.isImplementationEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     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) {
+        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isRenameEnabled, (fileName, position) => findRenameLocations(fileName, position, findInStrings, findInComments, preferences), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isRenameEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(transform_1.ToSourceMode.IncludeAssciated, language, s, language_core_1.isRenameEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getReferencesAtPosition = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isReferencesEnabled, position => getReferencesAtPosition(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isReferencesEnabled, (fileName, position) => getReferencesAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isReferencesEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(transform_1.ToSourceMode.IncludeAssciated, language, s, language_core_1.isReferencesEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getCompletionsAtPosition = (filePath, position, options, formattingSettings) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return undefined;
+        }
         if (serviceScript) {
             const results = [];
-            for (const [generatedOffset, mapping] of (0, transform_1.toGeneratedOffsets)(serviceScript, sourceScript, map, position)) {
-                if (!(0, language_core_1.isCompletionEnabled)(mapping.data)) {
-                    continue;
-                }
-                const result = getCompletionsAtPosition(fileName, generatedOffset, options, formattingSettings);
+            for (const [generatedOffset, mapping] of (0, transform_1.toGeneratedOffsets)(serviceScript, sourceScript, map, position, language_core_1.isCompletionEnabled)) {
+                const result = getCompletionsAtPosition(sourceScript.id, generatedOffset, options, formattingSettings);
                 if (!result) {
                     continue;
                 }
@@ -587,10 +640,10 @@ function decorateLanguageService(language, languageService) {
                     result.entries = result.entries.filter(entry => !!entry.sourceDisplay);
                 }
                 for (const entry of result.entries) {
-                    entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(serviceScript, sourceScript, map, entry.replacementSpan, language_core_1.isCompletionEnabled);
+                    entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, entry.replacementSpan, language_core_1.isCompletionEnabled)?.[1];
                 }
                 result.optionalReplacementSpan = result.optionalReplacementSpan
-                    && (0, transform_1.transformTextSpan)(serviceScript, sourceScript, map, result.optionalReplacementSpan, language_core_1.isCompletionEnabled);
+                    && (0, transform_1.transformTextSpan)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, result.optionalReplacementSpan, language_core_1.isCompletionEnabled)?.[1];
                 const isAdditional = typeof mapping.data.completion === 'object' && mapping.data.completion.isAdditional;
                 if (isAdditional) {
                     results.push(result);
@@ -616,10 +669,13 @@ function decorateLanguageService(language, languageService) {
         let details;
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return undefined;
+        }
         if (serviceScript) {
             const generatePosition = (0, transform_1.toGeneratedOffset)(serviceScript, sourceScript, map, position, language_core_1.isCompletionEnabled);
             if (generatePosition !== undefined) {
-                details = getCompletionEntryDetails(fileName, generatePosition, entryName, formatOptions, source, preferences, data);
+                details = getCompletionEntryDetails(sourceScript.id, generatePosition, entryName, formatOptions, source, preferences, data);
             }
         }
         else {
@@ -627,7 +683,7 @@ function decorateLanguageService(language, languageService) {
         }
         if (details?.codeActions) {
             for (const codeAction of details.codeActions) {
-                codeAction.changes = codeAction.changes.map(edit => (0, transform_1.transformFileTextChanges)(language, edit, language_core_1.isCompletionEnabled)).filter(utils_1.notEmpty);
+                codeAction.changes = (0, transform_1.transformFileTextChanges)(transform_1.ToSourceMode.IncludeAssciated, language, codeAction.changes, language_core_1.isCompletionEnabled);
             }
         }
         return details;
@@ -635,6 +691,9 @@ function decorateLanguageService(language, languageService) {
     languageService.provideInlayHints = (filePath, span, preferences) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (sourceScript?.associatedOnly) {
+            return [];
+        }
         if (serviceScript) {
             let start;
             let end;
@@ -653,14 +712,14 @@ function decorateLanguageService(language, languageService) {
             const mappingOffset = (0, transform_1.getMappingOffset)(serviceScript, sourceScript);
             start += mappingOffset;
             end += mappingOffset;
-            const result = provideInlayHints(fileName, { start, length: end - start }, preferences);
+            const result = provideInlayHints(sourceScript.id, { start, length: end - start }, preferences);
             const hints = [];
             for (const hint of result) {
-                const sourcePosition = (0, transform_1.toSourceOffset)(serviceScript, sourceScript, map, hint.position, language_core_1.isInlayHintsEnabled);
+                const sourcePosition = (0, transform_1.toSourceOffset)(transform_1.ToSourceMode.SkipAssciated, language, serviceScript, sourceScript, hint.position, language_core_1.isInlayHintsEnabled);
                 if (sourcePosition !== undefined) {
                     hints.push({
                         ...hint,
-                        position: sourcePosition,
+                        position: sourcePosition[1],
                     });
                 }
             }
@@ -674,7 +733,7 @@ function decorateLanguageService(language, languageService) {
         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)(transform_1.ToSourceMode.IncludeAssciated, language, s, language_core_1.isReferencesEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -685,7 +744,7 @@ function decorateLanguageService(language, languageService) {
         if (serviceScript) {
             for (const [generatedOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if (filter(mapping.data)) {
-                    process(fileName, generatedOffset + (0, transform_1.getMappingOffset)(serviceScript, sourceScript));
+                    process(sourceScript.id, generatedOffset + (0, transform_1.getMappingOffset)(serviceScript, sourceScript));
                 }
             }
         }
@@ -698,7 +757,7 @@ function decorateLanguageService(language, languageService) {
                 return;
             }
             processedFilePositions.add(fileName + ':' + position);
-            const result = worker(position);
+            const result = worker(fileName, position);
             if (!result) {
                 return;
             }

package/lib/node/decorateProgram.js CHANGED Viewed

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorateProgram = void 0;
-const utils_1 = require("./utils");
 const transform_1 = require("./transform");
+const utils_1 = require("./utils");
 function decorateProgram(language, program) {
     const emit = program.emit;
     // for tsc --noEmit
@@ -18,29 +18,44 @@ function decorateProgram(language, program) {
         return {
             ...result,
             diagnostics: result.diagnostics
-                .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
+                .map(d => (0, transform_1.transformDiagnostic)(transform_1.ToSourceMode.IncludeAssciated, language, d, program, true))
                 .filter(utils_1.notEmpty),
         };
     };
     program.getSyntacticDiagnostics = (sourceFile, cancellationToken) => {
-        return getSyntacticDiagnostics(sourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
+        if (!sourceFile) {
+            return [];
+        }
+        const [_serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+        const actualSourceFile = sourceScript ? program.getSourceFile(sourceScript.id) : sourceFile;
+        return getSyntacticDiagnostics(actualSourceFile, cancellationToken)
+            .map(d => (0, transform_1.transformDiagnostic)(transform_1.ToSourceMode.SkipAssciated, language, d, program, true))
             .filter(utils_1.notEmpty);
     };
     program.getSemanticDiagnostics = (sourceFile, cancellationToken) => {
-        return getSemanticDiagnostics(sourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
+        if (!sourceFile) {
+            return [];
+        }
+        const [_serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+        const actualSourceFile = sourceScript ? program.getSourceFile(sourceScript.id) : sourceFile;
+        return getSemanticDiagnostics(actualSourceFile, cancellationToken)
+            .map(d => (0, transform_1.transformDiagnostic)(transform_1.ToSourceMode.SkipAssciated, language, d, program, true))
             .filter(utils_1.notEmpty);
     };
     program.getGlobalDiagnostics = cancellationToken => {
         return getGlobalDiagnostics(cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
+            .map(d => (0, transform_1.transformDiagnostic)(transform_1.ToSourceMode.IncludeAssciated, language, d, program, true))
             .filter(utils_1.notEmpty);
     };
     // @ts-ignore
     program.getBindAndCheckDiagnostics = (sourceFile, cancellationToken) => {
-        return getBindAndCheckDiagnostics(sourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
+        if (!sourceFile) {
+            return [];
+        }
+        const [_serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+        const actualSourceFile = sourceScript ? program.getSourceFile(sourceScript.id) : sourceFile;
+        return getBindAndCheckDiagnostics(actualSourceFile, cancellationToken)
+            .map(d => (0, transform_1.transformDiagnostic)(transform_1.ToSourceMode.SkipAssciated, language, d, program, true))
             .filter(utils_1.notEmpty);
     };
     // fix https://github.com/vuejs/language-tools/issues/4099 with `incremental`

package/lib/node/transform.d.ts CHANGED Viewed

@@ -1,18 +1,23 @@
 import type { CodeInformation, SourceMap, SourceScript, TypeScriptServiceScript } from '@volar/language-core';
 import { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function transformCallHierarchyItem(language: Language<string>, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
-export declare function transformDiagnostic<T extends ts.Diagnostic>(language: Language<string>, diagnostic: T, isTsc: boolean): T | undefined;
+export declare enum ToSourceMode {
+    IncludeAssciated = 0,
+    SkipAssciated = 1
+}
+export declare function transformCallHierarchyItem(mode: ToSourceMode, language: Language<string>, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
+export declare function transformDiagnostic<T extends ts.Diagnostic>(mode: ToSourceMode, 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: ts.FileTextChanges, filter: (data: CodeInformation) => boolean): ts.FileTextChanges | undefined;
-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(mode: ToSourceMode, language: Language<string>, changes: readonly ts.FileTextChanges[], filter: (data: CodeInformation) => boolean): ts.FileTextChanges[];
+export declare function transformDocumentSpan<T extends ts.DocumentSpan>(mode: ToSourceMode, language: Language<string>, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
+export declare function transformSpan(mode: ToSourceMode, language: Language<string>, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {
     fileName: string;
     textSpan: ts.TextSpan;
 } | undefined;
-export declare function transformTextChange(serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, map: SourceMap<CodeInformation>, textChange: ts.TextChange, filter: (data: CodeInformation) => boolean): ts.TextChange | undefined;
-export declare function transformTextSpan(serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, map: SourceMap<CodeInformation>, textSpan: ts.TextSpan, filter: (data: CodeInformation) => boolean): ts.TextSpan | undefined;
-export declare function toSourceOffset(serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, map: SourceMap<CodeInformation>, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
+export declare function transformTextChange(mode: ToSourceMode, language: Language<string>, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, textChange: ts.TextChange, filter: (data: CodeInformation) => boolean): [string, ts.TextChange] | undefined;
+export declare function transformTextSpan(mode: ToSourceMode, language: Language<string>, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, textSpan: ts.TextSpan, filter: (data: CodeInformation) => boolean): [string, ts.TextSpan] | undefined;
+export declare function toSourceOffset(mode: ToSourceMode, language: Language<string>, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, position: number, filter: (data: CodeInformation) => boolean): [fileName: string, offset: number] | undefined;
+export declare function toSourceOffsets(mode: ToSourceMode, language: Language<string>, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, position: number, filter: (data: CodeInformation) => boolean): Generator<[fileName: string, offset: number]>;
 export declare function toGeneratedOffset(serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, map: SourceMap<CodeInformation>, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
-export declare function toGeneratedOffsets(serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, map: SourceMap<CodeInformation>, position: number): Generator<readonly [number, import("@volar/language-core").Mapping<CodeInformation>], void, unknown>;
+export declare function toGeneratedOffsets(serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, map: SourceMap<CodeInformation>, position: number, filter: (data: CodeInformation) => boolean): Generator<readonly [number, import("@volar/language-core").Mapping<CodeInformation>], void, unknown>;
 export declare function getMappingOffset(serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>): number;

package/lib/node/transform.js CHANGED Viewed

@@ -1,41 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMappingOffset = exports.toGeneratedOffsets = exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
+exports.getMappingOffset = exports.toGeneratedOffsets = exports.toGeneratedOffset = exports.toSourceOffsets = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = exports.ToSourceMode = void 0;
 const language_core_1 = require("@volar/language-core");
 const utils_1 = require("./utils");
+var ToSourceMode;
+(function (ToSourceMode) {
+    ToSourceMode[ToSourceMode["IncludeAssciated"] = 0] = "IncludeAssciated";
+    ToSourceMode[ToSourceMode["SkipAssciated"] = 1] = "SkipAssciated";
+})(ToSourceMode || (exports.ToSourceMode = ToSourceMode = {}));
 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(mode, language, item, filter) {
+    const span = transformSpan(mode, language, item.file, item.span, filter);
+    const selectionSpan = transformSpan(mode, language, item.file, item.selectionSpan, filter);
     return {
         ...item,
+        file: span?.fileName ?? item.file,
         span: span?.textSpan ?? { start: 0, length: 0 },
         selectionSpan: selectionSpan?.textSpan ?? { start: 0, length: 0 },
     };
 }
 exports.transformCallHierarchyItem = transformCallHierarchyItem;
-function transformDiagnostic(language, diagnostic, isTsc) {
+function transformDiagnostic(mode, language, diagnostic, program, isTsc) {
     if (!transformedDiagnostics.has(diagnostic)) {
         transformedDiagnostics.set(diagnostic, undefined);
         const { relatedInformation } = diagnostic;
         if (relatedInformation) {
             diagnostic.relatedInformation = relatedInformation
-                .map(d => transformDiagnostic(language, d, isTsc))
+                .map(d => transformDiagnostic(mode, language, d, program, isTsc))
                 .filter(utils_1.notEmpty);
         }
         if (diagnostic.file !== undefined
             && diagnostic.start !== undefined
             && diagnostic.length !== undefined) {
-            const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, diagnostic.file.fileName);
+            const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, diagnostic.file.fileName);
             if (serviceScript) {
-                const sourceSpan = transformTextSpan(serviceScript, sourceScript, map, { start: diagnostic.start, length: diagnostic.length }, language_core_1.shouldReportDiagnostics);
-                if (sourceSpan) {
+                const [sourceSpanFileName, sourceSpan] = transformTextSpan(mode, language, serviceScript, sourceScript, {
+                    start: diagnostic.start,
+                    length: diagnostic.length
+                }, language_core_1.shouldReportDiagnostics) ?? [];
+                const actualDiagnosticFile = sourceSpanFileName
+                    ? diagnostic.file.fileName === sourceSpanFileName
+                        ? diagnostic.file
+                        : program?.getSourceFile(sourceSpanFileName)
+                    : undefined;
+                if (sourceSpan && actualDiagnosticFile) {
                     if (isTsc) {
                         fillSourceFileText(language, diagnostic.file);
                     }
                     transformedDiagnostics.set(diagnostic, {
                         ...diagnostic,
+                        file: actualDiagnosticFile,
                         start: sourceSpan.start,
                         length: sourceSpan.length,
                     });
@@ -65,29 +80,42 @@ function fillSourceFileText(language, sourceFile) {
     }
 }
 exports.fillSourceFileText = fillSourceFileText;
-function transformFileTextChanges(language, changes, filter) {
-    const [_, source] = (0, utils_1.getServiceScript)(language, changes.fileName);
-    if (source) {
-        return {
-            ...changes,
-            textChanges: changes.textChanges.map(c => {
-                const span = transformSpan(language, changes.fileName, c.span, filter);
-                if (span) {
-                    return {
-                        ...c,
-                        span: span.textSpan,
-                    };
+function transformFileTextChanges(mode, language, changes, 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(mode, language, fileChanges.fileName, c.span, filter) ?? {};
+                if (fileName && textSpan) {
+                    (changesPerFile[fileName] ?? (changesPerFile[fileName] = [])).push({ ...c, span: textSpan });
                 }
-            }).filter(utils_1.notEmpty),
-        };
+            });
+        }
+        else {
+            const list = (changesPerFile[fileChanges.fileName] ?? (changesPerFile[fileChanges.fileName] = []));
+            fileChanges.textChanges.forEach(c => {
+                list.push(c);
+            });
+            if (fileChanges.isNewFile) {
+                newFiles.add(fileChanges.fileName);
+            }
+        }
     }
-    else {
-        return changes;
+    const result = [];
+    for (const fileName in changesPerFile) {
+        result.push({
+            fileName,
+            isNewFile: newFiles.has(fileName),
+            textChanges: changesPerFile[fileName]
+        });
     }
+    return result;
 }
 exports.transformFileTextChanges = transformFileTextChanges;
-function transformDocumentSpan(language, documentSpan, filter, shouldFallback) {
-    let textSpan = transformSpan(language, documentSpan.fileName, documentSpan.textSpan, filter);
+function transformDocumentSpan(mode, language, documentSpan, filter, shouldFallback) {
+    let textSpan = transformSpan(mode, language, documentSpan.fileName, documentSpan.textSpan, filter);
     if (!textSpan && shouldFallback) {
         textSpan = {
             fileName: documentSpan.fileName,
@@ -97,9 +125,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(mode, language, documentSpan.fileName, documentSpan.contextSpan, filter);
+    const originalTextSpan = transformSpan(mode, language, documentSpan.originalFileName, documentSpan.originalTextSpan, filter);
+    const originalContextSpan = transformSpan(mode, language, documentSpan.originalFileName, documentSpan.originalContextSpan, filter);
     return {
         ...documentSpan,
         fileName: textSpan.fileName,
@@ -111,16 +139,19 @@ function transformDocumentSpan(language, documentSpan, filter, shouldFallback) {
     };
 }
 exports.transformDocumentSpan = transformDocumentSpan;
-function transformSpan(language, fileName, textSpan, filter) {
+function transformSpan(mode, language, fileName, textSpan, filter) {
     if (!fileName || !textSpan) {
         return;
     }
-    const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
-    if (serviceScript) {
-        const sourceSpan = transformTextSpan(serviceScript, sourceScript, map, textSpan, filter);
-        if (sourceSpan) {
+    const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+    if (sourceScript?.associatedOnly) {
+        return;
+    }
+    else if (serviceScript) {
+        const [sourceSpanFileName, sourceSpan] = transformTextSpan(mode, language, serviceScript, sourceScript, textSpan, filter) ?? [];
+        if (sourceSpan && sourceSpanFileName) {
             return {
-                fileName,
+                fileName: sourceSpanFileName,
                 textSpan: sourceSpan,
             };
         }
@@ -133,48 +164,70 @@ function transformSpan(language, fileName, textSpan, filter) {
     }
 }
 exports.transformSpan = transformSpan;
-function transformTextChange(serviceScript, sourceScript, map, textChange, filter) {
-    const sourceSpan = transformTextSpan(serviceScript, sourceScript, map, textChange.span, filter);
-    if (sourceSpan) {
-        return {
-            newText: textChange.newText,
-            span: sourceSpan,
-        };
+function transformTextChange(mode, language, serviceScript, sourceScript, textChange, filter) {
+    const [sourceSpanFileName, sourceSpan] = transformTextSpan(mode, language, serviceScript, sourceScript, textChange.span, filter) ?? [];
+    if (sourceSpan && sourceSpanFileName) {
+        return [sourceSpanFileName, {
+                newText: textChange.newText,
+                span: sourceSpan,
+            }];
     }
+    return undefined;
 }
 exports.transformTextChange = transformTextChange;
-function transformTextSpan(serviceScript, sourceScript, map, textSpan, filter) {
+function transformTextSpan(mode, language, serviceScript, sourceScript, textSpan, filter) {
     const start = textSpan.start;
     const end = textSpan.start + textSpan.length;
-    const sourceStart = toSourceOffset(serviceScript, sourceScript, map, start, filter);
-    const sourceEnd = toSourceOffset(serviceScript, sourceScript, map, end, filter);
-    if (sourceStart !== undefined && sourceEnd !== undefined && sourceEnd >= sourceStart) {
-        return {
-            start: sourceStart,
-            length: sourceEnd - sourceStart,
-        };
+    for (const sourceStart of toSourceOffsets(mode, language, serviceScript, sourceScript, start, filter)) {
+        for (const sourceEnd of toSourceOffsets(mode, language, serviceScript, sourceScript, end, filter)) {
+            if (sourceStart[0] === sourceEnd[0]
+                && sourceEnd[1] >= sourceStart[1]) {
+                return [sourceStart[0], {
+                        start: sourceStart[1],
+                        length: sourceEnd[1] - sourceStart[1],
+                    }];
+            }
+        }
     }
 }
 exports.transformTextSpan = transformTextSpan;
-function toSourceOffset(serviceScript, sourceScript, map, position, filter) {
-    for (const [sourceOffset, mapping] of map.getSourceOffsets(position - getMappingOffset(serviceScript, sourceScript))) {
-        if (filter(mapping.data)) {
-            return sourceOffset;
-        }
+function toSourceOffset(mode, language, serviceScript, sourceScript, position, filter) {
+    for (const source of toSourceOffsets(mode, language, serviceScript, sourceScript, position, filter)) {
+        return source;
     }
 }
 exports.toSourceOffset = toSourceOffset;
-function toGeneratedOffset(serviceScript, sourceScript, map, position, filter) {
-    for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-        if (filter(mapping.data)) {
-            return generateOffset + getMappingOffset(serviceScript, sourceScript);
+function* toSourceOffsets(mode, language, serviceScript, sourceScript, position, filter) {
+    if (mode === ToSourceMode.SkipAssciated) {
+        const map = language.maps.get(serviceScript.code);
+        for (const [sourceOffset, mapping] of map.getSourceOffsets(position - getMappingOffset(serviceScript, sourceScript))) {
+            if (filter(mapping.data)) {
+                yield [sourceScript.id, sourceOffset];
+            }
+        }
+    }
+    else {
+        for (const [fileName, _snapshot, map] of language.maps.forEach(serviceScript.code)) {
+            for (const [sourceOffset, mapping] of map.getSourceOffsets(position - getMappingOffset(serviceScript, sourceScript))) {
+                if (filter(mapping.data)) {
+                    yield [fileName, sourceOffset];
+                }
+            }
         }
     }
 }
+exports.toSourceOffsets = toSourceOffsets;
+function toGeneratedOffset(serviceScript, sourceScript, map, position, filter) {
+    for (const [generateOffset] of toGeneratedOffsets(serviceScript, sourceScript, map, position, filter)) {
+        return generateOffset;
+    }
+}
 exports.toGeneratedOffset = toGeneratedOffset;
-function* toGeneratedOffsets(serviceScript, sourceScript, map, position) {
+function* toGeneratedOffsets(serviceScript, sourceScript, map, position, filter) {
     for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-        yield [generateOffset + getMappingOffset(serviceScript, sourceScript), mapping];
+        if (filter(mapping.data)) {
+            yield [generateOffset + getMappingOffset(serviceScript, sourceScript), mapping];
+        }
     }
 }
 exports.toGeneratedOffsets = toGeneratedOffsets;

package/lib/node/utils.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import type { Language } from '@volar/language-core';
+import type { CodeInformation, Language, SourceMap, SourceScript, TypeScriptServiceScript } from '@volar/language-core';
 export declare function notEmpty<T>(value: T | null | undefined): value is T;
-export declare function getServiceScript(language: Language<string>, fileName: string): readonly [import("@volar/language-core").TypeScriptServiceScript<string>, import("@volar/language-core").SourceScript<string>, import("@volar/language-core").SourceMap<import("@volar/language-core").CodeInformation>] | readonly [undefined, undefined, undefined];
+export declare function getServiceScript(language: Language<string>, fileName: string): [TypeScriptServiceScript, SourceScript<string>, SourceMap<CodeInformation>] | [undefined, SourceScript<string>, undefined] | [undefined, undefined, undefined];

package/lib/node/utils.js CHANGED Viewed

@@ -6,7 +6,27 @@ function notEmpty(value) {
 }
 exports.notEmpty = notEmpty;
 function getServiceScript(language, fileName) {
-    const sourceScript = language.scripts.get(fileName);
+    let sourceScript = language.scripts.get(fileName);
+    if (sourceScript?.targetIds && sourceScript?.targetIds.size > 0) {
+        const sourceId = sourceScript.id;
+        for (const targetId of sourceScript.targetIds) {
+            sourceScript = language.scripts.get(targetId);
+            if (sourceScript?.generated) {
+                const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
+                if (serviceScript) {
+                    for (const [id, _snapshot, map] of language.maps.forEach(serviceScript.code)) {
+                        if (id === sourceId) {
+                            return [serviceScript, sourceScript, map];
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    if (sourceScript?.associatedOnly) {
+        return [undefined, sourceScript, undefined];
+    }
     if (sourceScript?.generated) {
         const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
         if (serviceScript) {

package/lib/protocol/createProject.d.ts CHANGED Viewed

@@ -5,5 +5,5 @@ export interface TypeScriptProjectHost extends Pick<ts.LanguageServiceHost, 'get
 }
 export declare function createLanguageServiceHost<T>(ts: typeof import('typescript'), sys: ReturnType<typeof createSys> | ts.System, language: Language<T>, asScrpitId: (fileName: string) => T, projectHost: TypeScriptProjectHost): {
     languageServiceHost: ts.LanguageServiceHost;
-    getExtraServiceScript: (fileName: string) => TypeScriptExtraServiceScript<T> | undefined;
+    getExtraServiceScript: (fileName: string) => TypeScriptExtraServiceScript | undefined;
 };

package/lib/quickstart/createAsyncLanguageServicePlugin.js CHANGED Viewed

@@ -83,7 +83,7 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                 if (updateLevel >= (1)
                     || !externalFiles.has(project)) {
                     const oldFiles = externalFiles.get(project);
-                    const newFiles = (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions);
+                    const newFiles = extensions.length ? (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions) : [];
                     externalFiles.set(project, newFiles);
                     if (oldFiles && !(0, createLanguageServicePlugin_1.arrayItemsEqual)(oldFiles, newFiles)) {
                         project.refreshDiagnostics();

package/lib/quickstart/createLanguageServicePlugin.js CHANGED Viewed

@@ -52,7 +52,8 @@ function createLanguageServicePlugin(loadLanguagePlugins) {
                 if (updateLevel >= (1)
                     || !externalFiles.has(project)) {
                     const oldFiles = externalFiles.get(project);
-                    const newFiles = (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, projectExternalFileExtensions.get(project));
+                    const extensions = projectExternalFileExtensions.get(project);
+                    const newFiles = extensions?.length ? (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions) : [];
                     externalFiles.set(project, newFiles);
                     if (oldFiles && !arrayItemsEqual(oldFiles, newFiles)) {
                         project.refreshDiagnostics();

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.3.0-alpha.6",
+	"version": "2.3.0-alpha.8",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.3.0-alpha.6",
+		"@volar/language-core": "2.3.0-alpha.8",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.3.0-alpha.6"
+		"@volar/language-service": "2.3.0-alpha.8"
 	},
-	"gitHead": "f3103e86be8d80cb36f66be4c054ef9a255c29b1"
+	"gitHead": "377a0083ac697a476509805a6777a2339391dcaf"
 }