mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #18065 - Veykril:catchy-diagnostics, r=Veykril

Browse Source 
fix: Catch panics from diagnostics computation
This commit is contained in:
bors 2024-09-06 06:22:41 +00:00
commit 56fde6ef41
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs
View File

@ -4,6 +4,7 @@
use std::{ use std::{
fmt, fmt,
ops::Div as _, ops::Div as _,
panic::AssertUnwindSafe,
time::{Duration, Instant}, time::{Duration, Instant},
}; };
@ -552,23 +553,33 @@ impl GlobalState {
let fetch_semantic = let fetch_semantic =
self.vfs_done && self.fetch_workspaces_queue.last_op_result().is_some(); self.vfs_done && self.fetch_workspaces_queue.last_op_result().is_some();
move |sender| { move |sender| {
let diags = fetch_native_diagnostics( // We aren't observing the semantics token cache here
&snapshot, let snapshot = AssertUnwindSafe(&snapshot);
subscriptions.clone(), let Ok(diags) = std::panic::catch_unwind(|| {
slice.clone(), fetch_native_diagnostics(
NativeDiagnosticsFetchKind::Syntax, &snapshot,
); subscriptions.clone(),
slice.clone(),
NativeDiagnosticsFetchKind::Syntax,
)
}) else {
return;
};
sender sender
.send(Task::Diagnostics(DiagnosticsTaskKind::Syntax(generation, diags))) .send(Task::Diagnostics(DiagnosticsTaskKind::Syntax(generation, diags)))
.unwrap(); .unwrap();
if fetch_semantic { if fetch_semantic {
let diags = fetch_native_diagnostics( let Ok(diags) = std::panic::catch_unwind(|| {
&snapshot, fetch_native_diagnostics(
subscriptions, &snapshot,
slice, subscriptions.clone(),
NativeDiagnosticsFetchKind::Semantic, slice.clone(),
); NativeDiagnosticsFetchKind::Semantic,
)
}) else {
return;
};
sender sender
.send(Task::Diagnostics(DiagnosticsTaskKind::Semantic( .send(Task::Diagnostics(DiagnosticsTaskKind::Semantic(
generation, diags, generation, diags,