language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Sync handlers cannot be cancelled

Browse source
This commit is contained in:
Lukas Wirth 2022-06-01 12:17:49 +02:00
parent e2da967578
commit d88ae66ed9
3 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/rust-analyzer/src/dispatch.rs
View file

@ -51,10 +51,9 @@ impl<'a> RequestDispatcher<'a> {
let _pctx = stdx::panic_context::enter(panic_context); let _pctx = stdx::panic_context::enter(panic_context);
f(self.global_state, params) f(self.global_state, params)
}; };
match result_to_response::<R>(req.id.clone(), result) { if let Ok(response) = result_to_response::<R>(req.id.clone(), result) {
Ok(response) => self.global_state.respond(response), self.global_state.respond(response);
Err(_) => self.global_state.task_pool.handle.send_retry(req), }
};
self self
} }
@ -80,10 +79,9 @@ impl<'a> RequestDispatcher<'a> {
f(global_state_snapshot, params) f(global_state_snapshot, params)
}); });
match thread_result_to_response::<R>(req.id.clone(), result) { if let Ok(response) = thread_result_to_response::<R>(req.id.clone(), result) {
Ok(response) => self.global_state.respond(response), self.global_state.respond(response);
Err(_) => self.global_state.task_pool.handle.send_retry(req), }
};
self self
} }

6
crates/rust-analyzer/src/main_loop.rs
View file

@ -173,13 +173,13 @@ impl GlobalState {
msg.ok().map(Event::Lsp), msg.ok().map(Event::Lsp),
recv(self.task_pool.receiver) -> task => recv(self.task_pool.receiver) -> task =>
task.ok().map(Event::Task), Some(Event::Task(task.unwrap())),
recv(self.loader.receiver) -> task => recv(self.loader.receiver) -> task =>
task.ok().map(Event::Vfs), Some(Event::Vfs(task.unwrap())),
recv(self.flycheck_receiver) -> task => recv(self.flycheck_receiver) -> task =>
task.ok().map(Event::Flycheck), Some(Event::Flycheck(task.unwrap())),
} }
} }

8
crates/rust-analyzer/src/task_pool.rs
View file

@ -2,8 +2,6 @@
//! properly. //! properly.
use crossbeam_channel::Sender; use crossbeam_channel::Sender;
use crate::main_loop::Task;
pub(crate) struct TaskPool<T> { pub(crate) struct TaskPool<T> {
sender: Sender<T>, sender: Sender<T>,
inner: threadpool::ThreadPool, inner: threadpool::ThreadPool,
@ -46,9 +44,3 @@ impl<T> Drop for TaskPool<T> {
self.inner.join() self.inner.join()
} }
} }
impl TaskPool<Task> {
pub(crate) fn send_retry(&self, req: lsp_server::Request) {
let _ = self.sender.send(Task::Retry(req));
}
}