mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve version display

Browse Source
This commit is contained in:
Laurențiu Nicola 2021-03-12 19:49:00 +02:00
parent c0459c5357
commit 88ef0541a5
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/rust-analyzer/build.rs
View File

@ -39,8 +39,7 @@ fn set_rerun() {
} }
fn rev() -> Option<String> { fn rev() -> Option<String> {
let output = Command::new("git").args(&["rev-parse", "HEAD"]).output().ok()?; let output = Command::new("git").args(&["describe", "--tags"]).output().ok()?;
let stdout = String::from_utf8(output.stdout).ok()?; let stdout = String::from_utf8(output.stdout).ok()?;
let short_hash = stdout.get(0..7)?; Some(stdout)
Some(short_hash.to_owned())
} }

5
editors/code/src/commands.ts
View File

@ -253,11 +253,10 @@ export function ssr(ctx: Ctx): Cmd {
export function serverVersion(ctx: Ctx): Cmd { export function serverVersion(ctx: Ctx): Cmd {
return async () => { return async () => {
const { stdout } = spawnSync(ctx.serverPath, ["--version"], { encoding: "utf8" }); const { stdout } = spawnSync(ctx.serverPath, ["--version"], { encoding: "utf8" });
const commitHash = stdout.slice(`rust-analyzer `.length).trim(); const versionString = stdout.slice(`rust-analyzer `.length).trim();
const { releaseTag } = ctx.config.package;
void vscode.window.showInformationMessage( void vscode.window.showInformationMessage(
`rust-analyzer version: ${releaseTag ?? "unreleased"} (${commitHash})` `rust-analyzer version: ${versionString}`
); );
}; };
} }