@volar/typescript 1.8.1 → 1.8.2

package/out/languageServiceHost.js

@@ -134,15 +134,13 @@ function createLanguageServiceHost(ctx, ts, sys) {
                 directories: getVirtualFileDirectories(dirPath),
             };
         }, sys?.realpath ? (path => sys.realpath(path)) : (path => path));
-        if (ctx) {
-            matches = matches.map(match => {
-                const [_, source] = ctx.virtualFiles.getVirtualFile(match);
-                if (source) {
-                    return source.fileName;
-                }
-                return match;
-            });
-        }
+        matches = matches.map(match => {
+            const [_, source] = ctx.virtualFiles.getVirtualFile(match);
+            if (source) {
+                return source.fileName;
+            }
+            return match;
+        });
         return [...new Set([
                 ...matches,
                 ...sys.readDirectory(dirName, extensions, excludes, includes, depth),

package/out/serverPlugin.d.ts

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

package/out/serverPlugin.js

@@ -1,15 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateLanguageServiceHost = void 0;
+exports.getExternalFiles = exports.decorateLanguageServiceHost = void 0;
 const language_core_1 = require("@volar/language-core");
 function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts) {
     let extraProjectVersion = 0;
     const scripts = new Map();
+    const readDirectory = languageServiceHost.readDirectory?.bind(languageServiceHost);
     const resolveModuleNameLiterals = languageServiceHost.resolveModuleNameLiterals?.bind(languageServiceHost);
     const resolveModuleNames = languageServiceHost.resolveModuleNames?.bind(languageServiceHost);
     const getProjectVersion = languageServiceHost.getProjectVersion?.bind(languageServiceHost);
-    const getScriptFileNames = languageServiceHost.getScriptFileNames.bind(languageServiceHost);
     const getScriptSnapshot = languageServiceHost.getScriptSnapshot.bind(languageServiceHost);
+    const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost);
+    // path completion
+    if (readDirectory) {
+        languageServiceHost.readDirectory = (path, extensions, exclude, include, depth) => {
+            if (extensions) {
+                for (const ext of exts) {
+                    if (!extensions.includes(ext)) {
+                        extensions = [...extensions, ...ext];
+                    }
+                }
+            }
+            return readDirectory(path, extensions, exclude, include, depth);
+        };
+    }
     if (resolveModuleNameLiterals) {
         languageServiceHost.resolveModuleNameLiterals = (moduleNames, containingFile, redirectedReference, options, ...rest) => {
             const resolvedModules = resolveModuleNameLiterals(moduleNames, containingFile, redirectedReference, options, ...rest);
@@ -37,23 +51,37 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
             return getProjectVersion() + ':' + extraProjectVersion;
         };
     }
-    languageServiceHost.getScriptFileNames = () => {
-        if (languageServiceHost.getCompilationSettings().composite) {
-            return [
-                ...getScriptFileNames(),
-                ...virtualFiles.allSources().map(source => source.fileName),
-            ];
-        }
-        else {
-            return getScriptFileNames();
-        }
-    };
     languageServiceHost.getScriptSnapshot = (fileName) => {
-        if (scripts.has(fileName)) {
+        if (exts.some(ext => fileName.endsWith(ext))) {
             updateScript(fileName);
+            return scripts.get(fileName)?.snapshot;
         }
-        return scripts.get(fileName)?.snapshot ?? getScriptSnapshot(fileName);
+        return getScriptSnapshot(fileName);
     };
+    if (getScriptKind) {
+        languageServiceHost.getScriptKind = (fileName) => {
+            if (exts.some(ext => fileName.endsWith(ext))) {
+                updateScript(fileName);
+                const script = scripts.get(fileName);
+                if (script) {
+                    if (script.extension.endsWith('.js')) {
+                        return ts.ScriptKind.JS;
+                    }
+                    if (script.extension.endsWith('.jsx')) {
+                        return ts.ScriptKind.JSX;
+                    }
+                    if (script.extension.endsWith('.ts')) {
+                        return ts.ScriptKind.TS;
+                    }
+                    if (script.extension.endsWith('.tsx')) {
+                        return ts.ScriptKind.TSX;
+                    }
+                }
+                return ts.ScriptKind.Deferred;
+            }
+            return getScriptKind(fileName);
+        };
+    }
     function resolveModuleName(name, containingFile, options, redirectedReference) {
         const resolved = ts.resolveModuleName(name, containingFile, options, {
             readFile(fileName) {
@@ -118,4 +146,23 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
     }
 }
 exports.decorateLanguageServiceHost = decorateLanguageServiceHost;
+function getExternalFiles(ts, project, exts) {
+    if (project.projectKind !== ts.server.ProjectKind.Configured) {
+        return [];
+    }
+    const configFile = project.getProjectName();
+    const config = ts.readJsonConfigFile(configFile, project.readFile.bind(project));
+    const parseHost = {
+        useCaseSensitiveFileNames: project.useCaseSensitiveFileNames(),
+        fileExists: project.fileExists.bind(project),
+        readFile: project.readFile.bind(project),
+        readDirectory: (...args) => {
+            args[1] = exts;
+            return project.readDirectory(...args);
+        },
+    };
+    const parsed = ts.parseJsonSourceFileConfigFileContent(config, parseHost, project.getCurrentDirectory());
+    return parsed.fileNames;
+}
+exports.getExternalFiles = getExternalFiles;
 //# sourceMappingURL=serverPlugin.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.8.1",
+	"version": "1.8.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.8.1"
+		"@volar/language-core": "1.8.2"
 	},
 	"devDependencies": {
-		"@volar/language-service": "1.8.1"
+		"@volar/language-service": "1.8.2"
 	},
-	"gitHead": "1fec004d7e3c5a28c0ad1d6a1d7a41ab98381abd"
+	"gitHead": "b552c1f827294da5d36cbe4e7c1f7f2729b2b82e"
 }