@volar/typescript 2.4.23 → 2.4.24

package/index.d.ts

@@ -1,13 +1,13 @@
 export * from './lib/common';
-export * from './lib/node/proxyLanguageService';
 export * from './lib/node/decorateLanguageServiceHost';
 export * from './lib/node/decorateProgram';
 export * from './lib/node/proxyCreateProgram';
+export * from './lib/node/proxyLanguageService';
 export * from './lib/protocol/createProject';
 export * from './lib/protocol/createSys';
 import type { VirtualCode } from '@volar/language-core';
 import type * as ts from 'typescript';
-import { URI } from 'vscode-uri';
+import { type URI } from 'vscode-uri';
 declare module '@volar/language-service' {
     interface ProjectContext {
         typescript?: {

package/index.js

@@ -15,10 +15,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./lib/common"), exports);
-__exportStar(require("./lib/node/proxyLanguageService"), exports);
 __exportStar(require("./lib/node/decorateLanguageServiceHost"), exports);
 __exportStar(require("./lib/node/decorateProgram"), exports);
 __exportStar(require("./lib/node/proxyCreateProgram"), exports);
+__exportStar(require("./lib/node/proxyLanguageService"), exports);
 __exportStar(require("./lib/protocol/createProject"), exports);
 __exportStar(require("./lib/protocol/createSys"), exports);
 //# sourceMappingURL=index.js.map

package/lib/common.js

@@ -4,15 +4,24 @@ exports.resolveFileLanguageId = resolveFileLanguageId;
 function resolveFileLanguageId(path) {
     const ext = path.split('.').pop();
     switch (ext) {
-        case 'js': return 'javascript';
-        case 'cjs': return 'javascript';
-        case 'mjs': return 'javascript';
-        case 'ts': return 'typescript';
-        case 'cts': return 'typescript';
-        case 'mts': return 'typescript';
-        case 'jsx': return 'javascriptreact';
-        case 'tsx': return 'typescriptreact';
-        case 'json': return 'json';
+        case 'js':
+            return 'javascript';
+        case 'cjs':
+            return 'javascript';
+        case 'mjs':
+            return 'javascript';
+        case 'ts':
+            return 'typescript';
+        case 'cts':
+            return 'typescript';
+        case 'mts':
+            return 'typescript';
+        case 'jsx':
+            return 'javascriptreact';
+        case 'tsx':
+            return 'typescriptreact';
+        case 'json':
+            return 'json';
     }
 }
 //# sourceMappingURL=common.js.map

package/lib/node/decorateLanguageServiceHost.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorateLanguageServiceHost = decorateLanguageServiceHost;
 exports.searchExternalFiles = searchExternalFiles;
 const resolveModuleName_1 = require("../resolveModuleName");
+const utils_1 = require("./utils");
 function decorateLanguageServiceHost(ts, language, languageServiceHost) {
     const pluginExtensions = language.plugins
         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
@@ -35,13 +36,19 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
         const moduleResolutionCache = ts.createModuleResolutionCache(languageServiceHost.getCurrentDirectory(), getCanonicalFileName, languageServiceHost.getCompilationSettings());
         if (resolveModuleNameLiterals) {
             languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, ...rest) => {
-                if (moduleLiterals.every(name => !pluginExtensions.some(ext => name.text.endsWith(ext)))) {
-                    return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, ...rest);
+                const disposeFixup = (0, utils_1.fixupImpliedNodeFormatForFile)(ts, pluginExtensions, containingSourceFile, moduleResolutionCache.getPackageJsonInfoCache(), languageServiceHost, options);
+                try {
+                    if (moduleLiterals.every(name => !pluginExtensions.some(ext => name.text.endsWith(ext)))) {
+                        return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, ...rest);
+                    }
+                    return moduleLiterals.map(moduleLiteral => {
+                        const mode = ts.getModeForUsageLocation(containingSourceFile, moduleLiteral, options);
+                        return resolveModuleName(moduleLiteral.text, containingFile, options, moduleResolutionCache, redirectedReference, mode);
+                    });
+                }
+                finally {
+                    disposeFixup?.();
                 }
-                return moduleLiterals.map(moduleLiteral => {
-                    const mode = ts.getModeForUsageLocation(containingSourceFile, moduleLiteral, options);
-                    return resolveModuleName(moduleLiteral.text, containingFile, options, moduleResolutionCache, redirectedReference, mode);
-                });
             };
         }
         if (resolveModuleNames) {
@@ -50,7 +57,8 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
                     return resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, options, containingSourceFile);
                 }
                 return moduleNames.map(moduleName => {
-                    return resolveModuleName(moduleName, containingFile, options, moduleResolutionCache, redirectedReference).resolvedModule;
+                    return resolveModuleName(moduleName, containingFile, options, moduleResolutionCache, redirectedReference)
+                        .resolvedModule;
                 });
             };
         }

package/lib/node/proxyCreateProgram.d.ts

@@ -1,4 +1,4 @@
-import { Language, LanguagePlugin } from '@volar/language-core';
+import { type Language, type LanguagePlugin } from '@volar/language-core';
 import type * as ts from 'typescript';
 export declare function proxyCreateProgram(ts: typeof import('typescript'), original: typeof ts['createProgram'], create: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin<string>[] | {
     languagePlugins: LanguagePlugin<string>[];

package/lib/node/proxyCreateProgram.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.proxyCreateProgram = proxyCreateProgram;
 const language_core_1 = require("@volar/language-core");
+const common_1 = require("../common");
 const resolveModuleName_1 = require("../resolveModuleName");
 const decorateProgram_1 = require("./decorateProgram");
-const common_1 = require("../common");
+const utils_1 = require("./utils");
 const arrayEqual = (a, b) => {
     if (a.length !== b.length) {
         return false;
@@ -90,7 +91,7 @@ function proxyCreateProgram(ts, original, create) {
                 }
             }
             const originalHost = options.host;
-            const extensions = languagePlugins
+            const pluginExtensions = languagePlugins
                 .map(plugin => plugin.typescript?.extraFileExtensions.map(({ extension }) => `.${extension}`) ?? [])
                 .flat();
             options.host = { ...originalHost };
@@ -146,22 +147,29 @@ function proxyCreateProgram(ts, original, create) {
                 }
                 return parsedSourceFiles.get(originalSourceFile) ?? originalSourceFile;
             };
-            if (extensions.length) {
+            if (pluginExtensions.length) {
                 options.options.allowArbitraryExtensions = true;
                 const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, ts.sys.getFileSize, originalHost, language.plugins, fileName => language.scripts.get(fileName));
                 const resolveModuleNameLiterals = originalHost.resolveModuleNameLiterals;
                 const resolveModuleNames = originalHost.resolveModuleNames;
                 options.host.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, compilerOptions, containingSourceFile, ...rest) => {
-                    if (resolveModuleNameLiterals && moduleLiterals.every(name => !extensions.some(ext => name.text.endsWith(ext)))) {
-                        return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, compilerOptions, containingSourceFile, ...rest);
+                    const disposeFixup = (0, utils_1.fixupImpliedNodeFormatForFile)(ts, pluginExtensions, containingSourceFile, moduleResolutionCache.getPackageJsonInfoCache(), originalHost, compilerOptions);
+                    try {
+                        if (resolveModuleNameLiterals
+                            && moduleLiterals.every(name => !pluginExtensions.some(ext => name.text.endsWith(ext)))) {
+                            return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, compilerOptions, containingSourceFile, ...rest);
+                        }
+                        return moduleLiterals.map(moduleLiteral => {
+                            const mode = ts.getModeForUsageLocation(containingSourceFile, moduleLiteral, compilerOptions);
+                            return resolveModuleName(moduleLiteral.text, containingFile, compilerOptions, moduleResolutionCache, redirectedReference, mode);
+                        });
+                    }
+                    finally {
+                        disposeFixup?.();
                     }
-                    return moduleLiterals.map(moduleLiteral => {
-                        const mode = ts.getModeForUsageLocation(containingSourceFile, moduleLiteral, compilerOptions);
-                        return resolveModuleName(moduleLiteral.text, containingFile, compilerOptions, moduleResolutionCache, redirectedReference, mode);
-                    });
                 };
                 options.host.resolveModuleNames = (moduleNames, containingFile, reusedNames, redirectedReference, compilerOptions, containingSourceFile) => {
-                    if (resolveModuleNames && moduleNames.every(name => !extensions.some(ext => name.endsWith(ext)))) {
+                    if (resolveModuleNames && moduleNames.every(name => !pluginExtensions.some(ext => name.endsWith(ext)))) {
                         return resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, compilerOptions, containingSourceFile);
                     }
                     return moduleNames.map(moduleName => {

package/lib/node/proxyLanguageService.d.ts

@@ -1,4 +1,4 @@
-import { Language } from '@volar/language-core';
+import { type Language } from '@volar/language-core';
 import type * as ts from 'typescript';
 /**
  * Creates and returns a Proxy around the base TypeScript LanguageService.

package/lib/node/proxyLanguageService.js

@@ -25,41 +25,76 @@ function createProxyLanguageService(languageService) {
         initialize(language) {
             getProxyMethod = (target, p) => {
                 switch (p) {
-                    case 'getNavigationTree': return getNavigationTree(language, target[p]);
-                    case 'getOutliningSpans': return getOutliningSpans(language, target[p]);
-                    case 'getFormattingEditsForDocument': return getFormattingEditsForDocument(language, target[p]);
-                    case 'getFormattingEditsForRange': return getFormattingEditsForRange(language, target[p]);
-                    case 'getFormattingEditsAfterKeystroke': return getFormattingEditsAfterKeystroke(language, target[p]);
-                    case 'getEditsForFileRename': return getEditsForFileRename(language, target[p]);
-                    case 'getLinkedEditingRangeAtPosition': return getLinkedEditingRangeAtPosition(language, target[p]);
-                    case 'prepareCallHierarchy': return prepareCallHierarchy(language, target[p]);
-                    case 'provideCallHierarchyIncomingCalls': return provideCallHierarchyIncomingCalls(language, target[p]);
-                    case 'provideCallHierarchyOutgoingCalls': return provideCallHierarchyOutgoingCalls(language, target[p]);
-                    case 'organizeImports': return organizeImports(language, target[p]);
-                    case 'getQuickInfoAtPosition': return getQuickInfoAtPosition(language, target[p]);
-                    case 'getSignatureHelpItems': return getSignatureHelpItems(language, target[p]);
-                    case 'getDocumentHighlights': return getDocumentHighlights(language, target[p]);
-                    case 'getApplicableRefactors': return getApplicableRefactors(language, target[p]);
-                    case 'getEditsForRefactor': return getEditsForRefactor(language, target[p]);
-                    case 'getCombinedCodeFix': return getCombinedCodeFix(language, target[p]);
-                    case 'getRenameInfo': return getRenameInfo(language, target[p]);
-                    case 'getCodeFixesAtPosition': return getCodeFixesAtPosition(language, target[p]);
-                    case 'getEncodedSemanticClassifications': return getEncodedSemanticClassifications(language, target[p]);
-                    case 'getSyntacticDiagnostics': return getSyntacticDiagnostics(language, languageService, target[p]);
-                    case 'getSemanticDiagnostics': return getSemanticDiagnostics(language, languageService, target[p]);
-                    case 'getSuggestionDiagnostics': return getSuggestionDiagnostics(language, languageService, target[p]);
-                    case 'getDefinitionAndBoundSpan': return getDefinitionAndBoundSpan(language, target[p]);
-                    case 'findReferences': return findReferences(language, target[p]);
-                    case 'getDefinitionAtPosition': return getDefinitionAtPosition(language, target[p]);
-                    case 'getTypeDefinitionAtPosition': return getTypeDefinitionAtPosition(language, target[p]);
-                    case 'getImplementationAtPosition': return getImplementationAtPosition(language, target[p]);
-                    case 'findRenameLocations': return findRenameLocations(language, target[p]);
-                    case 'getReferencesAtPosition': return getReferencesAtPosition(language, target[p]);
-                    case 'getCompletionsAtPosition': return getCompletionsAtPosition(language, target[p]);
-                    case 'getCompletionEntryDetails': return getCompletionEntryDetails(language, target[p]);
-                    case 'provideInlayHints': return provideInlayHints(language, target[p]);
-                    case 'getFileReferences': return getFileReferences(language, target[p]);
-                    case 'getNavigateToItems': return getNavigateToItems(language, target[p]);
+                    case 'getNavigationTree':
+                        return getNavigationTree(language, target[p]);
+                    case 'getOutliningSpans':
+                        return getOutliningSpans(language, target[p]);
+                    case 'getFormattingEditsForDocument':
+                        return getFormattingEditsForDocument(language, target[p]);
+                    case 'getFormattingEditsForRange':
+                        return getFormattingEditsForRange(language, target[p]);
+                    case 'getFormattingEditsAfterKeystroke':
+                        return getFormattingEditsAfterKeystroke(language, target[p]);
+                    case 'getEditsForFileRename':
+                        return getEditsForFileRename(language, target[p]);
+                    case 'getLinkedEditingRangeAtPosition':
+                        return getLinkedEditingRangeAtPosition(language, target[p]);
+                    case 'prepareCallHierarchy':
+                        return prepareCallHierarchy(language, target[p]);
+                    case 'provideCallHierarchyIncomingCalls':
+                        return provideCallHierarchyIncomingCalls(language, target[p]);
+                    case 'provideCallHierarchyOutgoingCalls':
+                        return provideCallHierarchyOutgoingCalls(language, target[p]);
+                    case 'organizeImports':
+                        return organizeImports(language, target[p]);
+                    case 'getQuickInfoAtPosition':
+                        return getQuickInfoAtPosition(language, target[p]);
+                    case 'getSignatureHelpItems':
+                        return getSignatureHelpItems(language, target[p]);
+                    case 'getDocumentHighlights':
+                        return getDocumentHighlights(language, target[p]);
+                    case 'getApplicableRefactors':
+                        return getApplicableRefactors(language, target[p]);
+                    case 'getEditsForRefactor':
+                        return getEditsForRefactor(language, target[p]);
+                    case 'getCombinedCodeFix':
+                        return getCombinedCodeFix(language, target[p]);
+                    case 'getRenameInfo':
+                        return getRenameInfo(language, target[p]);
+                    case 'getCodeFixesAtPosition':
+                        return getCodeFixesAtPosition(language, target[p]);
+                    case 'getEncodedSemanticClassifications':
+                        return getEncodedSemanticClassifications(language, target[p]);
+                    case 'getSyntacticDiagnostics':
+                        return getSyntacticDiagnostics(language, languageService, target[p]);
+                    case 'getSemanticDiagnostics':
+                        return getSemanticDiagnostics(language, languageService, target[p]);
+                    case 'getSuggestionDiagnostics':
+                        return getSuggestionDiagnostics(language, languageService, target[p]);
+                    case 'getDefinitionAndBoundSpan':
+                        return getDefinitionAndBoundSpan(language, target[p]);
+                    case 'findReferences':
+                        return findReferences(language, target[p]);
+                    case 'getDefinitionAtPosition':
+                        return getDefinitionAtPosition(language, target[p]);
+                    case 'getTypeDefinitionAtPosition':
+                        return getTypeDefinitionAtPosition(language, target[p]);
+                    case 'getImplementationAtPosition':
+                        return getImplementationAtPosition(language, target[p]);
+                    case 'findRenameLocations':
+                        return findRenameLocations(language, target[p]);
+                    case 'getReferencesAtPosition':
+                        return getReferencesAtPosition(language, target[p]);
+                    case 'getCompletionsAtPosition':
+                        return getCompletionsAtPosition(language, target[p]);
+                    case 'getCompletionEntryDetails':
+                        return getCompletionEntryDetails(language, target[p]);
+                    case 'provideInlayHints':
+                        return provideInlayHints(language, target[p]);
+                    case 'getFileReferences':
+                        return getFileReferences(language, target[p]);
+                    case 'getNavigateToItems':
+                        return getNavigateToItems(language, target[p]);
                 }
             };
         },
@@ -413,7 +448,8 @@ function getDocumentHighlights(language, getDocumentHighlights) {
                 ...highlights,
                 highlightSpans: highlights.highlightSpans
                     .map(span => {
-                    const { textSpan } = (0, transform_1.transformSpan)(language, span.fileName ?? highlights.fileName, span.textSpan, false, language_core_1.isHighlightEnabled) ?? {};
+                    const { textSpan } = (0, transform_1.transformSpan)(language, span.fileName ?? highlights.fileName, span.textSpan, false, language_core_1.isHighlightEnabled)
+                        ?? {};
                     if (textSpan) {
                         return {
                             ...span,
@@ -498,7 +534,7 @@ function getRenameInfo(language, getRenameInfo) {
         if (targetScript?.associatedOnly) {
             return {
                 canRename: false,
-                localizedErrorMessage: "Cannot rename"
+                localizedErrorMessage: 'Cannot rename',
             };
         }
         if (serviceScript) {
@@ -560,7 +596,7 @@ function getEncodedSemanticClassifications(language, getEncodedSemanticClassific
         if (targetScript?.associatedOnly) {
             return {
                 spans: [],
-                endOfLineState: 0
+                endOfLineState: 0,
             };
         }
         if (serviceScript) {
@@ -569,7 +605,7 @@ function getEncodedSemanticClassifications(language, getEncodedSemanticClassific
             if (!mapped) {
                 return {
                     spans: [],
-                    endOfLineState: 0
+                    endOfLineState: 0,
                 };
             }
             const mappingOffset = (0, transform_1.getMappingOffset)(language, serviceScript);
@@ -778,7 +814,8 @@ function getCompletionsAtPosition(language, getCompletionsAtPosition) {
                     result.entries = result.entries.filter(entry => !!entry.sourceDisplay);
                 }
                 for (const entry of result.entries) {
-                    entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, entry.replacementSpan, false, language_core_1.isCompletionEnabled)?.[1];
+                    entry.replacementSpan = entry.replacementSpan
+                        && (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, entry.replacementSpan, false, language_core_1.isCompletionEnabled)?.[1];
                 }
                 result.optionalReplacementSpan = result.optionalReplacementSpan
                     && (0, transform_1.transformTextSpan)(sourceScript, language, serviceScript, result.optionalReplacementSpan, false, language_core_1.isCompletionEnabled)?.[1];

package/lib/node/transform.d.ts

@@ -1,5 +1,5 @@
 import type { CodeInformation, SourceScript } from '@volar/language-core';
-import { Language } from '@volar/language-core';
+import { type Language } from '@volar/language-core';
 import type * as ts from 'typescript';
 import type { TypeScriptServiceScript } from '../..';
 /**

package/lib/node/transform.js

@@ -52,7 +52,7 @@ function transformDiagnostic(language, diagnostic, program, isTsc) {
             if (serviceScript) {
                 const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, {
                     start: diagnostic.start,
-                    length: diagnostic.length
+                    length: diagnostic.length,
                 }, true, data => (0, language_core_1.shouldReportDiagnostics)(data, String(diagnostic.source), String(diagnostic.code))) ?? [];
                 const actualDiagnosticFile = sourceSpanFileName
                     ? diagnostic.file.fileName === sourceSpanFileName
@@ -101,14 +101,15 @@ function transformFileTextChanges(language, changes, fallbackToAnyMatch, filter)
         const [_, source] = (0, utils_1.getServiceScript)(language, fileChanges.fileName);
         if (source) {
             fileChanges.textChanges.forEach(c => {
-                const { fileName, textSpan } = transformSpan(language, fileChanges.fileName, c.span, fallbackToAnyMatch, filter) ?? {};
+                const { fileName, textSpan } = transformSpan(language, fileChanges.fileName, c.span, fallbackToAnyMatch, filter)
+                    ?? {};
                 if (fileName && textSpan) {
                     (changesPerFile[fileName] ?? (changesPerFile[fileName] = [])).push({ ...c, span: textSpan });
                 }
             });
         }
         else {
-            const list = (changesPerFile[fileChanges.fileName] ?? (changesPerFile[fileChanges.fileName] = []));
+            const list = changesPerFile[fileChanges.fileName] ?? (changesPerFile[fileChanges.fileName] = []);
             fileChanges.textChanges.forEach(c => {
                 list.push(c);
             });
@@ -122,7 +123,7 @@ function transformFileTextChanges(language, changes, fallbackToAnyMatch, filter)
         result.push({
             fileName,
             isNewFile: newFiles.has(fileName),
-            textChanges: changesPerFile[fileName]
+            textChanges: changesPerFile[fileName],
         });
     }
     return result;

package/lib/node/utils.d.ts

@@ -1,3 +1,5 @@
 import type { Language, SourceScript } from '@volar/language-core';
+import type * as ts from 'typescript';
 import type { TypeScriptServiceScript } from '../..';
 export declare function getServiceScript(language: Language<string>, fileName: string): [serviceScript: TypeScriptServiceScript, targetScript: SourceScript<string>, sourceScript: SourceScript<string>] | [serviceScript: undefined, sourceScript: SourceScript<string>, sourceScript: SourceScript<string>] | [serviceScript: undefined, sourceScript: undefined, targetScript: undefined];
+export declare function fixupImpliedNodeFormatForFile(ts: typeof import('typescript'), pluginExtensions: string[], sourceFile: ts.SourceFile, packageJsonInfoCache: ts.PackageJsonInfoCache, host: ts.ModuleResolutionHost, options: ts.CompilerOptions): (() => undefined) | undefined;

package/lib/node/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceScript = getServiceScript;
+exports.fixupImpliedNodeFormatForFile = fixupImpliedNodeFormatForFile;
 function getServiceScript(language, fileName) {
     const sourceScript = language.scripts.get(fileName);
     if (sourceScript?.targetIds.size) {
@@ -25,4 +26,17 @@ function getServiceScript(language, fileName) {
     }
     return [undefined, undefined, undefined];
 }
+function fixupImpliedNodeFormatForFile(ts, pluginExtensions, sourceFile, packageJsonInfoCache, host, options) {
+    if (sourceFile.impliedNodeFormat !== undefined || !pluginExtensions.some(ext => sourceFile.fileName.endsWith(ext))) {
+        return;
+    }
+    // https://github.com/microsoft/TypeScript/blob/669c25c091ad4d32298d0f33b0e4e681d46de3ea/src/compiler/program.ts#L1354
+    const validExts = [ts.Extension.Dts, ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Js, ts.Extension.Jsx];
+    if (validExts.some(ext => sourceFile.fileName.endsWith(ext))) {
+        return;
+    }
+    const asTs = sourceFile.fileName + ts.Extension.Ts;
+    sourceFile.impliedNodeFormat = ts.getImpliedNodeFormatForFile?.(asTs, packageJsonInfoCache, host, options);
+    return () => sourceFile.impliedNodeFormat = undefined;
+}
 //# sourceMappingURL=utils.js.map

package/lib/protocol/createProject.d.ts

@@ -1,4 +1,4 @@
-import { Language } from '@volar/language-core';
+import { type Language } from '@volar/language-core';
 import type * as ts from 'typescript';
 import type { TypeScriptExtraServiceScript } from '../..';
 import type { createSys } from './createSys';

package/lib/protocol/createProject.js

@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLanguageServiceHost = createLanguageServiceHost;
 const language_core_1 = require("@volar/language-core");
 const path = require("path-browserify");
+const utils_1 = require("../node/utils");
 const resolveModuleName_1 = require("../resolveModuleName");
 function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
+    const pluginExtensions = language.plugins
+        .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
+        .flat();
     const scriptVersions = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
     let lastProjectVersion;
     let tsProjectVersion = 0;
@@ -32,17 +36,15 @@ function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
         },
         readDirectory(dirName, extensions, excludes, includes, depth) {
             const exts = new Set(extensions);
-            for (const languagePlugin of language.plugins) {
-                for (const ext of languagePlugin.typescript?.extraFileExtensions ?? []) {
-                    exts.add('.' + ext.extension);
-                }
+            for (const ext of pluginExtensions) {
+                exts.add(ext);
             }
             extensions = [...exts];
             return sys.readDirectory(dirName, extensions, excludes, includes, depth);
         },
         getCompilationSettings() {
             const options = projectHost.getCompilationSettings();
-            if (language.plugins.some(language => language.typescript?.extraFileExtensions.length)) {
+            if (pluginExtensions.length) {
                 options.allowNonTsExtensions ??= true;
                 if (!options.allowNonTsExtensions) {
                     console.warn('`allowNonTsExtensions` must be `true`.');
@@ -124,30 +126,38 @@ function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
             languageServiceHost = plugin.typescript.resolveLanguageServiceHost(languageServiceHost);
         }
     }
-    if (language.plugins.some(plugin => plugin.typescript?.extraFileExtensions.length)) {
+    if (pluginExtensions.length) {
         // TODO: can this share between monorepo packages?
-        const moduleCache = ts.createModuleResolutionCache(languageServiceHost.getCurrentDirectory(), languageServiceHost.useCaseSensitiveFileNames?.() ? s => s : s => s.toLowerCase(), languageServiceHost.getCompilationSettings());
+        const moduleResolutionCache = ts.createModuleResolutionCache(languageServiceHost.getCurrentDirectory(), languageServiceHost.useCaseSensitiveFileNames?.() ? s => s : s => s.toLowerCase(), languageServiceHost.getCompilationSettings());
         const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, sys.getFileSize, languageServiceHost, language.plugins, fileName => language.scripts.get(asScriptId(fileName)));
         let lastSysVersion = 'version' in sys ? sys.version : undefined;
-        languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, sourceFile) => {
-            if ('version' in sys && lastSysVersion !== sys.version) {
-                lastSysVersion = sys.version;
-                moduleCache.clear();
+        languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, containingSourceFile) => {
+            const disposeFixup = (0, utils_1.fixupImpliedNodeFormatForFile)(ts, pluginExtensions, containingSourceFile, moduleResolutionCache.getPackageJsonInfoCache(), languageServiceHost, options);
+            try {
+                if ('version' in sys && lastSysVersion !== sys.version) {
+                    lastSysVersion = sys.version;
+                    moduleResolutionCache.clear();
+                }
+                return moduleLiterals.map(moduleLiteral => {
+                    const mode = ts.getModeForUsageLocation(containingSourceFile, moduleLiteral, options);
+                    return resolveModuleName(moduleLiteral.text, containingFile, options, moduleResolutionCache, redirectedReference, mode);
+                });
+            }
+            finally {
+                disposeFixup?.();
             }
-            return moduleLiterals.map(moduleLiteral => {
-                return resolveModuleName(moduleLiteral.text, containingFile, options, moduleCache, redirectedReference, sourceFile.impliedNodeFormat);
-            });
         };
         languageServiceHost.resolveModuleNames = (moduleNames, containingFile, _reusedNames, redirectedReference, options) => {
             if ('version' in sys && lastSysVersion !== sys.version) {
                 lastSysVersion = sys.version;
-                moduleCache.clear();
+                moduleResolutionCache.clear();
             }
             return moduleNames.map(moduleName => {
-                return resolveModuleName(moduleName, containingFile, options, moduleCache, redirectedReference).resolvedModule;
+                return resolveModuleName(moduleName, containingFile, options, moduleResolutionCache, redirectedReference)
+                    .resolvedModule;
             });
         };
-        languageServiceHost.getModuleResolutionCache = () => moduleCache;
+        languageServiceHost.getModuleResolutionCache = () => moduleResolutionCache;
     }
     return {
         languageServiceHost,

package/lib/protocol/createSys.d.ts

@@ -1,4 +1,4 @@
-import type { LanguageServiceEnvironment, Disposable } from '@volar/language-service';
+import type { Disposable, LanguageServiceEnvironment } from '@volar/language-service';
 import type * as ts from 'typescript';
 import { URI } from 'vscode-uri';
 export declare function createSys(sys: ts.System | undefined, env: Pick<LanguageServiceEnvironment, 'onDidChangeWatchedFiles' | 'fs'>, getCurrentDirectory: () => string, uriConverter: {

package/lib/protocol/createSys.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSys = createSys;
 const path = require("path-browserify");
-const utilities_1 = require("../typescript/utilities");
 const vscode_uri_1 = require("vscode-uri");
+const utilities_1 = require("../typescript/utilities");
 let currentCwd = '';
 function createSys(sys, env, getCurrentDirectory, uriConverter) {
     let version = 0;
@@ -25,23 +25,25 @@ function createSys(sys, env, getCurrentDirectory, uriConverter) {
             const fileExists = change.type === 1
                 || change.type === 2;
             const dir = getDir(dirName, fileExists);
-            dir.files.set(normalizeFileId(baseName), fileExists ? {
-                name: baseName,
-                stat: {
-                    type: 1,
-                    ctime: Date.now(),
-                    mtime: Date.now(),
-                    size: -1,
-                },
-                requestedStat: false,
-                requestedText: false,
-            } : {
-                name: baseName,
-                stat: undefined,
-                text: undefined,
-                requestedStat: true,
-                requestedText: true,
-            });
+            dir.files.set(normalizeFileId(baseName), fileExists
+                ? {
+                    name: baseName,
+                    stat: {
+                        type: 1,
+                        ctime: Date.now(),
+                        mtime: Date.now(),
+                        size: -1,
+                    },
+                    requestedStat: false,
+                    requestedText: false,
+                }
+                : {
+                    name: baseName,
+                    stat: undefined,
+                    text: undefined,
+                    requestedStat: true,
+                    requestedText: true,
+                });
         }
     });
     return {
@@ -133,7 +135,7 @@ function createSys(sys, env, getCurrentDirectory, uriConverter) {
             file.requestedStat = true;
             handleStat(fileName, file);
         }
-        return file.stat ? new Date(file.stat.mtime) : new Date(0);
+        return file.stat ? new Date(file.stat.mtime) : new Date(-1);
     }
     function fileExists(fileName) {
         fileName = resolvePath(fileName);

package/lib/quickstart/languageServicePluginCommon.d.ts

@@ -1,4 +1,4 @@
-import { Language, LanguagePlugin } from '@volar/language-core/lib/types';
+import { type Language, type LanguagePlugin } from '@volar/language-core/lib/types';
 import type * as ts from 'typescript';
 export declare const externalFiles: WeakMap<ts.server.Project, string[]>;
 export declare const projectExternalFileExtensions: WeakMap<ts.server.Project, string[]>;

package/lib/quickstart/runTsc.d.ts

@@ -1,5 +1,5 @@
-import type * as ts from 'typescript';
 import type { Language, LanguagePlugin } from '@volar/language-core';
+import type * as ts from 'typescript';
 export declare let getLanguagePlugins: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin<string>[] | {
     languagePlugins: LanguagePlugin<string>[];
     setup?(language: Language<string>): void;

package/lib/quickstart/runTsc.js

@@ -95,7 +95,7 @@ function transformTscContent(tsc, proxyApiPath, extraSupportedExtensions, extraE
         + s.replace('createProgram', '_createProgram'));
     return tsc;
 }
-function replace(text, ...[search, replace]) {
+function replace(text, search, replace) {
     const before = text;
     text = text.replace(search, replace);
     const after = text;

package/lib/typescript/core.d.ts

@@ -1,4 +1,4 @@
-import { Comparer, Comparison, SortedReadonlyArray } from "./corePublic";
+import { type Comparer, Comparison, type SortedReadonlyArray } from './corePublic';
 /**
  * Iterates through `array` by index and performs the callback on each element of array until the callback
  * returns a falsey value, then returns false.

package/lib/typescript/core.js

@@ -232,9 +232,9 @@ const fileNameLowerCaseRegExp = /[^\u0130\u0131\u00DFa-z0-9\\/:\-_\. ]+/g;
  * So for this function purpose, we go ahead and assume character I with dot on top it as case sensitive since its very unlikely to use lower case form of that special character
  */
 function toFileNameLowerCase(x) {
-    return fileNameLowerCaseRegExp.test(x) ?
-        x.replace(fileNameLowerCaseRegExp, toLowerCase) :
-        x;
+    return fileNameLowerCaseRegExp.test(x)
+        ? x.replace(fileNameLowerCaseRegExp, toLowerCase)
+        : x;
 }
 function equateValues(a, b) {
     return a === b;
@@ -263,11 +263,15 @@ function equateStringsCaseSensitive(a, b) {
     return equateValues(a, b);
 }
 function compareComparableValues(a, b) {
-    return a === b ? 0 /* Comparison.EqualTo */ :
-        a === undefined ? -1 /* Comparison.LessThan */ :
-            b === undefined ? 1 /* Comparison.GreaterThan */ :
-                a < b ? -1 /* Comparison.LessThan */ :
-                    1 /* Comparison.GreaterThan */;
+    return a === b
+        ? 0 /* Comparison.EqualTo */
+        : a === undefined
+            ? -1 /* Comparison.LessThan */
+            : b === undefined
+                ? 1 /* Comparison.GreaterThan */
+                : a < b
+                    ? -1 /* Comparison.LessThan */
+                    : 1 /* Comparison.GreaterThan */;
 }
 /**
  * Compare two strings using a case-insensitive ordinal comparison.

package/lib/typescript/corePublic.d.ts

@@ -10,10 +10,10 @@ export interface MapLike<T> {
     [index: string]: T;
 }
 export interface SortedReadonlyArray<T> extends ReadonlyArray<T> {
-    " __sortedArrayBrand": any;
+    ' __sortedArrayBrand': any;
 }
 export interface SortedArray<T> extends Array<T> {
-    " __sortedArrayBrand": any;
+    ' __sortedArrayBrand': any;
 }
 /** Common read methods for ES6 Map/Set. */
 export interface ReadonlyCollection<K> {

package/lib/typescript/corePublic.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Set = exports.Map = exports.version = exports.versionMajorMinor = void 0;
 // WARNING: The script `configurePrerelease.ts` uses a regexp to parse out these values.
 // If changing the text in this section, be sure to test `configurePrerelease` too.
-exports.versionMajorMinor = "4.9";
+exports.versionMajorMinor = '4.9';
 // The following is baselined as a literal template type without intervention
 /** The version of the TypeScript compiler release */
 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
@@ -11,11 +11,15 @@ exports.version = `${exports.versionMajorMinor}.0-dev`;
 /* @internal */
 var NativeCollections;
 (function (NativeCollections) {
-    const globals = typeof globalThis !== "undefined" ? globalThis :
+    const globals = typeof globalThis !== 'undefined'
+        ? globalThis
         // @ts-ignore node global
-        typeof global !== "undefined" ? global :
-            typeof self !== "undefined" ? self :
-                undefined;
+        : typeof global !== 'undefined'
+            // @ts-ignore node global
+            ? global
+            : typeof self !== 'undefined'
+                ? self
+                : undefined;
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -23,9 +27,11 @@ var NativeCollections;
         // Internet Explorer's Map doesn't support iteration, so don't use it.
         const gMap = globals?.Map;
         // eslint-disable-next-line local/no-in-operator
-        const constructor = typeof gMap !== "undefined" && "entries" in gMap.prototype && new gMap([[0, 0]]).size === 1 ? gMap : undefined;
+        const constructor = typeof gMap !== 'undefined' && 'entries' in gMap.prototype && new gMap([[0, 0]]).size === 1
+            ? gMap
+            : undefined;
         if (!constructor) {
-            throw new Error("No compatible Map implementation found.");
+            throw new Error('No compatible Map implementation found.');
         }
         return constructor;
     }
@@ -37,9 +43,11 @@ var NativeCollections;
         // Internet Explorer's Set doesn't support iteration, so don't use it.
         const gSet = globals?.Set;
         // eslint-disable-next-line local/no-in-operator
-        const constructor = typeof gSet !== "undefined" && "entries" in gSet.prototype && new gSet([0]).size === 1 ? gSet : undefined;
+        const constructor = typeof gSet !== 'undefined' && 'entries' in gSet.prototype && new gSet([0]).size === 1
+            ? gSet
+            : undefined;
         if (!constructor) {
-            throw new Error("No compatible Set implementation found.");
+            throw new Error('No compatible Set implementation found.');
         }
         return constructor;
     }

package/lib/typescript/path.d.ts

@@ -1,4 +1,4 @@
-import { Path } from "./types";
+import { type Path } from './types';
 /**
  * Internally, we represent paths as strings with '/' as the directory separator.
  * When we make system calls (eg: LanguageServiceHost.getDirectory()),

package/lib/typescript/path.js

@@ -16,9 +16,9 @@ const core_1 = require("./core");
  * When we make system calls (eg: LanguageServiceHost.getDirectory()),
  * we expect the host to correctly handle paths in our specified format.
  */
-exports.directorySeparator = "/";
-const altDirectorySeparator = "\\";
-const urlSchemeSeparator = "://";
+exports.directorySeparator = '/';
+const altDirectorySeparator = '\\';
+const urlSchemeSeparator = '://';
 const backslashRegExp = /\\/g;
 //// Path Tests
 /**
@@ -35,7 +35,7 @@ function isRootedDiskPath(path) {
     return getEncodedRootLength(path) > 0;
 }
 function hasExtension(fileName) {
-    return (0, core_1.stringContains)(getBaseFileName(fileName), ".");
+    return (0, core_1.stringContains)(getBaseFileName(fileName), '.');
 }
 function fileExtensionIs(path, extension) {
     return path.length > extension.length && (0, core_1.endsWith)(path, extension);
@@ -56,8 +56,8 @@ function hasTrailingDirectorySeparator(path) {
 }
 //// Path Parsing
 function isVolumeCharacter(charCode) {
-    return (charCode >= 97 /* CharacterCodes.a */ && charCode <= 122 /* CharacterCodes.z */) ||
-        (charCode >= 65 /* CharacterCodes.A */ && charCode <= 90 /* CharacterCodes.Z */);
+    return (charCode >= 97 /* CharacterCodes.a */ && charCode <= 122 /* CharacterCodes.z */)
+        || (charCode >= 65 /* CharacterCodes.A */ && charCode <= 90 /* CharacterCodes.Z */);
 }
 function getFileUrlVolumeSeparatorEnd(url, start) {
     const ch0 = url.charCodeAt(start);
@@ -113,8 +113,8 @@ function getEncodedRootLength(path) {
             // special case interpreted as "the machine from which the URL is being interpreted".
             const scheme = path.slice(0, schemeEnd);
             const authority = path.slice(authorityStart, authorityEnd);
-            if (scheme === "file" && (authority === "" || authority === "localhost") &&
-                isVolumeCharacter(path.charCodeAt(authorityEnd + 1))) {
+            if (scheme === 'file' && (authority === '' || authority === 'localhost')
+                && isVolumeCharacter(path.charCodeAt(authorityEnd + 1))) {
                 const volumeSeparatorEnd = getFileUrlVolumeSeparatorEnd(path, authorityEnd + 2);
                 if (volumeSeparatorEnd !== -1) {
                     if (path.charCodeAt(volumeSeparatorEnd) === 47 /* CharacterCodes.slash */) {
@@ -181,18 +181,20 @@ function getBaseFileName(path, extensions, ignoreCase) {
     // if the path provided is itself the root, then it has not file name.
     const rootLength = getRootLength(path);
     if (rootLength === path.length) {
-        return "";
+        return '';
     }
     // return the trailing portion of the path starting after the last (non-terminal) directory
     // separator but not including any trailing directory separator.
     path = removeTrailingDirectorySeparator(path);
     const name = path.slice(Math.max(getRootLength(path), path.lastIndexOf(exports.directorySeparator) + 1));
-    const extension = extensions !== undefined && ignoreCase !== undefined ? getAnyExtensionFromPath(name, extensions, ignoreCase) : undefined;
+    const extension = extensions !== undefined && ignoreCase !== undefined
+        ? getAnyExtensionFromPath(name, extensions, ignoreCase)
+        : undefined;
     return extension ? name.slice(0, name.length - extension.length) : name;
 }
 function tryGetExtensionFromPath(path, extension, stringEqualityComparer) {
-    if (!(0, core_1.startsWith)(extension, ".")) {
-        extension = "." + extension;
+    if (!(0, core_1.startsWith)(extension, '.')) {
+        extension = '.' + extension;
     }
     if (path.length >= extension.length && path.charCodeAt(path.length - extension.length) === 46 /* CharacterCodes.dot */) {
         const pathExtension = path.slice(path.length - extension.length);
@@ -202,8 +204,8 @@ function tryGetExtensionFromPath(path, extension, stringEqualityComparer) {
     }
 }
 function getAnyExtensionFromPathWorker(path, extensions, stringEqualityComparer) {
-    if (typeof extensions === "string") {
-        return tryGetExtensionFromPath(path, extensions, stringEqualityComparer) || "";
+    if (typeof extensions === 'string') {
+        return tryGetExtensionFromPath(path, extensions, stringEqualityComparer) || '';
     }
     for (const extension of extensions) {
         const result = tryGetExtensionFromPath(path, extension, stringEqualityComparer);
@@ -211,7 +213,7 @@ function getAnyExtensionFromPathWorker(path, extensions, stringEqualityComparer)
             return result;
         }
     }
-    return "";
+    return '';
 }
 function getAnyExtensionFromPath(path, extensions, ignoreCase) {
     // Retrieves any string from the final "." onwards from a base file name.
@@ -220,11 +222,11 @@ function getAnyExtensionFromPath(path, extensions, ignoreCase) {
         return getAnyExtensionFromPathWorker(removeTrailingDirectorySeparator(path), extensions, ignoreCase ? core_1.equateStringsCaseInsensitive : core_1.equateStringsCaseSensitive);
     }
     const baseFileName = getBaseFileName(path);
-    const extensionIndex = baseFileName.lastIndexOf(".");
+    const extensionIndex = baseFileName.lastIndexOf('.');
     if (extensionIndex >= 0) {
         return baseFileName.substring(extensionIndex);
     }
-    return "";
+    return '';
 }
 function pathComponents(path, rootLength) {
     const root = path.substring(0, rootLength);
@@ -264,7 +266,7 @@ function pathComponents(path, rootLength) {
  * getPathComponents("file:///") === ["file:///"]
  * getPathComponents("file://") === ["file://"]
  */
-function getPathComponents(path, currentDirectory = "") {
+function getPathComponents(path, currentDirectory = '') {
     path = combinePaths(currentDirectory, path);
     return pathComponents(path, getRootLength(path));
 }
@@ -279,7 +281,7 @@ function getPathComponents(path, currentDirectory = "") {
  */
 function getPathFromPathComponents(pathComponents) {
     if (pathComponents.length === 0) {
-        return "";
+        return '';
     }
     const root = pathComponents[0] && ensureTrailingDirectorySeparator(pathComponents[0]);
     return root + pathComponents.slice(1).join(exports.directorySeparator);
@@ -289,7 +291,7 @@ function getPathFromPathComponents(pathComponents) {
  * Normalize path separators, converting `\` into `/`.
  */
 function normalizeSlashes(path) {
-    return path.indexOf("\\") !== -1
+    return path.indexOf('\\') !== -1
         ? path.replace(backslashRegExp, exports.directorySeparator)
         : path;
 }
@@ -307,12 +309,12 @@ function reducePathComponents(components) {
         if (!component) {
             continue;
         }
-        if (component === ".") {
+        if (component === '.') {
             continue;
         }
-        if (component === "..") {
+        if (component === '..') {
             if (reduced.length > 1) {
-                if (reduced[reduced.length - 1] !== "..") {
+                if (reduced[reduced.length - 1] !== '..') {
                     reduced.pop();
                     continue;
                 }
@@ -381,7 +383,7 @@ function normalizePath(path) {
         return path;
     }
     // Some paths only require cleanup of `/./` or leading `./`
-    const simplified = path.replace(/\/\.\//g, "/").replace(/^\.\//, "");
+    const simplified = path.replace(/\/\.\//g, '/').replace(/^\.\//, '');
     if (simplified !== path) {
         path = simplified;
         if (!relativePathSegmentRegExp.test(path)) {
@@ -408,11 +410,11 @@ function ensureTrailingDirectorySeparator(path) {
 // check path for these segments: '', '.'. '..'
 const relativePathSegmentRegExp = /(?:\/\/)|(?:^|\/)\.\.?(?:$|\/)/;
 function containsPath(parent, child, currentDirectory, ignoreCase) {
-    if (typeof currentDirectory === "string") {
+    if (typeof currentDirectory === 'string') {
         parent = combinePaths(currentDirectory, parent);
         child = combinePaths(currentDirectory, child);
     }
-    else if (typeof currentDirectory === "boolean") {
+    else if (typeof currentDirectory === 'boolean') {
         ignoreCase = currentDirectory;
     }
     if (parent === undefined || child === undefined) {

package/lib/typescript/utilities.js

@@ -10,8 +10,8 @@ const path_1 = require("./path");
 // proof.
 const reservedCharacterPattern = /[^\w\s\/]/g;
 const wildcardCharCodes = [42 /* CharacterCodes.asterisk */, 63 /* CharacterCodes.question */];
-const commonPackageFolders = ["node_modules", "bower_components", "jspm_packages"];
-const implicitExcludePathRegexPattern = `(?!(${commonPackageFolders.join("|")})(/|$))`;
+const commonPackageFolders = ['node_modules', 'bower_components', 'jspm_packages'];
+const implicitExcludePathRegexPattern = `(?!(${commonPackageFolders.join('|')})(/|$))`;
 const filesMatcher = {
     /**
      * Matches any single directory segment unless it is the last segment and a .min.js file
@@ -19,41 +19,41 @@ const filesMatcher = {
      *  [^./]                   # matches everything up to the first . character (excluding directory separators)
      *  (\\.(?!min\\.js$))?     # matches . characters but not if they are part of the .min.js file extension
      */
-    singleAsteriskRegexFragment: "([^./]|(\\.(?!min\\.js$))?)*",
+    singleAsteriskRegexFragment: '([^./]|(\\.(?!min\\.js$))?)*',
     /**
      * Regex for the ** wildcard. Matches any number of subdirectories. When used for including
      * files or directories, does not match subdirectories that start with a . character
      */
     doubleAsteriskRegexFragment: `(/${implicitExcludePathRegexPattern}[^/.][^/]*)*?`,
-    replaceWildcardCharacter: match => replaceWildcardCharacter(match, filesMatcher.singleAsteriskRegexFragment)
+    replaceWildcardCharacter: match => replaceWildcardCharacter(match, filesMatcher.singleAsteriskRegexFragment),
 };
 const directoriesMatcher = {
-    singleAsteriskRegexFragment: "[^/]*",
+    singleAsteriskRegexFragment: '[^/]*',
     /**
      * Regex for the ** wildcard. Matches any number of subdirectories. When used for including
      * files or directories, does not match subdirectories that start with a . character
      */
     doubleAsteriskRegexFragment: `(/${implicitExcludePathRegexPattern}[^/.][^/]*)*?`,
-    replaceWildcardCharacter: match => replaceWildcardCharacter(match, directoriesMatcher.singleAsteriskRegexFragment)
+    replaceWildcardCharacter: match => replaceWildcardCharacter(match, directoriesMatcher.singleAsteriskRegexFragment),
 };
 const excludeMatcher = {
-    singleAsteriskRegexFragment: "[^/]*",
-    doubleAsteriskRegexFragment: "(/.+?)?",
-    replaceWildcardCharacter: match => replaceWildcardCharacter(match, excludeMatcher.singleAsteriskRegexFragment)
+    singleAsteriskRegexFragment: '[^/]*',
+    doubleAsteriskRegexFragment: '(/.+?)?',
+    replaceWildcardCharacter: match => replaceWildcardCharacter(match, excludeMatcher.singleAsteriskRegexFragment),
 };
 const wildcardMatchers = {
     files: filesMatcher,
     directories: directoriesMatcher,
-    exclude: excludeMatcher
+    exclude: excludeMatcher,
 };
 function getRegularExpressionForWildcard(specs, basePath, usage) {
     const patterns = getRegularExpressionsForWildcards(specs, basePath, usage);
     if (!patterns || !patterns.length) {
         return undefined;
     }
-    const pattern = patterns.map(pattern => `(${pattern})`).join("|");
+    const pattern = patterns.map(pattern => `(${pattern})`).join('|');
     // If excluding, match "foo/bar/baz...", but if including, only allow "foo".
-    const terminator = usage === "exclude" ? "($|/)" : "$";
+    const terminator = usage === 'exclude' ? '($|/)' : '$';
     return `^(${pattern})${terminator}`;
 }
 function getRegularExpressionsForWildcards(specs, basePath, usage) {
@@ -70,43 +70,43 @@ function isImplicitGlob(lastPathComponent) {
     return !/[.*?]/.test(lastPathComponent);
 }
 function getSubPatternFromSpec(spec, basePath, usage, { singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter }) {
-    let subpattern = "";
+    let subpattern = '';
     let hasWrittenComponent = false;
     const components = (0, path_1.getNormalizedPathComponents)(spec, basePath);
     const lastComponent = (0, core_1.last)(components);
-    if (usage !== "exclude" && lastComponent === "**") {
+    if (usage !== 'exclude' && lastComponent === '**') {
         return undefined;
     }
     // getNormalizedPathComponents includes the separator for the root component.
     // We need to remove to create our regex correctly.
     components[0] = (0, path_1.removeTrailingDirectorySeparator)(components[0]);
     if (isImplicitGlob(lastComponent)) {
-        components.push("**", "*");
+        components.push('**', '*');
     }
     let optionalCount = 0;
     for (let component of components) {
-        if (component === "**") {
+        if (component === '**') {
             subpattern += doubleAsteriskRegexFragment;
         }
         else {
-            if (usage === "directories") {
-                subpattern += "(";
+            if (usage === 'directories') {
+                subpattern += '(';
                 optionalCount++;
             }
             if (hasWrittenComponent) {
                 subpattern += path_1.directorySeparator;
             }
-            if (usage !== "exclude") {
-                let componentPattern = "";
+            if (usage !== 'exclude') {
+                let componentPattern = '';
                 // The * and ? wildcards should not match directories or files that start with . if they
                 // appear first in a component. Dotted directories and files can be included explicitly
                 // like so: **/.*/.*
                 if (component.charCodeAt(0) === 42 /* CharacterCodes.asterisk */) {
-                    componentPattern += "([^./]" + singleAsteriskRegexFragment + ")?";
+                    componentPattern += '([^./]' + singleAsteriskRegexFragment + ')?';
                     component = component.substr(1);
                 }
                 else if (component.charCodeAt(0) === 63 /* CharacterCodes.question */) {
-                    componentPattern += "[^./]";
+                    componentPattern += '[^./]';
                     component = component.substr(1);
                 }
                 componentPattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
@@ -128,13 +128,13 @@ function getSubPatternFromSpec(spec, basePath, usage, { singleAsteriskRegexFragm
         hasWrittenComponent = true;
     }
     while (optionalCount > 0) {
-        subpattern += ")?";
+        subpattern += ')?';
         optionalCount--;
     }
     return subpattern;
 }
 function replaceWildcardCharacter(match, singleAsteriskRegexFragment) {
-    return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;
+    return match === '*' ? singleAsteriskRegexFragment : match === '?' ? '[^/]' : '\\' + match;
 }
 /** @param path directory of the tsconfig.json */
 function getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory) {
@@ -142,24 +142,27 @@ function getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNa
     currentDirectory = (0, path_1.normalizePath)(currentDirectory);
     const absolutePath = (0, path_1.combinePaths)(currentDirectory, path);
     return {
-        includeFilePatterns: (0, core_1.map)(getRegularExpressionsForWildcards(includes, absolutePath, "files"), pattern => `^${pattern}$`),
-        includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
-        includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
-        excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-        basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
+        includeFilePatterns: (0, core_1.map)(getRegularExpressionsForWildcards(includes, absolutePath, 'files'), pattern => `^${pattern}$`),
+        includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, 'files'),
+        includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, 'directories'),
+        excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, 'exclude'),
+        basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames),
     };
 }
 function getRegexFromPattern(pattern, useCaseSensitiveFileNames) {
-    return new RegExp(pattern, useCaseSensitiveFileNames ? "" : "i");
+    return new RegExp(pattern, useCaseSensitiveFileNames ? '' : 'i');
 }
 /** @param path directory of the tsconfig.json */
 function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
     path = (0, path_1.normalizePath)(path);
     currentDirectory = (0, path_1.normalizePath)(currentDirectory);
     const patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
-    const includeFileRegexes = patterns.includeFilePatterns && patterns.includeFilePatterns.map(pattern => getRegexFromPattern(pattern, useCaseSensitiveFileNames));
-    const includeDirectoryRegex = patterns.includeDirectoryPattern && getRegexFromPattern(patterns.includeDirectoryPattern, useCaseSensitiveFileNames);
-    const excludeRegex = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, useCaseSensitiveFileNames);
+    const includeFileRegexes = patterns.includeFilePatterns
+        && patterns.includeFilePatterns.map(pattern => getRegexFromPattern(pattern, useCaseSensitiveFileNames));
+    const includeDirectoryRegex = patterns.includeDirectoryPattern
+        && getRegexFromPattern(patterns.includeDirectoryPattern, useCaseSensitiveFileNames);
+    const excludeRegex = patterns.excludePattern
+        && getRegexFromPattern(patterns.excludePattern, useCaseSensitiveFileNames);
     // Associate an array of results with each include regex. This keeps results in order of the "include" order.
     // If there are no "includes", then just put everything in results[0].
     const results = includeFileRegexes ? includeFileRegexes.map(() => []) : [[]];
@@ -204,8 +207,8 @@ function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNa
         for (const current of (0, core_1.sort)(directories, core_1.compareStringsCaseSensitive)) {
             const name = (0, path_1.combinePaths)(path, current);
             const absoluteName = (0, path_1.combinePaths)(absolutePath, current);
-            if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
-                (!excludeRegex || !excludeRegex.test(absoluteName))) {
+            if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName))
+                && (!excludeRegex || !excludeRegex.test(absoluteName))) {
                 visitDirectory(name, absoluteName, depth);
             }
         }

package/package.json

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