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

Checks date for any RA

Browse source
This commit is contained in:
huntc 2024-07-30 16:26:56 +10:00
parent ec7451cc8d
commit b05def0f4c
2 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

21
editors/code/tests/unit/bootstrap.test.ts
View file

@ -52,11 +52,15 @@ export async function getTests(ctx: Context) {
assert.deepStrictEqual( assert.deepStrictEqual(
_private.orderFromPath( _private.orderFromPath(
"/Users/myuser/.rustup/toolchains/stable-aarch64-apple-darwin/bin/rust-analyzer", "/Users/myuser/.rustup/toolchains/stable-aarch64-apple-darwin/bin/rust-analyzer",
function () { function (path: string) {
assert.fail("Shouldn't get here."); assert.deepStrictEqual(
path,
"/Users/myuser/.rustup/toolchains/stable-aarch64-apple-darwin/bin/rust-analyzer",
);
return "rust-analyzer 1.79.0 (129f3b99 2024-06-10)";
}, },
), ),
"1", "0-2024-06-10/1",
); );
}); });
@ -75,11 +79,14 @@ export async function getTests(ctx: Context) {
"/Users/myuser/.rustup/toolchains/stable-aarch64-apple-darwin/bin/rust-analyzer", "/Users/myuser/.rustup/toolchains/stable-aarch64-apple-darwin/bin/rust-analyzer",
"/Users/myuser/.rustup/toolchains/nightly-2022-11-22-aarch64-apple-darwin/bin/rust-analyzer", "/Users/myuser/.rustup/toolchains/nightly-2022-11-22-aarch64-apple-darwin/bin/rust-analyzer",
function (path: string) { function (path: string) {
assert.deepStrictEqual( if (
path, path ===
"/Users/myuser/.rustup/toolchains/nightly-2022-11-22-aarch64-apple-darwin/bin/rust-analyzer", "/Users/myuser/.rustup/toolchains/nightly-2022-11-22-aarch64-apple-darwin/bin/rust-analyzer"
); ) {
return "rust-analyzer 1.67.0-nightly (b7bc90fe 2022-11-21)"; return "rust-analyzer 1.67.0-nightly (b7bc90fe 2022-11-21)";
} else {
return "rust-analyzer 1.79.0 (129f3b99 2024-06-10)";
}
}, },
), ),
"/Users/myuser/.rustup/toolchains/nightly-2022-11-22-aarch64-apple-darwin/bin/rust-analyzer", "/Users/myuser/.rustup/toolchains/nightly-2022-11-22-aarch64-apple-darwin/bin/rust-analyzer",