@volar/typescript 2.3.4 → 2.3.5-alpha.0

package/lib/protocol/createSys.d.ts

@@ -1,7 +1,7 @@
 import type { LanguageServiceEnvironment, Disposable } from '@volar/language-service';
 import type * as ts from 'typescript';
 import { URI } from 'vscode-uri';
-export declare function createSys(sys: ts.System | undefined, env: LanguageServiceEnvironment, workspaceFolder: URI | undefined, uriConverter: {
+export declare function createSys(sys: ts.System | undefined, env: LanguageServiceEnvironment, getCurrentDirectory: () => string, uriConverter: {
     asUri(fileName: string): URI;
     asFileName(uri: URI): string;
 }): ts.System & {

package/lib/protocol/createSys.js

@@ -5,9 +5,8 @@ const path = require("path-browserify");
 const utilities_1 = require("../typescript/utilities");
 const vscode_uri_1 = require("vscode-uri");
 let currentCwd = '';
-function createSys(sys, env, workspaceFolder, uriConverter) {
+function createSys(sys, env, getCurrentDirectory, uriConverter) {
     let version = 0;
-    const currentDirectory = workspaceFolder ? uriConverter.asFileName(workspaceFolder) : '';
     const caseSensitive = sys?.useCaseSensitiveFileNames ?? false;
     const root = {
         name: '',
@@ -57,8 +56,8 @@ function createSys(sys, env, workspaceFolder, uriConverter) {
         writeFile: sys?.writeFile ?? (() => { }),
         createDirectory: sys?.createDirectory ?? (() => { }),
         exit: sys?.exit ?? (() => { }),
-        getExecutingFilePath: sys?.getExecutingFilePath ?? (() => currentDirectory + '/__fake__.js'),
-        getCurrentDirectory: () => currentDirectory,
+        getExecutingFilePath: sys?.getExecutingFilePath ?? (() => getCurrentDirectory + '/__fake__.js'),
+        getCurrentDirectory,
         getModifiedTime,
         readFile,
         readDirectory,
@@ -78,6 +77,7 @@ function createSys(sys, env, workspaceFolder, uriConverter) {
     };
     function resolvePath(fsPath) {
         if (sys) {
+            const currentDirectory = getCurrentDirectory();
             if (currentCwd !== currentDirectory) {
                 currentCwd = currentDirectory;
                 // https://github.com/vuejs/language-tools/issues/2039
@@ -191,6 +191,7 @@ function createSys(sys, env, workspaceFolder, uriConverter) {
     }
     function readDirectory(dirName, extensions, excludes, includes, depth) {
         dirName = resolvePath(dirName);
+        const currentDirectory = getCurrentDirectory();
         const matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, caseSensitive, currentDirectory, depth, dirPath => {
             dirPath = resolvePath(dirPath);
             readDirectoryWorker(dirPath);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.3.4",
+	"version": "2.3.5-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -20,6 +20,5 @@
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
 		"@volar/language-service": "2.3.4"
-	},
-	"gitHead": "ba5b381923bbc8a565e84de72fa98474501fe817"
+	}
 }