@volar/typescript 2.1.6 → 2.2.0-alpha.1

package/index.d.ts

@@ -1,4 +1,3 @@
-export * from './lib/documentRegistry';
 export * from './lib/node/decorateLanguageService';
 export * from './lib/node/decorateLanguageServiceHost';
 export * from './lib/node/decorateProgram';

package/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./lib/documentRegistry"), exports);
 __exportStar(require("./lib/node/decorateLanguageService"), exports);
 __exportStar(require("./lib/node/decorateLanguageServiceHost"), exports);
 __exportStar(require("./lib/node/decorateProgram"), exports);

package/lib/node/decorateLanguageService.d.ts

@@ -1,3 +1,3 @@
-import { FileRegistry } from '@volar/language-core';
+import { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function decorateLanguageService(files: FileRegistry, languageService: ts.LanguageService): void;
+export declare function decorateLanguageService(language: Language, languageService: ts.LanguageService): void;

package/lib/node/decorateLanguageService.js

@@ -5,12 +5,12 @@ const language_core_1 = require("@volar/language-core");
 const dedupe_1 = require("./dedupe");
 const utils_1 = require("./utils");
 const transform_1 = require("./transform");
-function decorateLanguageService(files, languageService) {
+function decorateLanguageService(language, languageService) {
     // ignored methods
     const { getNavigationTree, getOutliningSpans, } = languageService;
     languageService.getNavigationTree = fileName => {
-        const [virtualCode] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
+        const [serviceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
             const tree = getNavigationTree(fileName);
             tree.childItems = undefined;
             return tree;
@@ -20,8 +20,8 @@ function decorateLanguageService(files, languageService) {
         }
     };
     languageService.getOutliningSpans = fileName => {
-        const [virtualCode] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
+        const [serviceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
             return [];
         }
         else {
@@ -31,14 +31,14 @@ function decorateLanguageService(files, languageService) {
     // methods
     const { findReferences, findRenameLocations, getCompletionEntryDetails, getCompletionsAtPosition, getDefinitionAndBoundSpan, getDefinitionAtPosition, getFileReferences, getFormattingEditsForDocument, getFormattingEditsForRange, getFormattingEditsAfterKeystroke, getImplementationAtPosition, getLinkedEditingRangeAtPosition, getQuickInfoAtPosition, getReferencesAtPosition, getSemanticDiagnostics, getSyntacticDiagnostics, getSuggestionDiagnostics, getTypeDefinitionAtPosition, getEncodedSemanticClassifications, getDocumentHighlights, getApplicableRefactors, getEditsForFileRename, getEditsForRefactor, getRenameInfo, getCodeFixesAtPosition, prepareCallHierarchy, provideCallHierarchyIncomingCalls, provideCallHierarchyOutgoingCalls, provideInlayHints, organizeImports, } = languageService;
     languageService.getFormattingEditsForDocument = (fileName, options) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
             if (!map.mappings.some(mapping => (0, language_core_1.isFormattingEnabled)(mapping.data))) {
                 return [];
             }
             const edits = getFormattingEditsForDocument(fileName, options);
             return edits
-                .map(edit => (0, transform_1.transformTextChange)(sourceFile, map, edit, language_core_1.isFormattingEnabled))
+                .map(edit => (0, transform_1.transformTextChange)(sourceScript, map, edit, language_core_1.isFormattingEnabled))
                 .filter(utils_1.notEmpty);
         }
         else {
@@ -46,14 +46,14 @@ function decorateLanguageService(files, languageService) {
         }
     };
     languageService.getFormattingEditsForRange = (fileName, start, end, options) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generateStart = (0, transform_1.toGeneratedOffset)(sourceFile, map, start, language_core_1.isFormattingEnabled);
-            const generateEnd = (0, transform_1.toGeneratedOffset)(sourceFile, map, end, language_core_1.isFormattingEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generateStart = (0, transform_1.toGeneratedOffset)(sourceScript, map, start, language_core_1.isFormattingEnabled);
+            const generateEnd = (0, transform_1.toGeneratedOffset)(sourceScript, map, end, language_core_1.isFormattingEnabled);
             if (generateStart !== undefined && generateEnd !== undefined) {
                 const edits = getFormattingEditsForRange(fileName, generateStart, generateEnd, options);
                 return edits
-                    .map(edit => (0, transform_1.transformTextChange)(sourceFile, map, edit, language_core_1.isFormattingEnabled))
+                    .map(edit => (0, transform_1.transformTextChange)(sourceScript, map, edit, language_core_1.isFormattingEnabled))
                     .filter(utils_1.notEmpty);
             }
             return [];
@@ -63,13 +63,13 @@ function decorateLanguageService(files, languageService) {
         }
     };
     languageService.getFormattingEditsAfterKeystroke = (fileName, position, key, options) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isFormattingEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isFormattingEnabled);
             if (generatePosition !== undefined) {
                 const edits = getFormattingEditsAfterKeystroke(fileName, generatePosition, key, options);
                 return edits
-                    .map(edit => (0, transform_1.transformTextChange)(sourceFile, map, edit, language_core_1.isFormattingEnabled))
+                    .map(edit => (0, transform_1.transformTextChange)(sourceScript, map, edit, language_core_1.isFormattingEnabled))
                     .filter(utils_1.notEmpty);
             }
             return [];
@@ -81,19 +81,19 @@ function decorateLanguageService(files, languageService) {
     languageService.getEditsForFileRename = (oldFilePath, newFilePath, formatOptions, preferences) => {
         const edits = getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences);
         return edits
-            .map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isRenameEnabled))
+            .map(edit => (0, transform_1.transformFileTextChanges)(language, edit, language_core_1.isRenameEnabled))
             .filter(utils_1.notEmpty);
     };
     languageService.getLinkedEditingRangeAtPosition = (fileName, position) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isLinkedEditingEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isLinkedEditingEnabled);
             if (generatePosition !== undefined) {
                 const info = getLinkedEditingRangeAtPosition(fileName, generatePosition);
                 if (info) {
                     return {
                         ranges: info.ranges
-                            .map(span => (0, transform_1.transformTextSpan)(sourceFile, map, span, language_core_1.isLinkedEditingEnabled))
+                            .map(span => (0, transform_1.transformTextSpan)(sourceScript, map, span, language_core_1.isLinkedEditingEnabled))
                             .filter(utils_1.notEmpty),
                         wordPattern: info.wordPattern,
                     };
@@ -105,16 +105,16 @@ function decorateLanguageService(files, languageService) {
         }
     };
     languageService.prepareCallHierarchy = (fileName, position) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isCallHierarchyEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
             if (generatePosition !== undefined) {
                 const item = prepareCallHierarchy(fileName, generatePosition);
                 if (Array.isArray(item)) {
-                    return item.map(item => (0, transform_1.transformCallHierarchyItem)(files, item, language_core_1.isCallHierarchyEnabled));
+                    return item.map(item => (0, transform_1.transformCallHierarchyItem)(language, item, language_core_1.isCallHierarchyEnabled));
                 }
                 else if (item) {
-                    return (0, transform_1.transformCallHierarchyItem)(files, item, language_core_1.isCallHierarchyEnabled);
+                    return (0, transform_1.transformCallHierarchyItem)(language, item, language_core_1.isCallHierarchyEnabled);
                 }
             }
         }
@@ -124,9 +124,9 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.provideCallHierarchyIncomingCalls = (fileName, position) => {
         let calls = [];
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isCallHierarchyEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
             if (generatePosition !== undefined) {
                 calls = provideCallHierarchyIncomingCalls(fileName, generatePosition);
             }
@@ -136,9 +136,9 @@ function decorateLanguageService(files, languageService) {
         }
         return calls
             .map(call => {
-            const from = (0, transform_1.transformCallHierarchyItem)(files, call.from, language_core_1.isCallHierarchyEnabled);
+            const from = (0, transform_1.transformCallHierarchyItem)(language, call.from, language_core_1.isCallHierarchyEnabled);
             const fromSpans = call.fromSpans
-                .map(span => (0, transform_1.transformSpan)(files, call.from.file, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
+                .map(span => (0, transform_1.transformSpan)(language, call.from.file, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
                 .filter(utils_1.notEmpty);
             return {
                 from,
@@ -148,9 +148,9 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.provideCallHierarchyOutgoingCalls = (fileName, position) => {
         let calls = [];
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isCallHierarchyEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCallHierarchyEnabled);
             if (generatePosition !== undefined) {
                 calls = provideCallHierarchyOutgoingCalls(fileName, generatePosition);
             }
@@ -160,10 +160,10 @@ function decorateLanguageService(files, languageService) {
         }
         return calls
             .map(call => {
-            const to = (0, transform_1.transformCallHierarchyItem)(files, call.to, language_core_1.isCallHierarchyEnabled);
+            const to = (0, transform_1.transformCallHierarchyItem)(language, call.to, language_core_1.isCallHierarchyEnabled);
             const fromSpans = call.fromSpans
-                .map(span => sourceFile
-                ? (0, transform_1.transformTextSpan)(sourceFile, map, span, language_core_1.isCallHierarchyEnabled)
+                .map(span => sourceScript
+                ? (0, transform_1.transformTextSpan)(sourceScript, map, span, language_core_1.isCallHierarchyEnabled)
                 : span)
                 .filter(utils_1.notEmpty);
             return {
@@ -175,18 +175,18 @@ function decorateLanguageService(files, languageService) {
     languageService.organizeImports = (args, formatOptions, preferences) => {
         const unresolved = organizeImports(args, formatOptions, preferences);
         const resolved = unresolved
-            .map(changes => (0, transform_1.transformFileTextChanges)(files, changes, language_core_1.isCodeActionsEnabled))
+            .map(changes => (0, transform_1.transformFileTextChanges)(language, changes, language_core_1.isCodeActionsEnabled))
             .filter(utils_1.notEmpty);
         return resolved;
     };
     languageService.getQuickInfoAtPosition = (fileName, position) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isHoverEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isHoverEnabled);
             if (generatePosition !== undefined) {
                 const result = getQuickInfoAtPosition(fileName, generatePosition);
                 if (result) {
-                    const textSpan = (0, transform_1.transformTextSpan)(sourceFile, map, result.textSpan, language_core_1.isHoverEnabled);
+                    const textSpan = (0, transform_1.transformTextSpan)(sourceScript, map, result.textSpan, language_core_1.isHoverEnabled);
                     if (textSpan) {
                         return {
                             ...result,
@@ -215,11 +215,11 @@ function decorateLanguageService(files, languageService) {
                 ...highlights,
                 highlightSpans: highlights.highlightSpans
                     .map(span => {
-                    const textSpan = (0, transform_1.transformSpan)(files, span.fileName ?? highlights.fileName, span.textSpan, language_core_1.isHighlightEnabled)?.textSpan;
+                    const textSpan = (0, transform_1.transformSpan)(language, span.fileName ?? highlights.fileName, span.textSpan, language_core_1.isHighlightEnabled)?.textSpan;
                     if (textSpan) {
                         return {
                             ...span,
-                            contextSpan: (0, transform_1.transformSpan)(files, span.fileName ?? highlights.fileName, span.contextSpan, language_core_1.isHighlightEnabled)?.textSpan,
+                            contextSpan: (0, transform_1.transformSpan)(language, span.fileName ?? highlights.fileName, span.contextSpan, language_core_1.isHighlightEnabled)?.textSpan,
                             textSpan,
                         };
                     }
@@ -230,9 +230,9 @@ function decorateLanguageService(files, languageService) {
         return resolved;
     };
     languageService.getApplicableRefactors = (fileName, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
             if (generatePosition !== undefined) {
                 const por = typeof positionOrRange === 'number'
                     ? generatePosition
@@ -250,9 +250,9 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.getEditsForRefactor = (fileName, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
         let edits;
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, typeof positionOrRange === 'number'
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, typeof positionOrRange === 'number'
                 ? positionOrRange
                 : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
             if (generatePosition !== undefined) {
@@ -270,19 +270,19 @@ function decorateLanguageService(files, languageService) {
         }
         if (edits) {
             edits.edits = edits.edits
-                .map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isCodeActionsEnabled))
+                .map(edit => (0, transform_1.transformFileTextChanges)(language, edit, language_core_1.isCodeActionsEnabled))
                 .filter(utils_1.notEmpty);
             return edits;
         }
     };
     languageService.getRenameInfo = (fileName, position, options) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isRenameEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isRenameEnabled);
             if (generatePosition !== undefined) {
                 const info = getRenameInfo(fileName, generatePosition, options);
                 if (info.canRename) {
-                    const span = (0, transform_1.transformTextSpan)(sourceFile, map, info.triggerSpan, language_core_1.isRenameEnabled);
+                    const span = (0, transform_1.transformTextSpan)(sourceScript, map, info.triggerSpan, language_core_1.isRenameEnabled);
                     if (span) {
                         info.triggerSpan = span;
                         return info;
@@ -303,10 +303,10 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
         let fixes = [];
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generateStart = (0, transform_1.toGeneratedOffset)(sourceFile, map, start, language_core_1.isCodeActionsEnabled);
-            const generateEnd = (0, transform_1.toGeneratedOffset)(sourceFile, map, end, language_core_1.isCodeActionsEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generateStart = (0, transform_1.toGeneratedOffset)(sourceScript, map, start, language_core_1.isCodeActionsEnabled);
+            const generateEnd = (0, transform_1.toGeneratedOffset)(sourceScript, map, end, language_core_1.isCodeActionsEnabled);
             if (generateStart !== undefined && generateEnd !== undefined) {
                 fixes = getCodeFixesAtPosition(fileName, generateStart, generateEnd, errorCodes, formatOptions, preferences);
             }
@@ -315,14 +315,14 @@ function decorateLanguageService(files, languageService) {
             fixes = getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences);
         }
         fixes = fixes.map(fix => {
-            fix.changes = fix.changes.map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isCodeActionsEnabled)).filter(utils_1.notEmpty);
+            fix.changes = fix.changes.map(edit => (0, transform_1.transformFileTextChanges)(language, edit, language_core_1.isCodeActionsEnabled)).filter(utils_1.notEmpty);
             return fix;
         });
         return fixes;
     };
     languageService.getEncodedSemanticClassifications = (fileName, span, format) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
             let start;
             let end;
             for (const mapping of map.mappings) {
@@ -335,14 +335,14 @@ function decorateLanguageService(files, languageService) {
                 }
             }
             start ??= 0;
-            end ??= sourceFile.snapshot.getLength();
-            start += sourceFile.snapshot.getLength();
-            end += sourceFile.snapshot.getLength();
+            end ??= sourceScript.snapshot.getLength();
+            start += sourceScript.snapshot.getLength();
+            end += sourceScript.snapshot.getLength();
             const result = getEncodedSemanticClassifications(fileName, { start, length: end - start }, format);
             const spans = [];
             for (let i = 0; i < result.spans.length; i += 3) {
-                const sourceStart = (0, transform_1.toSourceOffset)(sourceFile, map, result.spans[i], language_core_1.isSemanticTokensEnabled);
-                const sourceEnd = (0, transform_1.toSourceOffset)(sourceFile, map, result.spans[i] + result.spans[i + 1], language_core_1.isSemanticTokensEnabled);
+                const sourceStart = (0, transform_1.toSourceOffset)(sourceScript, map, result.spans[i], language_core_1.isSemanticTokensEnabled);
+                const sourceEnd = (0, transform_1.toSourceOffset)(sourceScript, map, result.spans[i] + result.spans[i + 1], language_core_1.isSemanticTokensEnabled);
                 if (sourceStart !== undefined && sourceEnd !== undefined) {
                     spans.push(sourceStart, sourceEnd - sourceStart, result.spans[i + 2]);
                 }
@@ -356,17 +356,17 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.getSyntacticDiagnostics = fileName => {
         return getSyntacticDiagnostics(fileName)
-            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .map(d => (0, transform_1.transformDiagnostic)(language, d))
             .filter(utils_1.notEmpty);
     };
     languageService.getSemanticDiagnostics = fileName => {
         return getSemanticDiagnostics(fileName)
-            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .map(d => (0, transform_1.transformDiagnostic)(language, d))
             .filter(utils_1.notEmpty);
     };
     languageService.getSuggestionDiagnostics = fileName => {
         return getSuggestionDiagnostics(fileName)
-            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .map(d => (0, transform_1.transformDiagnostic)(language, d))
             .filter(utils_1.notEmpty);
     };
     languageService.getDefinitionAndBoundSpan = (fileName, position) => {
@@ -376,14 +376,14 @@ function decorateLanguageService(files, languageService) {
             }
         });
         const textSpan = unresolved
-            .map(s => (0, transform_1.transformSpan)(files, fileName, s.textSpan, language_core_1.isDefinitionEnabled)?.textSpan)
+            .map(s => (0, transform_1.transformSpan)(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)(files, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
+            ?.map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
             .filter(utils_1.notEmpty))
             .filter(utils_1.notEmpty)
             .flat();
@@ -403,12 +403,12 @@ function decorateLanguageService(files, languageService) {
         const resolved = unresolved
             .flat()
             .map(symbol => {
-            const definition = (0, transform_1.transformDocumentSpan)(files, symbol.definition, language_core_1.isDefinitionEnabled);
+            const definition = (0, transform_1.transformDocumentSpan)(language, symbol.definition, language_core_1.isDefinitionEnabled);
             if (definition) {
                 return {
                     definition,
                     references: symbol.references
-                        .map(r => (0, transform_1.transformDocumentSpan)(files, r, language_core_1.isReferencesEnabled))
+                        .map(r => (0, transform_1.transformDocumentSpan)(language, r, language_core_1.isReferencesEnabled))
                         .filter(utils_1.notEmpty),
                 };
             }
@@ -424,7 +424,7 @@ function decorateLanguageService(files, languageService) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -436,7 +436,7 @@ function decorateLanguageService(files, languageService) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isTypeDefinitionEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isTypeDefinitionEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -448,7 +448,7 @@ function decorateLanguageService(files, languageService) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isImplementationEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isImplementationEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -460,7 +460,7 @@ function decorateLanguageService(files, languageService) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isRenameEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isRenameEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
@@ -472,17 +472,17 @@ function decorateLanguageService(files, languageService) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isReferencesEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isReferencesEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
             let mainResult;
             let additionalResults = [];
             let isAdditional;
-            const generatedOffset = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, data => {
+            const generatedOffset = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, data => {
                 if (!(0, language_core_1.isCompletionEnabled)(data)) {
                     return false;
                 }
@@ -496,9 +496,9 @@ function decorateLanguageService(files, languageService) {
                 const result = getCompletionsAtPosition(fileName, generatedOffset, options, formattingSettings);
                 if (result) {
                     for (const entry of result.entries) {
-                        entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(sourceFile, map, entry.replacementSpan, language_core_1.isCompletionEnabled);
+                        entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(sourceScript, map, entry.replacementSpan, language_core_1.isCompletionEnabled);
                     }
-                    result.optionalReplacementSpan = result.optionalReplacementSpan && (0, transform_1.transformTextSpan)(sourceFile, map, result.optionalReplacementSpan, language_core_1.isCompletionEnabled);
+                    result.optionalReplacementSpan = result.optionalReplacementSpan && (0, transform_1.transformTextSpan)(sourceScript, map, result.optionalReplacementSpan, language_core_1.isCompletionEnabled);
                     if (isAdditional) {
                         additionalResults.push(result);
                     }
@@ -526,9 +526,9 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.getCompletionEntryDetails = (fileName, position, entryName, formatOptions, source, preferences, data) => {
         let details;
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isCompletionEnabled);
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isCompletionEnabled);
             if (generatePosition !== undefined) {
                 details = getCompletionEntryDetails(fileName, generatePosition, entryName, formatOptions, source, preferences, data);
             }
@@ -538,14 +538,14 @@ function decorateLanguageService(files, languageService) {
         }
         if (details?.codeActions) {
             for (const codeAction of details.codeActions) {
-                codeAction.changes = codeAction.changes.map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isCompletionEnabled)).filter(utils_1.notEmpty);
+                codeAction.changes = codeAction.changes.map(edit => (0, transform_1.transformFileTextChanges)(language, edit, language_core_1.isCompletionEnabled)).filter(utils_1.notEmpty);
             }
         }
         return details;
     };
     languageService.provideInlayHints = (fileName, span, preferences) => {
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
             let start;
             let end;
             for (const mapping of map.mappings) {
@@ -560,12 +560,12 @@ function decorateLanguageService(files, languageService) {
                 start = 0;
                 end = 0;
             }
-            start += sourceFile.snapshot.getLength();
-            end += sourceFile.snapshot.getLength();
+            start += sourceScript.snapshot.getLength();
+            end += sourceScript.snapshot.getLength();
             const result = provideInlayHints(fileName, { start, length: end - start }, preferences);
             const hints = [];
             for (const hint of result) {
-                const sourcePosition = (0, transform_1.toSourceOffset)(sourceFile, map, hint.position, language_core_1.isInlayHintsEnabled);
+                const sourcePosition = (0, transform_1.toSourceOffset)(sourceScript, map, hint.position, language_core_1.isInlayHintsEnabled);
                 if (sourcePosition !== undefined) {
                     hints.push({
                         ...hint,
@@ -582,18 +582,18 @@ function decorateLanguageService(files, languageService) {
     languageService.getFileReferences = fileName => {
         const unresolved = getFileReferences(fileName);
         const resolved = unresolved
-            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isReferencesEnabled))
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isReferencesEnabled))
             .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     function linkedCodeFeatureWorker(fileName, position, filter, worker, getLinkedCodes) {
         let results = [];
         const processedFilePositions = new Set();
-        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualCode) {
+        const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
+        if (serviceScript) {
             for (const [generatedOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if (filter(mapping.data)) {
-                    process(fileName, generatedOffset + sourceFile.snapshot.getLength());
+                    process(fileName, generatedOffset + sourceScript.snapshot.getLength());
                 }
             }
         }
@@ -613,16 +613,16 @@ function decorateLanguageService(files, languageService) {
             results = results.concat(result);
             for (const ref of getLinkedCodes(result)) {
                 processedFilePositions.add(ref[0] + ':' + ref[1]);
-                const [virtualFile, sourceFile] = (0, utils_1.getVirtualFileAndMap)(files, ref[0]);
+                const [virtualFile, sourceScript] = (0, utils_1.getServiceScript)(language, ref[0]);
                 if (!virtualFile) {
                     continue;
                 }
-                const linkedCodeMap = files.getLinkedCodeMap(virtualFile.code);
+                const linkedCodeMap = language.linkedCodeMaps.get(virtualFile.code);
                 if (!linkedCodeMap) {
                     continue;
                 }
-                for (const linkedCodeOffset of linkedCodeMap.getLinkedOffsets(ref[1] - sourceFile.snapshot.getLength())) {
-                    process(ref[0], linkedCodeOffset + sourceFile.snapshot.getLength());
+                for (const linkedCodeOffset of linkedCodeMap.getLinkedOffsets(ref[1] - sourceScript.snapshot.getLength())) {
+                    process(ref[0], linkedCodeOffset + sourceScript.snapshot.getLength());
                 }
             }
         }

package/lib/node/decorateLanguageServiceHost.d.ts

@@ -1,4 +1,4 @@
-import { type FileRegistry } from '@volar/language-core';
+import { type Language } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function decorateLanguageServiceHost(virtualFiles: FileRegistry, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript')): void;
+export declare function decorateLanguageServiceHost(language: Language, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript')): void;
 export declare function searchExternalFiles(ts: typeof import('typescript'), project: ts.server.Project, exts: string[]): string[];

package/lib/node/decorateLanguageServiceHost.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchExternalFiles = exports.decorateLanguageServiceHost = void 0;
 const language_core_1 = require("@volar/language-core");
 const resolveModuleName_1 = require("../resolveModuleName");
-function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
+function decorateLanguageServiceHost(language, languageServiceHost, ts) {
     let extraProjectVersion = 0;
-    const { languagePlugins } = virtualFiles;
-    const exts = languagePlugins
+    const exts = language.plugins
         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
         .flat();
     const scripts = new Map();
@@ -29,8 +28,8 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
             return readDirectory(path, extensions, exclude, include, depth);
         };
     }
-    if (languagePlugins.some(language => language.typescript?.extraFileExtensions.length)) {
-        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, languagePlugins, fileName => virtualFiles.get(fileName));
+    if (language.plugins.some(language => language.typescript?.extraFileExtensions.length)) {
+        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, language.plugins, fileName => language.scripts.get(fileName));
         if (resolveModuleNameLiterals) {
             languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, ...rest) => {
                 if (moduleLiterals.every(name => !exts.some(ext => name.text.endsWith(ext)))) {
@@ -82,25 +81,25 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
             const snapshot = getScriptSnapshot(fileName);
             if (snapshot) {
                 extraProjectVersion++;
-                const sourceFile = virtualFiles.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
-                if (sourceFile.generated) {
+                const sourceScript = language.scripts.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                if (sourceScript.generated) {
                     const text = snapshot.getText(0, snapshot.getLength());
                     let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
-                    const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
-                    if (script) {
-                        extension = script.extension;
-                        scriptKind = script.scriptKind;
-                        patchedText += script.code.snapshot.getText(0, script.code.snapshot.getLength());
+                    const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
+                    if (serviceScript) {
+                        extension = serviceScript.extension;
+                        scriptKind = serviceScript.scriptKind;
+                        patchedText += serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
                     }
                     snapshotSnapshot = ts.ScriptSnapshot.fromString(patchedText);
-                    if (sourceFile.generated.languagePlugin.typescript?.getExtraScripts) {
+                    if (sourceScript.generated.languagePlugin.typescript?.getExtraServiceScripts) {
                         console.warn('getExtraScripts() is not available in this use case.');
                     }
                 }
             }
-            else if (virtualFiles.get(fileName)) {
+            else if (language.scripts.get(fileName)) {
                 extraProjectVersion++;
-                virtualFiles.delete(fileName);
+                language.scripts.delete(fileName);
             }
             if (snapshotSnapshot) {
                 scripts.set(fileName, [

package/lib/node/decorateProgram.d.ts

@@ -1,3 +1,3 @@
-import type { FileRegistry } from '@volar/language-core';
+import type { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function decorateProgram(files: FileRegistry, program: ts.Program): void;
+export declare function decorateProgram(language: Language, program: ts.Program): void;