Merge pull request #18858 from davidbarsky/davidbarsky/fix-18854

ChayimFriedman2 · web-flow · commit ccc74689955b · 2025-01-06T23:59:35.000Z
fix: clear diagnostics on cancel unconditionally
diff --git a/crates/rust-analyzer/src/flycheck.rs b/crates/rust-analyzer/src/flycheck.rs
@@ -419,9 +419,9 @@ impl FlycheckActor {
             command_handle.cancel();
             self.command_receiver.take();
             self.report_progress(Progress::DidCancel);
-            self.diagnostics_cleared_for.clear();
-            self.diagnostics_received = false;
         }
+        self.diagnostics_cleared_for.clear();
+        self.diagnostics_received = false;
     }
 
     /// Construct a `Command` object for checking the user's code. If the user

Original file line number	Diff line number	Diff line change
`@@ -419,9 +419,9 @@ impl FlycheckActor {`
`419`	`419`	`command_handle.cancel();`
`420`	`420`	`self.command_receiver.take();`
`421`	`421`	`self.report_progress(Progress::DidCancel);`
`422`		`- self.diagnostics_cleared_for.clear();`
`423`		`- self.diagnostics_received = false;`
`424`	`422`	`}`
	`423`	`+ self.diagnostics_cleared_for.clear();`
	`424`	`+ self.diagnostics_received = false;`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	/// Construct a `Command` object for checking the user's code. If the user