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

Don't flycheck while the workspace is being loaded

Browse Source
This commit is contained in:
Lukas Wirth
2022-08-04 14:01:33 +02:00
parent df9d3db82f
commit df7f755e3b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/rust-analyzer/src/diagnostics.rs
View File

@@ -72,7 +72,6 @@ impl DiagnosticCollection {
let check_fixes = Arc::make_mut(&mut self.check_fixes); let check_fixes = Arc::make_mut(&mut self.check_fixes);
check_fixes.entry(flycheck_id).or_default().entry(file_id).or_default().extend(fix); check_fixes.entry(flycheck_id).or_default().entry(file_id).or_default().extend(fix);
diagnostics.push(diagnostic); diagnostics.push(diagnostic);
tracing::warn!(?flycheck_id, ?file_id, "add_check_diagnostic changes pushed");
self.changes.insert(file_id); self.changes.insert(file_id);
} }

1
crates/rust-analyzer/src/global_state.rs
View File

@@ -192,6 +192,7 @@ impl GlobalState {
if let Some(path) = vfs.file_path(file.file_id).as_path() { if let Some(path) = vfs.file_path(file.file_id).as_path() {
let path = path.to_path_buf(); let path = path.to_path_buf();
if reload::should_refresh_for_change(&path, file.change_kind) { if reload::should_refresh_for_change(&path, file.change_kind) {
tracing::warn!("fetch-fiel_change");
self.fetch_workspaces_queue self.fetch_workspaces_queue
.request_op(format!("vfs file change: {}", path.display())); .request_op(format!("vfs file change: {}", path.display()));
} }

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

@@ -447,7 +447,10 @@ impl GlobalState {
let memdocs_added_or_removed = self.mem_docs.take_changes(); let memdocs_added_or_removed = self.mem_docs.take_changes();
if self.is_quiescent() { if self.is_quiescent() {
if !was_quiescent { if !was_quiescent
&& !self.fetch_workspaces_queue.op_requested()
&& !self.fetch_build_data_queue.op_requested()
{
for flycheck in &self.flycheck { for flycheck in &self.flycheck {
flycheck.update(); flycheck.update();
} }