bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'editors/code/src/bootstrap.ts')
-rw-r--r--editors/code/src/bootstrap.ts19
1 files changed, 7 insertions, 12 deletions
diff --git a/editors/code/src/bootstrap.ts b/editors/code/src/bootstrap.ts
index ebcafd6f72..521d0ba4c1 100644
--- a/editors/code/src/bootstrap.ts
+++ b/editors/code/src/bootstrap.ts
@@ -154,21 +154,16 @@ function orderFromPath(
raVersionResolver: (path: string) => string | undefined,
): string {
const capture = path.match(/^.*\/toolchains\/(.*)\/bin\/rust-analyzer$/);
-
if (capture?.length === 2) {
const toolchain = capture[1]!;
- if (toolchain.startsWith("stable-")) {
- return "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 {
- // 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";
- }
+ return "2";
}
} else {
return "2";