rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Coalesce flycheck events

Browse Source
This commit is contained in:
Jonas Schievink
2020-11-27 22:52:22 +01:00
parent 59c4975b54
commit f52abbe62d
1 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/rust-analyzer/src/main_loop.rs
View File

@@ -289,9 +289,13 @@ impl GlobalState {
} }
} }
} }
Event::Flycheck(task) => match task { Event::Flycheck(mut task) => {
let _p = profile::span("GlobalState::handle_event/flycheck");
loop {
match task {
flycheck::Message::AddDiagnostic { workspace_root, diagnostic } => { flycheck::Message::AddDiagnostic { workspace_root, diagnostic } => {
let diagnostics = crate::diagnostics::to_proto::map_rust_diagnostic_to_lsp( let diagnostics =
crate::diagnostics::to_proto::map_rust_diagnostic_to_lsp(
&self.config.diagnostics_map, &self.config.diagnostics_map,
&diagnostic, &diagnostic,
&workspace_root, &workspace_root,
@@ -304,7 +308,10 @@ impl GlobalState {
diag.fixes, diag.fixes,
), ),
Err(err) => { Err(err) => {
log::error!("File with cargo diagnostic not found in VFS: {}", err); log::error!(
"File with cargo diagnostic not found in VFS: {}",
err
);
} }
}; };
} }
@@ -337,7 +344,14 @@ impl GlobalState {
}; };
self.report_progress(&title, state, message, None); self.report_progress(&title, state, message, None);
} }
}, }
// Coalesce many flycheck updates into a single loop turn
task = match self.flycheck_receiver.try_recv() {
Ok(task) => task,
Err(_) => break,
}
}
}
} }
let state_changed = self.process_changes(); let state_changed = self.process_changes();