Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Match progress token's prefix to detect disk-based diagnostic progress

Browse source 
The new version of rust-analyzer changed the disk-based diagnostic token
to `rust-analyzer/checkOnSave/0`. The trailing number could be different
from 0 when there are multiple Rust projects open using the same rust-analyzer
instance.

As such, with this commit we will perform a prefix match as opposed to a strict
equality check when detecting a disk-based diagnostics progress token.
This commit is contained in:
Antonio Scandurra 2022-10-25 11:35:59 +02:00
parent af74d5409a
commit 19adfdf8bb
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/project/src/project.rs
View file

@ -2262,8 +2262,11 @@ impl Project {
return; return;
} }
let is_disk_based_diagnostics_progress = let is_disk_based_diagnostics_progress = disk_based_diagnostics_progress_token
Some(token.as_ref()) == disk_based_diagnostics_progress_token.as_deref(); .as_ref()
.map_or(false, |disk_based_token| {
token.starts_with(disk_based_token)
});
match progress { match progress {
lsp::WorkDoneProgress::Begin(report) => { lsp::WorkDoneProgress::Begin(report) => {

6
crates/project/src/project_tests.rs
View file

@ -644,7 +644,9 @@ async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
let mut events = subscribe(&project, cx); let mut events = subscribe(&project, cx);
let fake_server = fake_servers.next().await.unwrap(); let fake_server = fake_servers.next().await.unwrap();
fake_server.start_progress(progress_token).await; fake_server
.start_progress(format!("{}/0", progress_token))
.await;
assert_eq!( assert_eq!(
events.next().await.unwrap(), events.next().await.unwrap(),
Event::DiskBasedDiagnosticsStarted { Event::DiskBasedDiagnosticsStarted {
@ -670,7 +672,7 @@ async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
} }
); );
fake_server.end_progress(progress_token); fake_server.end_progress(format!("{}/0", progress_token));
assert_eq!( assert_eq!(
events.next().await.unwrap(), events.next().await.unwrap(),
Event::DiskBasedDiagnosticsFinished { Event::DiskBasedDiagnosticsFinished {

2
crates/zed/src/languages/rust.rs
View file

@ -93,7 +93,7 @@ impl LspAdapter for RustLspAdapter {
} }
async fn disk_based_diagnostics_progress_token(&self) -> Option<String> { async fn disk_based_diagnostics_progress_token(&self) -> Option<String> {
Some("rustAnalyzer/cargo check".into()) Some("rust-analyzer/checkOnSave".into())
} }
async fn process_diagnostics(&self, params: &mut lsp::PublishDiagnosticsParams) { async fn process_diagnostics(&self, params: &mut lsp::PublishDiagnosticsParams) {