rust-analyzer

diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs
index 973f2a53c1..7f14fe5798 100644
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs

@@ -86,7 +86,7 @@ impl FlycheckHandle {

pub enum Message {

/// Request adding a diagnostic with fixes included to a file

- AddDiagnostic { workspace_root: AbsPathBuf, diagnostic: Diagnostic },

+ AddDiagnostic { id: usize, workspace_root: AbsPathBuf, diagnostic: Diagnostic },

/// Request check progress notification to client

Progress {

@@ -99,8 +99,9 @@ pub enum Message {

impl fmt::Debug for Message {

fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

match self {

- Message::AddDiagnostic { workspace_root, diagnostic } => f

+ Message::AddDiagnostic { id, workspace_root, diagnostic } => f

.debug_struct("AddDiagnostic")

+ .field("id", id)

.field("workspace_root", workspace_root)

.field("diagnostic_code", &diagnostic.code.as_ref().map(|it| &it.code))

.finish(),

@@ -186,7 +187,7 @@ impl FlycheckActor {

}

Event::CheckEvent(None) => {

- tracing::debug!("flycheck finished");

+ tracing::debug!(flycheck_id = self.id, "flycheck finished");

// Watcher finished

let cargo_handle = self.cargo_handle.take().unwrap();

@@ -206,6 +207,7 @@ impl FlycheckActor {

CargoMessage::Diagnostic(msg) => {

self.send(Message::AddDiagnostic {

+ id: self.id,

workspace_root: self.workspace_root.clone(),

diagnostic: msg,

});

diff --git a/crates/rust-analyzer/src/diagnostics.rs b/crates/rust-analyzer/src/diagnostics.rs
index 202a01adf7..7917ced666 100644
--- a/crates/rust-analyzer/src/diagnostics.rs
+++ b/crates/rust-analyzer/src/diagnostics.rs

@@ -8,7 +8,7 @@ use rustc_hash::{FxHashMap, FxHashSet};

use crate::lsp_ext;

-pub(crate) type CheckFixes = Arc<FxHashMap<FileId, Vec<Fix>>>;

+pub(crate) type CheckFixes = Arc<FxHashMap<usize, FxHashMap<FileId, Vec<Fix>>>>;

#[derive(Debug, Default, Clone)]

pub struct DiagnosticsMapConfig {

@@ -22,7 +22,7 @@ pub(crate) struct DiagnosticCollection {

// FIXME: should be FxHashMap<FileId, Vec<ra_id::Diagnostic>>

pub(crate) native: FxHashMap<FileId, Vec<lsp_types::Diagnostic>>,

// FIXME: should be Vec<flycheck::Diagnostic>

- pub(crate) check: FxHashMap<FileId, Vec<lsp_types::Diagnostic>>,

+ pub(crate) check: FxHashMap<usize, FxHashMap<FileId, Vec<lsp_types::Diagnostic>>>,

pub(crate) check_fixes: CheckFixes,

changes: FxHashSet<FileId>,

}

@@ -35,9 +35,19 @@ pub(crate) struct Fix {

}

impl DiagnosticCollection {

- pub(crate) fn clear_check(&mut self) {

+ pub(crate) fn clear_check(&mut self, flycheck_id: usize) {

+ if let Some(it) = Arc::make_mut(&mut self.check_fixes).get_mut(&flycheck_id) {

+ it.clear();

+ }

+ if let Some(it) = self.check.get_mut(&flycheck_id) {

+ self.changes.extend(it.drain().map(|(key, _value)| key));

+ }

+ pub(crate) fn clear_check_all(&mut self) {

Arc::make_mut(&mut self.check_fixes).clear();

- self.changes.extend(self.check.drain().map(|(key, _value)| key))

+ self.changes

+ .extend(self.check.values_mut().flat_map(|it| it.drain().map(|(key, _value)| key)))

}

pub(crate) fn clear_native_for(&mut self, file_id: FileId) {

@@ -47,11 +57,12 @@ impl DiagnosticCollection {

pub(crate) fn add_check_diagnostic(

&mut self,

+ flycheck_id: usize,

file_id: FileId,

diagnostic: lsp_types::Diagnostic,

fix: Option<Fix>,

) {

- let diagnostics = self.check.entry(file_id).or_default();

+ let diagnostics = self.check.entry(flycheck_id).or_default().entry(file_id).or_default();

for existing_diagnostic in diagnostics.iter() {

if are_diagnostics_equal(existing_diagnostic, &diagnostic) {

return;

@@ -59,8 +70,9 @@ impl DiagnosticCollection {

}

let check_fixes = Arc::make_mut(&mut self.check_fixes);

- check_fixes.entry(file_id).or_default().extend(fix);

+ check_fixes.entry(flycheck_id).or_default().entry(file_id).or_default().extend(fix);

diagnostics.push(diagnostic);

+ tracing::warn!(?flycheck_id, ?file_id, "add_check_diagnostic changes pushed");

self.changes.insert(file_id);

}

@@ -89,7 +101,8 @@ impl DiagnosticCollection {

file_id: FileId,

) -> impl Iterator<Item = &lsp_types::Diagnostic> {

let native = self.native.get(&file_id).into_iter().flatten();

- let check = self.check.get(&file_id).into_iter().flatten();

+ let check =

+ self.check.values().filter_map(move |it| it.get(&file_id)).into_iter().flatten();

native.chain(check)

}

diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
index 4af60035a2..2cd2044aef 100644
--- a/crates/rust-analyzer/src/global_state.rs
+++ b/crates/rust-analyzer/src/global_state.rs

@@ -201,6 +201,7 @@ impl GlobalState {

}

+ // Clear native diagnostics when their file gets deleted

if !file.exists() {

self.diagnostics.clear_native_for(file.file_id);

}

diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index e3875228a1..a64dc57ec6 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs

@@ -1094,7 +1094,9 @@ pub(crate) fn handle_code_action(

}

// Fixes from `cargo check`.

- for fix in snap.check_fixes.get(&frange.file_id).into_iter().flatten() {

+ for fix in

+ snap.check_fixes.values().filter_map(|it| it.get(&frange.file_id)).into_iter().flatten()

+ {

// FIXME: this mapping is awkward and shouldn't exist. Refactor

// `snap.check_fixes` to not convert to LSP prematurely.

let intersect_fix_range = fix

diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 262c30f132..572466cdfa 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs

@@ -372,7 +372,7 @@ impl GlobalState {

let _p = profile::span("GlobalState::handle_event/flycheck");

loop {

match task {

- flycheck::Message::AddDiagnostic { workspace_root, diagnostic } => {

+ flycheck::Message::AddDiagnostic { id, workspace_root, diagnostic } => {

let snap = self.snapshot();

let diagnostics =

crate::diagnostics::to_proto::map_rust_diagnostic_to_lsp(

@@ -384,6 +384,7 @@ impl GlobalState {

for diag in diagnostics {

match url_to_file_id(&self.vfs.read().0, &diag.url) {

Ok(file_id) => self.diagnostics.add_check_diagnostic(

+ id,

file_id,

diag.diagnostic,

diag.fix,

@@ -401,7 +402,7 @@ impl GlobalState {

flycheck::Message::Progress { id, progress } => {

let (state, message) = match progress {

flycheck::Progress::DidStart => {

- self.diagnostics.clear_check();

+ self.diagnostics.clear_check(id);

(Progress::Begin, None)

}

flycheck::Progress::DidCheckCrate(target) => {

diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index 13bcb7dfa2..579ba38027 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs

@@ -417,7 +417,7 @@ impl GlobalState {

Some(it) => it,

None => {

self.flycheck = Vec::new();

- self.diagnostics.clear_check();

+ self.diagnostics.clear_check_all();

return;

}

};