Merge #3693

3693: vscode: show release tag with along with the commit hash for RA version command r=matklad a=Veetaha



Co-authored-by: veetaha <[email protected]>
Co-authored-by: Veetaha <[email protected]>

1 files changed, 7 insertions, 2 deletions

diff --git a/editors/code/src/commands/server_version.ts b/editors/code/src/commands/server_version.ts
index 03528b825..d64ac726e 100644
--- a/editors/code/src/commands/server_version.ts
+++ b/editors/code/src/commands/server_version.ts
@@ -4,7 +4,12 @@ import { Ctx, Cmd } from '../ctx';
 
 export function serverVersion(ctx: Ctx): Cmd {
     return async () => {
-        const version = spawnSync(ctx.serverPath, ["--version"], { encoding: "utf8" }).stdout;
-        vscode.window.showInformationMessage('rust-analyzer version : ' + version);
+        const { stdout } = spawnSync(ctx.serverPath, ["--version"], { encoding: "utf8" });
+        const commitHash = stdout.slice(`rust-analyzer `.length).trim();
+        const { releaseTag } = ctx.config.package;
+
+        void vscode.window.showInformationMessage(
+            `rust-analyzer version: ${releaseTag ?? "unreleased"} (${commitHash})`
+        );
     };
 }