Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't die if a sync task panics

Browse source
This commit is contained in:
Aleksey Kladov 2019-10-24 09:52:32 +03:00
parent 31d84bce3c
commit 418fbc8662
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_lsp_server/src/main_loop.rs
View file

@ -4,7 +4,7 @@ mod handlers;
mod subscriptions; mod subscriptions;
pub(crate) mod pending_requests; pub(crate) mod pending_requests;
use std::{error::Error, fmt, path::PathBuf, sync::Arc, time::Instant}; use std::{error::Error, fmt, panic, path::PathBuf, sync::Arc, time::Instant};
use crossbeam_channel::{select, unbounded, RecvError, Sender}; use crossbeam_channel::{select, unbounded, RecvError, Sender};
use lsp_server::{Connection, ErrorCode, Message, Notification, Request, RequestId, Response}; use lsp_server::{Connection, ErrorCode, Message, Notification, Request, RequestId, Response};
@ -565,7 +565,7 @@ impl<'a> PoolDispatcher<'a> {
) -> Result<&mut Self> ) -> Result<&mut Self>
where where
R: req::Request + 'static, R: req::Request + 'static,
R::Params: DeserializeOwned + Send + 'static, R::Params: DeserializeOwned + panic::UnwindSafe + 'static,
R::Result: Serialize + 'static, R::Result: Serialize + 'static,
{ {
let (id, params) = match self.parse::<R>() { let (id, params) = match self.parse::<R>() {
@ -574,8 +574,12 @@ impl<'a> PoolDispatcher<'a> {
return Ok(self); return Ok(self);
} }
}; };
let result = f(self.world, params); let world = panic::AssertUnwindSafe(&mut *self.world);
let task = result_to_task::<R>(id, result); let task = panic::catch_unwind(move || {
let result = f(world.0, params);
result_to_task::<R>(id, result)
})
.map_err(|_| format!("sync task {:?} panicked", R::METHOD))?;
on_task(task, self.msg_sender, self.pending_requests, self.world); on_task(task, self.msg_sender, self.pending_requests, self.world);
Ok(self) Ok(self)
} }
@ -610,7 +614,7 @@ impl<'a> PoolDispatcher<'a> {
fn parse<R>(&mut self) -> Option<(RequestId, R::Params)> fn parse<R>(&mut self) -> Option<(RequestId, R::Params)>
where where
R: req::Request + 'static, R: req::Request + 'static,
R::Params: DeserializeOwned + Send + 'static, R::Params: DeserializeOwned + 'static,
{ {
let req = self.req.take()?; let req = self.req.take()?;
let (id, params) = match req.extract::<R::Params>(R::METHOD) { let (id, params) = match req.extract::<R::Params>(R::METHOD) {
@ -647,7 +651,7 @@ impl<'a> PoolDispatcher<'a> {
fn result_to_task<R>(id: RequestId, result: Result<R::Result>) -> Task fn result_to_task<R>(id: RequestId, result: Result<R::Result>) -> Task
where where
R: req::Request + 'static, R: req::Request + 'static,
R::Params: DeserializeOwned + Send + 'static, R::Params: DeserializeOwned + 'static,
R::Result: Serialize + 'static, R::Result: Serialize + 'static,
{ {
let response = match result { let response = match result {