@volar/vscode 2.3.0-alpha.4 → 2.3.0-alpha.6

package/lib/features/tsVersion.d.ts

@@ -2,6 +2,6 @@ import * as vscode from 'vscode';
 export declare function activate(selector: vscode.DocumentSelector, cmd: string, context: vscode.ExtensionContext, resolveStatusText: (text: string) => string, onRestart?: () => void): vscode.Disposable;
 export declare function getTsdk(context: vscode.ExtensionContext): Promise<{
     tsdk: string;
-    version: string | undefined;
+    version: string;
     isWorkspacePath: boolean;
-}>;
+} | undefined>;

package/lib/features/tsVersion.js

@@ -6,6 +6,7 @@ const vscode = require("vscode");
 const common_1 = require("../common");
 const fs = require("../fs");
 const defaultTsdkPath = 'node_modules/typescript/lib';
+const tsdkSetting = 'typescript.tsdk';
 function activate(selector, cmd, context, resolveStatusText, onRestart) {
     const subscriptions = [];
     const statusBar = vscode.languages.createLanguageStatusItem(cmd, selector);
@@ -22,21 +23,31 @@ function activate(selector, cmd, context, resolveStatusText, onRestart) {
     async function onCommand() {
         const tsdk = await getTsdk(context);
         const configTsdkPath = getConfigTsdkPath();
-        const vscodeTsdk = await getVScodeTsdk();
+        const vscodeTsdk = await getVSCodeTsdk();
+        const useVSCodeTsdk = !!vscodeTsdk;
+        const useConfigWorkspaceTsdk = !!configTsdkPath && !vscodeTsdk?.isWeb;
+        const useDefaultWorkspaceTsdk = configTsdkPath !== defaultTsdkPath && !vscodeTsdk?.isWeb;
+        if (!useVSCodeTsdk && !useConfigWorkspaceTsdk && !useDefaultWorkspaceTsdk) { // found no usable TypeScript version
+            const messageResult = await vscode.window.showErrorMessage(`Could not find any TypeScript version. Please point your \`${tsdkSetting}\` setting to a valid TypeScript distribution.`, 'Open Settings');
+            if (messageResult === 'Open Settings') {
+                vscode.commands.executeCommand('workbench.action.openSettings', tsdkSetting);
+            }
+            return;
+        }
         const select = await (0, common_1.quickPick)([
             {
-                useVSCodeTsdk: {
-                    label: (!tsdk.isWorkspacePath ? '• ' : '') + "Use VS Code's Version",
+                useVSCodeTsdk: useVSCodeTsdk ? {
+                    label: (!tsdk?.isWorkspacePath ? '• ' : '') + "Use VS Code's Version",
                     description: vscodeTsdk.version,
                     detail: vscodeTsdk.isWeb ? vscodeTsdk.path : undefined,
-                },
-                useConfigWorkspaceTsdk: configTsdkPath && !vscodeTsdk.isWeb ? {
-                    label: (tsdk.isWorkspacePath ? '• ' : '') + 'Use Workspace Version',
+                } : undefined,
+                useConfigWorkspaceTsdk: useConfigWorkspaceTsdk ? {
+                    label: (tsdk?.isWorkspacePath ? '• ' : '') + 'Use Workspace Version',
                     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',
+                useDefaultWorkspaceTsdk: useDefaultWorkspaceTsdk ? {
+                    label: (tsdk?.isWorkspacePath ? '• ' : '') + 'Use Workspace Version',
                     description: await getTsVersion(await resolveWorkspaceTsdk(defaultTsdkPath) ?? '/') ?? 'Could not load the TypeScript version at this path',
                     detail: defaultTsdkPath,
                 } : undefined,
@@ -56,12 +67,12 @@ function activate(selector, cmd, context, resolveStatusText, onRestart) {
         updateStatusBar();
     }
     function onDidChangeConfiguration(e) {
-        if (e.affectsConfiguration('typescript.tsdk') && isUseWorkspaceTsdk(context)) {
+        if (e.affectsConfiguration(tsdkSetting) && isUseWorkspaceTsdk(context)) {
             onRestart?.();
         }
     }
     async function updateStatusBar() {
-        const tsVersion = (await getTsdk(context)).version;
+        const tsVersion = (await getTsdk(context))?.version;
         statusBar.text = tsVersion ?? 'x.x.x';
         statusBar.text = resolveStatusText(statusBar.text);
     }
@@ -73,20 +84,23 @@ async function getTsdk(context) {
         if (tsdkPath) {
             const resolvedTsdk = await resolveWorkspaceTsdk(tsdkPath);
             if (resolvedTsdk) {
-                return {
-                    tsdk: resolvedTsdk,
-                    version: await getTsVersion(resolvedTsdk),
-                    isWorkspacePath: true,
-                };
+                const version = await getTsVersion(resolvedTsdk);
+                if (version !== undefined) {
+                    return {
+                        tsdk: resolvedTsdk,
+                        version,
+                        isWorkspacePath: true,
+                    };
+                }
             }
         }
     }
-    const tsdk = await getVScodeTsdk();
-    return {
+    const tsdk = await getVSCodeTsdk();
+    return tsdk ? {
         tsdk: tsdk.path,
         version: tsdk.version,
         isWorkspacePath: false,
-    };
+    } : undefined;
 }
 exports.getTsdk = getTsdk;
 async function resolveWorkspaceTsdk(tsdk) {
@@ -108,23 +122,25 @@ async function resolveWorkspaceTsdk(tsdk) {
         }
     }
 }
-async function getVScodeTsdk() {
+async function getVSCodeTsdk() {
     const nightly = vscode.extensions.getExtension('ms-vscode.vscode-typescript-next');
     if (nightly) {
         const libPath = path.join(nightly.extensionPath.replace(/\\/g, '/'), 'node_modules/typescript/lib');
-        return {
+        const version = await getTsVersion(libPath);
+        return version ? {
             path: libPath,
-            version: await getTsVersion(libPath),
+            version: version,
             isWeb: false,
-        };
+        } : undefined;
     }
     if (vscode.env.appRoot) {
         const libPath = path.join(vscode.env.appRoot.replace(/\\/g, '/'), 'extensions/node_modules/typescript/lib');
-        return {
+        const version = await getTsVersion(libPath);
+        return version ? {
             path: libPath,
-            version: await getTsVersion(libPath),
+            version: version,
             isWeb: false,
-        };
+        } : undefined;
     }
     // web
     const version = require('typescript/package.json').version;
@@ -145,20 +161,19 @@ async function getTsVersion(libPath) {
     const p2 = p.slice(0, -1);
     const modulePath = p2.join('/');
     const filePath = modulePath + '/package.json';
-    const contents = await fs.readFile(vscode.Uri.file(filePath));
-    if (contents === undefined) {
-        return;
-    }
-    let desc = null;
     try {
-        desc = JSON.parse(contents);
-    }
-    catch (err) {
-        return;
+        const contents = await fs.readFile(vscode.Uri.file(filePath));
+        if (contents === undefined) {
+            return;
+        }
+        const desc = JSON.parse(contents);
+        if (!desc || typeof desc.version !== 'string') {
+            return;
+        }
+        return desc.version;
     }
-    if (!desc || !desc.version) {
+    catch {
         return;
     }
-    return desc.version;
 }
 //# sourceMappingURL=tsVersion.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "2.3.0-alpha.4",
+	"version": "2.3.0-alpha.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.3.0-alpha.4",
+		"@volar/language-server": "2.3.0-alpha.6",
 		"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": "8ab3ce02b06a410e9321eea3e9f23d36f97fedda"
+	"gitHead": "f3103e86be8d80cb36f66be4c054ef9a255c29b1"
 }