From e1c12ffac2c2adc32a5bc3a65ea182484770c941 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Fri, 28 Jan 2022 19:46:14 +0100 Subject: [PATCH 1/2] Bump rust-analyzer to the 2022-01-24 release --- script/download-rust-analyzer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/download-rust-analyzer b/script/download-rust-analyzer index 8cc0c00e6f..8c366c5609 100755 --- a/script/download-rust-analyzer +++ b/script/download-rust-analyzer @@ -2,7 +2,7 @@ set -e -export RUST_ANALYZER_URL="https://github.com/rust-analyzer/rust-analyzer/releases/download/2021-10-18/" +export RUST_ANALYZER_URL="https://github.com/rust-analyzer/rust-analyzer/releases/download/2022-01-24/" function download { local filename="rust-analyzer-$1" From be7f5340d052ea7b37c45ce0fe1ca238040cf2b7 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 28 Jan 2022 12:11:26 -0800 Subject: [PATCH 2/2] Adjust hover assertion in lsp test after bumping rust-analyzer --- crates/lsp/src/lsp.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs index abadb6922f..d5a87f1aff 100644 --- a/crates/lsp/src/lsp.rs +++ b/crates/lsp/src/lsp.rs @@ -589,7 +589,7 @@ mod tests { use util::test::temp_tree; #[gpui::test] - async fn test_basic(cx: TestAppContext) { + async fn test_rust_analyzer(cx: TestAppContext) { let lib_source = r#" fn fun() { let hello = "world"; @@ -645,7 +645,7 @@ mod tests { assert_eq!( hover.contents, HoverContents::Markup(MarkupContent { - kind: MarkupKind::Markdown, + kind: MarkupKind::PlainText, value: "&str".to_string() }) );