feat(vscode): migrate to LanguageStatusItem

volarjs · Mar 19, 2024 · 95630c4 · 95630c4
1 parent 1a2e5fc
commit 95630c4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 33 deletions.
diff --git a/packages/vscode/lib/features/tsVersion.ts b/packages/vscode/lib/features/tsVersion.ts
@@ -15,8 +15,11 @@ export function activate(
 ) {
 
 	const subscriptions: vscode.Disposable[] = [];
-	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));
@@ -74,18 +77,9 @@ export function activate(
 	}
 
 	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() {

diff --git a/packages/vscode/lib/features/tsconfig.ts b/packages/vscode/lib/features/tsconfig.ts
@@ -10,7 +10,7 @@ export function activate(
 ) {
 
 	const subscriptions: vscode.Disposable[] = [];
-	const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
+	const statusBar = vscode.languages.createLanguageStatusItem(cmd, selector);
 	let currentTsconfigUri: vscode.Uri | undefined;
 
 	updateStatusBar();
@@ -31,26 +31,26 @@ export function activate(
 			!vscode.window.activeTextEditor
 			|| !vscode.languages.match(selector, vscode.window.activeTextEditor.document)
 		) {
-			statusBar.hide();
+			return;
 		}
-		else {
-			const tsconfig = await client.sendRequest(
-				GetMatchTsConfigRequest.type,
-				client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document),
+		const tsconfig = await client.sendRequest(
+			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, '/'),
 			);
-			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.command = {
+				title: 'Open config file',
+				command: cmd,
+			};
+		}
+		else {
+			statusBar.text = 'No tsconfig';
+			statusBar.command = undefined;
 		}
 	}
 }