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;
}
let is_disk_based_diagnostics_progress =
Some(token.as_ref()) == disk_based_diagnostics_progress_token.as_deref();
let is_disk_based_diagnostics_progress = disk_based_diagnostics_progress_token
.as_ref()
.map_or(false, |disk_based_token| {
token.starts_with(disk_based_token)
});
match progress {
lsp::WorkDoneProgress::Begin(report) => {