@volar/vscode 2.2.0-alpha.9 → 2.2.0-patch.1

package/lib/features/serverSys.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = void 0;
 const vscode = require("vscode");
 const protocol_1 = require("@volar/language-server/protocol");
+const fs = require("../fs");
 function activate(client) {
     const subscriptions = [];
-    const textDecoder = new TextDecoder();
     const jobs = new Map();
     const progressAssets = new Set();
     let startProgress = false;
@@ -70,7 +70,7 @@ function activate(client) {
                 return;
             }
             const uri2 = client.protocol2CodeConverter.asUri(uri);
-            return await _stat(uri2);
+            return await fs.stat(uri2);
         }
         async function readFile(uri) {
             // return early
@@ -81,33 +81,13 @@ function activate(client) {
             if (!entries.some(entry => entry[0] === baseName && entry[1] === vscode.FileType.File)) {
                 return;
             }
-            return await _readFile(uri2);
+            return await fs.readFile(uri2);
         }
         async function readDirectory(uri) {
             const uri2 = client.protocol2CodeConverter.asUri(uri);
-            return await (await _readDirectory(uri2))
+            return await (await fs.readDirectory(uri2))
                 .filter(([name]) => !name.startsWith('.'));
         }
-        async function _readFile(uri) {
-            try {
-                return textDecoder.decode(await vscode.workspace.fs.readFile(uri));
-            }
-            catch { }
-        }
-        async function _readDirectory(uri) {
-            try {
-                return await vscode.workspace.fs.readDirectory(uri);
-            }
-            catch {
-                return [];
-            }
-        }
-        async function _stat(uri) {
-            try {
-                return await vscode.workspace.fs.stat(uri);
-            }
-            catch { }
-        }
     }
 }
 exports.activate = activate;

package/lib/features/tsVersion.js

@@ -4,6 +4,7 @@ exports.getTsdk = exports.activate = void 0;
 const path = require("path-browserify");
 const vscode = require("vscode");
 const common_1 = require("../common");
+const fs = require("../fs");
 const defaultTsdkPath = 'node_modules/typescript/lib';
 function activate(selector, cmd, context, client, resolveStatusText) {
     const subscriptions = [];
@@ -77,13 +78,16 @@ function activate(selector, cmd, context, client, resolveStatusText) {
 exports.activate = activate;
 async function getTsdk(context) {
     if (isUseWorkspaceTsdk(context)) {
-        const resolvedTsdk = await resolveWorkspaceTsdk(getConfigTsdkPath() || defaultTsdkPath);
-        if (resolvedTsdk) {
-            return {
-                tsdk: resolvedTsdk,
-                version: await getTsVersion(resolvedTsdk),
-                isWorkspacePath: true,
-            };
+        const tsdkPath = getConfigTsdkPath();
+        if (tsdkPath) {
+            const resolvedTsdk = await resolveWorkspaceTsdk(tsdkPath);
+            if (resolvedTsdk) {
+                return {
+                    tsdk: resolvedTsdk,
+                    version: await getTsVersion(resolvedTsdk),
+                    isWorkspacePath: true,
+                };
+            }
         }
     }
     const tsdk = await getVScodeTsdk();
@@ -97,8 +101,8 @@ exports.getTsdk = getTsdk;
 async function resolveWorkspaceTsdk(tsdk) {
     if (path.isAbsolute(tsdk)) {
         const libUri = vscode.Uri.joinPath(vscode.Uri.file(tsdk), 'typescript.js');
-        const stat = await vscode.workspace.fs.stat(libUri);
-        if (stat.type === vscode.FileType.File) {
+        const stat = await fs.stat(libUri);
+        if (stat?.type === vscode.FileType.File) {
             return tsdk;
         }
     }
@@ -106,8 +110,8 @@ async function resolveWorkspaceTsdk(tsdk) {
         for (const folder of vscode.workspace.workspaceFolders) {
             const tsdkPath = path.join(folder.uri.fsPath.replace(/\\/g, '/'), tsdk);
             const libUri = vscode.Uri.joinPath(vscode.Uri.file(tsdkPath), 'typescript.js');
-            const stat = await vscode.workspace.fs.stat(libUri);
-            if (stat.type === vscode.FileType.File) {
+            const stat = await fs.stat(libUri);
+            if (stat?.type === vscode.FileType.File) {
                 return tsdkPath;
             }
         }
@@ -150,7 +154,7 @@ async function getTsVersion(libPath) {
     const p2 = p.slice(0, -1);
     const modulePath = p2.join('/');
     const filePath = modulePath + '/package.json';
-    const contents = await readFile(filePath);
+    const contents = await fs.readFile(vscode.Uri.file(filePath));
     if (contents === undefined) {
         return;
     }
@@ -166,11 +170,4 @@ async function getTsVersion(libPath) {
     }
     return desc.version;
 }
-async function readFile(path) {
-    try {
-        const data = await vscode.workspace.fs.readFile(vscode.Uri.file(path));
-        return new TextDecoder('utf8').decode(data);
-    }
-    catch { }
-}
 //# sourceMappingURL=tsVersion.js.map

package/lib/fs.d.ts

@@ -0,0 +1,4 @@
+import * as vscode from 'vscode';
+export declare function readFile(uri: vscode.Uri): Promise<string | undefined>;
+export declare function readDirectory(uri: vscode.Uri): Promise<[string, vscode.FileType][]>;
+export declare function stat(uri: vscode.Uri): Promise<vscode.FileStat | undefined>;

package/lib/fs.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stat = exports.readDirectory = exports.readFile = void 0;
+const vscode = require("vscode");
+const textDecoder = new TextDecoder('utf8');
+async function readFile(uri) {
+    try {
+        return textDecoder.decode(await vscode.workspace.fs.readFile(uri));
+    }
+    catch { }
+}
+exports.readFile = readFile;
+async function readDirectory(uri) {
+    try {
+        return await vscode.workspace.fs.readDirectory(uri);
+    }
+    catch {
+        return [];
+    }
+}
+exports.readDirectory = readDirectory;
+async function stat(uri) {
+    try {
+        return await vscode.workspace.fs.stat(uri);
+    }
+    catch { }
+}
+exports.stat = stat;
+//# sourceMappingURL=fs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "2.2.0-alpha.9",
+	"version": "2.2.0-patch.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.2.0-alpha.9",
+		"@volar/language-server": "2.2.0-patch.1",
 		"path-browserify": "^1.0.1",
 		"vscode-languageclient": "^9.0.1",
 		"vscode-nls": "^5.2.0"
@@ -21,6 +21,5 @@
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
 		"@types/vscode": "^1.82.0"
-	},
-	"gitHead": "7373fb794012e219aae3948c730c004827b03021"
+	}
 }