mirror of https://github.com/astral-sh/ruff
[ty] Cancel background tasks when shutdown is requested (#20039)
This commit is contained in:
parent
7a44ea680e
commit
c5e05df966
|
|
@ -3,6 +3,7 @@ use crate::server::api::traits::{RequestHandler, SyncRequestHandler};
|
||||||
use crate::session::client::Client;
|
use crate::session::client::Client;
|
||||||
|
|
||||||
use lsp_types::{WorkspaceDiagnosticReport, WorkspaceDiagnosticReportResult};
|
use lsp_types::{WorkspaceDiagnosticReport, WorkspaceDiagnosticReportResult};
|
||||||
|
use salsa::Database;
|
||||||
|
|
||||||
pub(crate) struct ShutdownHandler;
|
pub(crate) struct ShutdownHandler;
|
||||||
|
|
||||||
|
|
@ -28,6 +29,12 @@ impl SyncRequestHandler for ShutdownHandler {
|
||||||
|
|
||||||
session.set_shutdown_requested(true);
|
session.set_shutdown_requested(true);
|
||||||
|
|
||||||
|
// Trigger cancellation for every db to cancel any compute intensive background tasks
|
||||||
|
// (e.g. workspace diagnostics or workspace symbols).
|
||||||
|
for db in session.projects_mut() {
|
||||||
|
db.trigger_cancellation();
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -427,7 +427,7 @@ impl Session {
|
||||||
/// Returns a mutable iterator over all project databases that have been initialized to this point.
|
/// Returns a mutable iterator over all project databases that have been initialized to this point.
|
||||||
///
|
///
|
||||||
/// This iterator will only yield the default project database if it has been used.
|
/// This iterator will only yield the default project database if it has been used.
|
||||||
fn projects_mut(&mut self) -> impl Iterator<Item = &'_ mut ProjectDatabase> + '_ {
|
pub(crate) fn projects_mut(&mut self) -> impl Iterator<Item = &'_ mut ProjectDatabase> + '_ {
|
||||||
self.project_states_mut().map(|project| &mut project.db)
|
self.project_states_mut().map(|project| &mut project.db)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue