File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed
crates/ty_server/src/server/api/requests Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -257,7 +257,12 @@ impl ProgressReporter for WorkspaceDiagnosticsProgressReporter<'_> {
257
257
self . report_progress ( ) ;
258
258
}
259
259
260
- let mut response = self . response . lock ( ) . unwrap ( ) ;
260
+ // Another thread might have panicked at this point because of a salsa cancellation which
261
+ // poisoned the result. If the response is poisoned, just don't report and wait for our thread
262
+ // to unwind with a salsa cancellation next.
263
+ let Ok ( mut response) = self . response . lock ( ) else {
264
+ return ;
265
+ } ;
261
266
262
267
// Don't report empty diagnostics. We clear previous diagnostics in `into_response`
263
268
// which also handles the case where a file no longer has diagnostics because
You can’t perform that action at this time.
0 commit comments