language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-20 17:20:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Further simplifications

Browse source
This commit is contained in:
huntc 2024-07-30 16:38:47 +10:00
parent b05def0f4c
commit 26691a1165
2 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
editors/code/src/bootstrap.ts
View file

@ -153,18 +153,12 @@ function orderFromPath(
path: string,
raVersionResolver: (path: string) => string | undefined,
): string {
const capture = path.match(/^.*\/toolchains\/(.*)\/bin\/rust-analyzer$/);
if (capture?.length === 2) {
const toolchain = capture[1]!;
// It is a semver, so we must resolve Rust Analyzer's version.
const raVersion = raVersionResolver(path);
const raDate = raVersion?.match(/^rust-analyzer .*\(.* (\d{4}-\d{2}-\d{2})\)$/);
if (raDate?.length === 2) {
const precedence = toolchain.startsWith("nightly-") ? "/0" : "/1";
return "0-" + raDate[1] + precedence;
} else {
return "2";
}
// It is a semver, so we must resolve Rust Analyzer's version.
const raVersion = raVersionResolver(path);
const raDate = raVersion?.match(/^rust-analyzer .*\(.* (\d{4}-\d{2}-\d{2})\)$/);
if (raDate?.length === 2) {
const precedence = path.includes("nightly-") ? "0" : "1";
return precedence + "-" + raDate[1];
} else {
return "2";
}