@volar/typescript 2.3.0-alpha.12 → 2.3.0-alpha.14

package/lib/node/decorateLanguageService.js

@@ -60,8 +60,8 @@ function decorateLanguageService(language, languageService) {
             return [];
         }
         if (serviceScript) {
-            const generateStart = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, start, language_core_1.isFormattingEnabled);
-            const generateEnd = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, end, language_core_1.isFormattingEnabled);
+            const generateStart = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, start, language_core_1.isFormattingEnabled);
+            const generateEnd = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, end, language_core_1.isFormattingEnabled);
             if (generateStart !== undefined && generateEnd !== undefined) {
                 const edits = getFormattingEditsForRange(targetScript.id, generateStart, generateEnd, options);
                 return edits
@@ -81,7 +81,7 @@ function decorateLanguageService(language, languageService) {
             return [];
         }
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, position, language_core_1.isFormattingEnabled);
+            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, position, language_core_1.isFormattingEnabled);
             if (generatePosition !== undefined) {
                 const edits = getFormattingEditsAfterKeystroke(targetScript.id, generatePosition, key, options);
                 return edits
@@ -105,7 +105,7 @@ function decorateLanguageService(language, languageService) {
             return undefined;
         }
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, position, language_core_1.isLinkedEditingEnabled);
+            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, position, language_core_1.isLinkedEditingEnabled);
             if (generatePosition !== undefined) {
                 const info = getLinkedEditingRangeAtPosition(targetScript.id, generatePosition);
                 if (info) {
@@ -124,12 +124,12 @@ function decorateLanguageService(language, languageService) {
     };
     languageService.prepareCallHierarchy = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const [serviceScript, targetScript] = (0, utils_1.getServiceScript)(language, fileName);
+        const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
             return undefined;
         }
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, position, language_core_1.isCallHierarchyEnabled);
+            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, position, language_core_1.isCallHierarchyEnabled);
             if (generatePosition !== undefined) {
                 const item = prepareCallHierarchy(targetScript.id, generatePosition);
                 if (Array.isArray(item)) {
@@ -147,12 +147,12 @@ function decorateLanguageService(language, languageService) {
     languageService.provideCallHierarchyIncomingCalls = (filePath, position) => {
         let calls = [];
         const fileName = filePath.replace(windowsPathReg, '/');
-        const [serviceScript, targetScript] = (0, utils_1.getServiceScript)(language, fileName);
+        const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
             return [];
         }
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, position, language_core_1.isCallHierarchyEnabled);
+            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, position, language_core_1.isCallHierarchyEnabled);
             if (generatePosition !== undefined) {
                 calls = provideCallHierarchyIncomingCalls(targetScript.id, generatePosition);
             }
@@ -180,9 +180,9 @@ function decorateLanguageService(language, languageService) {
             return [];
         }
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, position, language_core_1.isCallHierarchyEnabled);
+            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, position, language_core_1.isCallHierarchyEnabled);
             if (generatePosition !== undefined) {
-                calls = provideCallHierarchyOutgoingCalls(fileName, generatePosition);
+                calls = provideCallHierarchyOutgoingCalls(targetScript.id, generatePosition);
             }
         }
         else {
@@ -214,7 +214,7 @@ function decorateLanguageService(language, languageService) {
         }
         if (serviceScript) {
             const infos = [];
-            for (const [generatePosition] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, targetScript, position, language_core_1.isHoverEnabled)) {
+            for (const [generatePosition] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, sourceScript, position, language_core_1.isHoverEnabled)) {
                 const info = getQuickInfoAtPosition(targetScript.id, generatePosition);
                 if (info) {
                     const textSpan = (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, info.textSpan, language_core_1.isHoverEnabled)?.[1];
@@ -276,7 +276,7 @@ function decorateLanguageService(language, languageService) {
             return undefined;
         }
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, position, language_core_1.isSignatureHelpEnabled);
+            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, position, language_core_1.isSignatureHelpEnabled);
             if (generatePosition !== undefined) {
                 const result = getSignatureHelpItems(targetScript.id, generatePosition, options);
                 if (result) {
@@ -326,12 +326,12 @@ function decorateLanguageService(language, languageService) {
     };
     languageService.getApplicableRefactors = (filePath, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const [serviceScript, targetScript] = (0, utils_1.getServiceScript)(language, fileName);
+        const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
             return [];
         }
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
+            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
             if (generatePosition !== undefined) {
                 const por = typeof positionOrRange === 'number'
                     ? generatePosition
@@ -350,12 +350,12 @@ function decorateLanguageService(language, languageService) {
     languageService.getEditsForRefactor = (filePath, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
         let edits;
         const fileName = filePath.replace(windowsPathReg, '/');
-        const [serviceScript, targetScript] = (0, utils_1.getServiceScript)(language, fileName);
+        const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
             return undefined;
         }
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, typeof positionOrRange === 'number'
+            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, typeof positionOrRange === 'number'
                 ? positionOrRange
                 : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
             if (generatePosition !== undefined) {
@@ -387,7 +387,7 @@ function decorateLanguageService(language, languageService) {
         }
         if (serviceScript) {
             let failed;
-            for (const [generateOffset] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, targetScript, position, language_core_1.isRenameEnabled)) {
+            for (const [generateOffset] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, sourceScript, position, language_core_1.isRenameEnabled)) {
                 const info = getRenameInfo(targetScript.id, generateOffset, options);
                 if (info.canRename) {
                     const span = (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, info.triggerSpan, language_core_1.isRenameEnabled)?.[1];
@@ -415,13 +415,13 @@ function decorateLanguageService(language, languageService) {
     languageService.getCodeFixesAtPosition = (filePath, start, end, errorCodes, formatOptions, preferences) => {
         let fixes = [];
         const fileName = filePath.replace(windowsPathReg, '/');
-        const [serviceScript, targetScript] = (0, utils_1.getServiceScript)(language, fileName);
+        const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
             return [];
         }
         if (serviceScript) {
-            const generateStart = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, start, language_core_1.isCodeActionsEnabled);
-            const generateEnd = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, end, language_core_1.isCodeActionsEnabled);
+            const generateStart = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, start, language_core_1.isCodeActionsEnabled);
+            const generateEnd = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, end, language_core_1.isCodeActionsEnabled);
             if (generateStart !== undefined && generateEnd !== undefined) {
                 fixes = getCodeFixesAtPosition(targetScript.id, generateStart, generateEnd, errorCodes, formatOptions, preferences);
             }
@@ -490,9 +490,10 @@ function decorateLanguageService(language, languageService) {
         if (targetScript?.associatedOnly) {
             return [];
         }
-        return getSyntacticDiagnostics(fileName)
-            .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, languageService.getProgram(), false))
-            .filter(utils_1.notEmpty);
+        return getSyntacticDiagnostics(targetScript?.id ?? fileName)
+            .map(d => (0, transform_1.transformDiagnostic)(language, d, languageService.getProgram(), false))
+            .filter(utils_1.notEmpty)
+            .filter(d => language.scripts.get(d.file.fileName) === sourceScript);
     };
     languageService.getSemanticDiagnostics = filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
@@ -500,9 +501,10 @@ function decorateLanguageService(language, languageService) {
         if (targetScript?.associatedOnly) {
             return [];
         }
-        return getSemanticDiagnostics(fileName)
-            .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, languageService.getProgram(), false))
-            .filter(utils_1.notEmpty);
+        return getSemanticDiagnostics(targetScript?.id ?? fileName)
+            .map(d => (0, transform_1.transformDiagnostic)(language, d, languageService.getProgram(), false))
+            .filter(utils_1.notEmpty)
+            .filter(d => !d.file || language.scripts.get(d.file.fileName) === sourceScript);
     };
     languageService.getSuggestionDiagnostics = filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
@@ -510,9 +512,10 @@ function decorateLanguageService(language, languageService) {
         if (targetScript?.associatedOnly) {
             return [];
         }
-        return getSuggestionDiagnostics(fileName)
-            .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, languageService.getProgram(), false))
-            .filter(utils_1.notEmpty);
+        return getSuggestionDiagnostics(targetScript?.id ?? fileName)
+            .map(d => (0, transform_1.transformDiagnostic)(language, d, languageService.getProgram(), false))
+            .filter(utils_1.notEmpty)
+            .filter(d => !d.file || language.scripts.get(d.file.fileName) === sourceScript);
     };
     languageService.getDefinitionAndBoundSpan = (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
@@ -633,7 +636,7 @@ function decorateLanguageService(language, languageService) {
         }
         if (serviceScript) {
             const results = [];
-            for (const [generatedOffset, mapping] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, targetScript, position, language_core_1.isCompletionEnabled)) {
+            for (const [generatedOffset, mapping] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, sourceScript, position, language_core_1.isCompletionEnabled)) {
                 const result = getCompletionsAtPosition(targetScript.id, generatedOffset, options, formattingSettings);
                 if (!result) {
                     continue;
@@ -670,12 +673,12 @@ function decorateLanguageService(language, languageService) {
     languageService.getCompletionEntryDetails = (filePath, position, entryName, formatOptions, source, preferences, data) => {
         let details;
         const fileName = filePath.replace(windowsPathReg, '/');
-        const [serviceScript, targetScript] = (0, utils_1.getServiceScript)(language, fileName);
+        const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
             return undefined;
         }
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, targetScript, position, language_core_1.isCompletionEnabled);
+            const generatePosition = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, position, language_core_1.isCompletionEnabled);
             if (generatePosition !== undefined) {
                 details = getCompletionEntryDetails(targetScript.id, generatePosition, entryName, formatOptions, source, preferences, data);
             }
@@ -743,9 +746,9 @@ function decorateLanguageService(language, languageService) {
     function linkedCodeFeatureWorker(fileName, position, filter, worker, getLinkedCodes) {
         const results = [];
         const processedFilePositions = new Set();
-        const [serviceScript, targetScript] = (0, utils_1.getServiceScript)(language, fileName);
+        const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            for (const [generatedOffset] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, targetScript, position, filter)) {
+            for (const [generatedOffset] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, sourceScript, position, filter)) {
                 process(targetScript.id, generatedOffset);
             }
         }

package/lib/node/decorateProgram.js

@@ -18,56 +18,59 @@ function decorateProgram(language, program) {
         return {
             ...result,
             diagnostics: result.diagnostics
-                .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
                 .filter(utils_1.notEmpty),
         };
     };
     program.getSyntacticDiagnostics = (sourceFile, cancellationToken) => {
         if (!sourceFile) {
             return getSyntacticDiagnostics(undefined, cancellationToken)
-                .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
                 .filter(utils_1.notEmpty);
         }
         else {
             const [_serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
             const actualSourceFile = targetScript ? program.getSourceFile(targetScript.id) : sourceFile;
             return getSyntacticDiagnostics(actualSourceFile, cancellationToken)
-                .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, program, true))
-                .filter(utils_1.notEmpty);
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(utils_1.notEmpty)
+                .filter(d => !d.file || language.scripts.get(d.file.fileName) === sourceScript);
         }
     };
     program.getSemanticDiagnostics = (sourceFile, cancellationToken) => {
         if (!sourceFile) {
             return getSemanticDiagnostics(undefined, cancellationToken)
-                .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
                 .filter(utils_1.notEmpty);
         }
         else {
             const [_serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
             const actualSourceFile = targetScript ? program.getSourceFile(targetScript.id) : sourceFile;
             return getSemanticDiagnostics(actualSourceFile, cancellationToken)
-                .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, program, true))
-                .filter(utils_1.notEmpty);
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(utils_1.notEmpty)
+                .filter(d => !d.file || language.scripts.get(d.file.fileName) === sourceScript);
         }
     };
     program.getGlobalDiagnostics = cancellationToken => {
         return getGlobalDiagnostics(cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
+            .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
             .filter(utils_1.notEmpty);
     };
     // @ts-ignore
     program.getBindAndCheckDiagnostics = (sourceFile, cancellationToken) => {
         if (!sourceFile) {
             return getBindAndCheckDiagnostics(undefined, cancellationToken)
-                .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
                 .filter(utils_1.notEmpty);
         }
         else {
             const [_serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
             const actualSourceFile = targetScript ? program.getSourceFile(targetScript.id) : sourceFile;
             return getBindAndCheckDiagnostics(actualSourceFile, cancellationToken)
-                .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, program, true))
-                .filter(utils_1.notEmpty);
+                .map(d => (0, transform_1.transformDiagnostic)(language, d, program, true))
+                .filter(utils_1.notEmpty)
+                .filter(d => language.scripts.get(d.file.fileName) === sourceScript);
         }
     };
     // fix https://github.com/vuejs/language-tools/issues/4099 with `incremental`

package/lib/node/transform.d.ts

@@ -2,7 +2,7 @@ import type { CodeInformation, SourceScript, TypeScriptServiceScript } from '@vo
 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>(sourceScript: SourceScript<string> | undefined, language: Language<string>, diagnostic: T, program: ts.Program | undefined, isTsc: boolean): T | undefined;
+export declare function transformDiagnostic<T extends ts.Diagnostic>(language: Language<string>, diagnostic: T, program: ts.Program | undefined, isTsc: boolean): T | undefined;
 export declare function fillSourceFileText(language: Language<string>, sourceFile: ts.SourceFile): void;
 export declare function transformFileTextChanges(language: Language<string>, changes: readonly ts.FileTextChanges[], filter: (data: CodeInformation) => boolean): ts.FileTextChanges[];
 export declare function transformDocumentSpan<T extends ts.DocumentSpan>(language: Language<string>, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;

package/lib/node/transform.js

@@ -16,13 +16,13 @@ function transformCallHierarchyItem(language, item, filter) {
     };
 }
 exports.transformCallHierarchyItem = transformCallHierarchyItem;
-function transformDiagnostic(sourceScript, language, diagnostic, program, isTsc) {
+function transformDiagnostic(language, diagnostic, program, isTsc) {
     if (!transformedDiagnostics.has(diagnostic)) {
         transformedDiagnostics.set(diagnostic, undefined);
         const { relatedInformation } = diagnostic;
         if (relatedInformation) {
             diagnostic.relatedInformation = relatedInformation
-                .map(d => transformDiagnostic(undefined, language, d, program, isTsc))
+                .map(d => transformDiagnostic(language, d, program, isTsc))
                 .filter(utils_1.notEmpty);
         }
         if (diagnostic.file !== undefined
@@ -30,7 +30,7 @@ function transformDiagnostic(sourceScript, language, diagnostic, program, isTsc)
             && diagnostic.length !== undefined) {
             const [serviceScript] = (0, utils_1.getServiceScript)(language, diagnostic.file.fileName);
             if (serviceScript) {
-                const [sourceSpanFileName, sourceSpan] = transformTextSpan(sourceScript, language, serviceScript, {
+                const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, {
                     start: diagnostic.start,
                     length: diagnostic.length
                 }, language_core_1.shouldReportDiagnostics) ?? [];

package/lib/quickstart/createAsyncLanguageServicePlugin.d.ts

@@ -1,3 +1,6 @@
-import { LanguagePlugin } from '@volar/language-core';
+import { Language, LanguagePlugin } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function createAsyncLanguageServicePlugin(extensions: string[], scriptKind: ts.ScriptKind, loadLanguagePlugins: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<LanguagePlugin<string>[]>): ts.server.PluginModuleFactory;
+export declare function createAsyncLanguageServicePlugin(extensions: string[], scriptKind: ts.ScriptKind, create: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<{
+    languagePlugins: LanguagePlugin<string>[];
+    setup?: (language: Language<string>) => void;
+}>): ts.server.PluginModuleFactory;

package/lib/quickstart/createAsyncLanguageServicePlugin.js

@@ -6,18 +6,15 @@ const common_1 = require("../common");
 const decorateLanguageService_1 = require("../node/decorateLanguageService");
 const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
 const createLanguageServicePlugin_1 = require("./createLanguageServicePlugin");
-const externalFiles = new WeakMap();
-const decoratedLanguageServices = new WeakSet();
-const decoratedLanguageServiceHosts = new WeakSet();
-function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePlugins) {
+function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
     return modules => {
         const { typescript: ts } = modules;
         const pluginModule = {
             create(info) {
-                if (!decoratedLanguageServices.has(info.languageService)
-                    && !decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
-                    decoratedLanguageServices.add(info.languageService);
-                    decoratedLanguageServiceHosts.add(info.languageServiceHost);
+                if (!createLanguageServicePlugin_1.decoratedLanguageServices.has(info.languageService)
+                    && !createLanguageServicePlugin_1.decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
+                    createLanguageServicePlugin_1.decoratedLanguageServices.add(info.languageService);
+                    createLanguageServicePlugin_1.decoratedLanguageServiceHosts.add(info.languageServiceHost);
                     const emptySnapshot = ts.ScriptSnapshot.fromString('');
                     const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
                     const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
@@ -52,7 +49,7 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                             return getProjectVersion();
                         };
                     }
-                    loadLanguagePlugins(ts, info).then(languagePlugins => {
+                    create(ts, info).then(({ languagePlugins, setup }) => {
                         const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
                         const language = (0, language_core_1.createLanguage)([
                             ...languagePlugins,
@@ -73,6 +70,7 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                         });
                         (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
                         (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
+                        setup?.(language);
                         info.project.markAsDirty();
                         initialized = true;
                     });
@@ -81,15 +79,15 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
             },
             getExternalFiles(project, updateLevel = 0) {
                 if (updateLevel >= (1)
-                    || !externalFiles.has(project)) {
-                    const oldFiles = externalFiles.get(project);
+                    || !createLanguageServicePlugin_1.externalFiles.has(project)) {
+                    const oldFiles = createLanguageServicePlugin_1.externalFiles.get(project);
                     const newFiles = extensions.length ? (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions) : [];
-                    externalFiles.set(project, newFiles);
+                    createLanguageServicePlugin_1.externalFiles.set(project, newFiles);
                     if (oldFiles && !(0, createLanguageServicePlugin_1.arrayItemsEqual)(oldFiles, newFiles)) {
                         project.refreshDiagnostics();
                     }
                 }
-                return externalFiles.get(project);
+                return createLanguageServicePlugin_1.externalFiles.get(project);
             },
         };
         return pluginModule;

package/lib/quickstart/createLanguageServicePlugin.d.ts

@@ -1,4 +1,11 @@
-import { LanguagePlugin } from '@volar/language-core';
+import { Language, LanguagePlugin } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function createLanguageServicePlugin(loadLanguagePlugins: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => LanguagePlugin<string>[]): ts.server.PluginModuleFactory;
+export declare const externalFiles: WeakMap<ts.server.Project, string[]>;
+export declare const projectExternalFileExtensions: WeakMap<ts.server.Project, string[]>;
+export declare const decoratedLanguageServices: WeakSet<ts.LanguageService>;
+export declare const decoratedLanguageServiceHosts: WeakSet<ts.LanguageServiceHost>;
+export declare function createLanguageServicePlugin(create: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => {
+    languagePlugins: LanguagePlugin<string>[];
+    setup?: (language: Language<string>) => void;
+}): ts.server.PluginModuleFactory;
 export declare function arrayItemsEqual(a: string[], b: string[]): boolean;

package/lib/quickstart/createLanguageServicePlugin.js

@@ -1,28 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.arrayItemsEqual = exports.createLanguageServicePlugin = void 0;
+exports.arrayItemsEqual = exports.createLanguageServicePlugin = exports.decoratedLanguageServiceHosts = exports.decoratedLanguageServices = exports.projectExternalFileExtensions = exports.externalFiles = void 0;
 const language_core_1 = require("@volar/language-core");
 const common_1 = require("../common");
 const decorateLanguageService_1 = require("../node/decorateLanguageService");
 const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
-const externalFiles = new WeakMap();
-const projectExternalFileExtensions = new WeakMap();
-const decoratedLanguageServices = new WeakSet();
-const decoratedLanguageServiceHosts = new WeakSet();
-function createLanguageServicePlugin(loadLanguagePlugins) {
+exports.externalFiles = new WeakMap();
+exports.projectExternalFileExtensions = new WeakMap();
+exports.decoratedLanguageServices = new WeakSet();
+exports.decoratedLanguageServiceHosts = new WeakSet();
+function createLanguageServicePlugin(create) {
     return modules => {
         const { typescript: ts } = modules;
         const pluginModule = {
             create(info) {
-                if (!decoratedLanguageServices.has(info.languageService)
-                    && !decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
-                    decoratedLanguageServices.add(info.languageService);
-                    decoratedLanguageServiceHosts.add(info.languageServiceHost);
-                    const languagePlugins = loadLanguagePlugins(ts, info);
+                if (!exports.decoratedLanguageServices.has(info.languageService)
+                    && !exports.decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
+                    exports.decoratedLanguageServices.add(info.languageService);
+                    exports.decoratedLanguageServiceHosts.add(info.languageServiceHost);
+                    const { languagePlugins, setup } = create(ts, info);
                     const extensions = languagePlugins
                         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
                         .flat();
-                    projectExternalFileExtensions.set(info.project, extensions);
+                    exports.projectExternalFileExtensions.set(info.project, extensions);
                     const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
                     const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
                     const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
@@ -45,21 +45,22 @@ function createLanguageServicePlugin(loadLanguagePlugins) {
                     });
                     (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
                     (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
+                    setup?.(language);
                 }
                 return info.languageService;
             },
             getExternalFiles(project, updateLevel = 0) {
                 if (updateLevel >= (1)
-                    || !externalFiles.has(project)) {
-                    const oldFiles = externalFiles.get(project);
-                    const extensions = projectExternalFileExtensions.get(project);
+                    || !exports.externalFiles.has(project)) {
+                    const oldFiles = exports.externalFiles.get(project);
+                    const extensions = exports.projectExternalFileExtensions.get(project);
                     const newFiles = extensions?.length ? (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions) : [];
-                    externalFiles.set(project, newFiles);
+                    exports.externalFiles.set(project, newFiles);
                     if (oldFiles && !arrayItemsEqual(oldFiles, newFiles)) {
                         project.refreshDiagnostics();
                     }
                 }
-                return externalFiles.get(project);
+                return exports.externalFiles.get(project);
             },
         };
         return pluginModule;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.3.0-alpha.12",
+	"version": "2.3.0-alpha.14",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.3.0-alpha.12",
+		"@volar/language-core": "2.3.0-alpha.14",
 		"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.12"
+		"@volar/language-service": "2.3.0-alpha.14"
 	},
-	"gitHead": "750f23e9cebbc2262904c91600e631036eaec4d8"
+	"gitHead": "9a8179277fe224de1d13e6331115918b79b30721"
 }