@volar/vscode 2.1.0 → 2.1.2

package/lib/features/tsVersion.js

@@ -28,12 +28,12 @@ function activate(selector, cmd, context, client, resolveStatusText) {
                 },
                 useConfigWorkspaceTsdk: configTsdkPath && !vscodeTsdk.isWeb ? {
                     label: (tsdk.isWorkspacePath ? '• ' : '') + 'Use Workspace Version',
-                    description: await getTsVersion(resolveWorkspaceTsdk(configTsdkPath) ?? '/') ?? 'Could not load the TypeScript version at this path',
+                    description: await getTsVersion(await resolveWorkspaceTsdk(configTsdkPath) ?? '/') ?? 'Could not load the TypeScript version at this path',
                     detail: configTsdkPath,
                 } : undefined,
                 useDefaultWorkspaceTsdk: configTsdkPath !== defaultTsdkPath && !vscodeTsdk.isWeb ? {
                     label: (tsdk.isWorkspacePath ? '• ' : '') + 'Use Workspace Version',
-                    description: await getTsVersion(resolveWorkspaceTsdk(defaultTsdkPath) ?? '/') ?? 'Could not load the TypeScript version at this path',
+                    description: await getTsVersion(await resolveWorkspaceTsdk(defaultTsdkPath) ?? '/') ?? 'Could not load the TypeScript version at this path',
                     detail: defaultTsdkPath,
                 } : undefined,
             },
@@ -81,7 +81,7 @@ function activate(selector, cmd, context, client, resolveStatusText) {
 exports.activate = activate;
 async function getTsdk(context) {
     if (isUseWorkspaceTsdk(context)) {
-        const resolvedTsdk = resolveWorkspaceTsdk(getConfigTsdkPath() || defaultTsdkPath);
+        const resolvedTsdk = await resolveWorkspaceTsdk(getConfigTsdkPath() || defaultTsdkPath);
         if (resolvedTsdk) {
             return {
                 tsdk: resolvedTsdk,
@@ -98,24 +98,22 @@ async function getTsdk(context) {
     };
 }
 exports.getTsdk = getTsdk;
-function resolveWorkspaceTsdk(tsdk) {
+async function resolveWorkspaceTsdk(tsdk) {
     if (path.isAbsolute(tsdk)) {
-        try {
-            if (require.resolve('./typescript.js', { paths: [tsdk] })) {
-                return 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) {
+            return tsdk;
         }
-        catch { }
     }
-    if (vscode.workspace.workspaceFolders) {
+    else if (vscode.workspace.workspaceFolders) {
         for (const folder of vscode.workspace.workspaceFolders) {
             const tsdkPath = path.join(folder.uri.fsPath.replace(/\\/g, '/'), tsdk);
-            try {
-                if (require.resolve('./typescript.js', { paths: [tsdkPath] })) {
-                    return tsdkPath;
-                }
+            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) {
+                return tsdkPath;
             }
-            catch { }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "2.1.0",
+	"version": "2.1.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.1.0",
+		"@volar/language-server": "2.1.2",
 		"path-browserify": "^1.0.1",
 		"vscode-languageclient": "^9.0.1",
 		"vscode-nls": "^5.2.0"
@@ -22,5 +22,5 @@
 		"@types/path-browserify": "latest",
 		"@types/vscode": "^1.82.0"
 	},
-	"gitHead": "09e1792f0adafb02caf89a5a45a6fcaaf3177808"
+	"gitHead": "12b960d5d524fd5f5521374c579cb139dfc4c365"
 }