@volar/vscode 2.1.1 → 2.1.3

package/lib/features/tsVersion.js

@@ -7,8 +7,11 @@ const common_1 = require("../common");
 const defaultTsdkPath = 'node_modules/typescript/lib';
 function activate(selector, cmd, context, client, resolveStatusText) {
     const subscriptions = [];
-    const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
-    statusBar.command = cmd;
+    const statusBar = vscode.languages.createLanguageStatusItem(cmd, selector);
+    statusBar.command = {
+        title: 'Select Version',
+        command: cmd,
+    };
     subscriptions.push({ dispose: () => statusBar.dispose() });
     subscriptions.push(vscode.commands.registerCommand(cmd, onCommand));
     vscode.workspace.onDidChangeConfiguration(onDidChangeConfiguration, undefined, subscriptions);
@@ -57,16 +60,9 @@ function activate(selector, cmd, context, client, resolveStatusText) {
         }
     }
     async function updateStatusBar() {
-        if (!vscode.window.activeTextEditor
-            || !vscode.languages.match(selector, vscode.window.activeTextEditor.document)) {
-            statusBar.hide();
-        }
-        else {
-            const tsVersion = (await getTsdk(context)).version;
-            statusBar.text = tsVersion ?? 'x.x.x';
-            statusBar.text = resolveStatusText(statusBar.text);
-            statusBar.show();
-        }
+        const tsVersion = (await getTsdk(context)).version;
+        statusBar.text = tsVersion ?? 'x.x.x';
+        statusBar.text = resolveStatusText(statusBar.text);
     }
     async function reloadServers() {
         const tsPaths = await getTsdk(context);

package/lib/features/tsconfig.js

@@ -6,7 +6,7 @@ const protocol_1 = require("@volar/language-server/protocol");
 const path = require("path-browserify");
 function activate(selector, cmd, client) {
     const subscriptions = [];
-    const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
+    const statusBar = vscode.languages.createLanguageStatusItem(cmd, selector);
     let currentTsconfigUri;
     updateStatusBar();
     vscode.window.onDidChangeActiveTextEditor(updateStatusBar, undefined, subscriptions);
@@ -20,20 +20,20 @@ function activate(selector, cmd, client) {
     async function updateStatusBar() {
         if (!vscode.window.activeTextEditor
             || !vscode.languages.match(selector, vscode.window.activeTextEditor.document)) {
-            statusBar.hide();
+            return;
+        }
+        const tsconfig = await client.sendRequest(protocol_1.GetMatchTsConfigRequest.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
+        if (tsconfig?.uri) {
+            currentTsconfigUri = vscode.Uri.parse(tsconfig.uri);
+            statusBar.text = path.relative((vscode.workspace.rootPath?.replace(/\\/g, '/') || '/'), currentTsconfigUri.fsPath.replace(/\\/g, '/'));
+            statusBar.command = {
+                title: 'Open config file',
+                command: cmd,
+            };
         }
         else {
-            const tsconfig = await client.sendRequest(protocol_1.GetMatchTsConfigRequest.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
-            if (tsconfig?.uri) {
-                currentTsconfigUri = vscode.Uri.parse(tsconfig.uri);
-                statusBar.text = path.relative((vscode.workspace.rootPath?.replace(/\\/g, '/') || '/'), currentTsconfigUri.fsPath.replace(/\\/g, '/'));
-                statusBar.command = cmd;
-            }
-            else {
-                statusBar.text = 'No tsconfig';
-                statusBar.command = undefined;
-            }
-            statusBar.show();
+            statusBar.text = 'No tsconfig';
+            statusBar.command = undefined;
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "2.1.1",
+	"version": "2.1.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.1.1",
+		"@volar/language-server": "2.1.3",
 		"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": "e56916097fe7be2920aab6592a564a8e2ceafd14"
+	"gitHead": "0f861d59faa19cbeadef182ee079be88f9629fc7"
 }