zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-30 22:34:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Run LSP response deserialization outside of main thread

Browse Source 
Improves latency when big inlay hints LSP responses for ~8k line files

Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Kirill Bulatov 2023-06-21 13:20:42 +03:00
parent 5860b7b143
commit bd97767c72
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/lsp/src/lsp.rs
View File

@ -33,7 +33,7 @@ const JSON_RPC_VERSION: &str = "2.0";
const CONTENT_LEN_HEADER: &str = "Content-Length: "; const CONTENT_LEN_HEADER: &str = "Content-Length: ";
type NotificationHandler = Box<dyn Send + FnMut(Option<usize>, &str, AsyncAppContext)>; type NotificationHandler = Box<dyn Send + FnMut(Option<usize>, &str, AsyncAppContext)>;
type ResponseHandler = Box<dyn Send + FnOnce(Result<&str, Error>)>; type ResponseHandler = Box<dyn Send + FnOnce(Result<String, Error>)>;
type IoHandler = Box<dyn Send + FnMut(bool, &str)>; type IoHandler = Box<dyn Send + FnMut(bool, &str)>;
pub struct LanguageServer { pub struct LanguageServer {
@ -302,9 +302,9 @@ impl LanguageServer {
if let Some(error) = error { if let Some(error) = error {
handler(Err(error)); handler(Err(error));
} else if let Some(result) = result { } else if let Some(result) = result {
handler(Ok(result.get())); handler(Ok(result.get().into()));
} else { } else {
handler(Ok("null")); handler(Ok("null".into()));
} }
} }
} else { } else {
@ -457,11 +457,13 @@ impl LanguageServer {
let response_handlers = self.response_handlers.clone(); let response_handlers = self.response_handlers.clone();
let next_id = AtomicUsize::new(self.next_id.load(SeqCst)); let next_id = AtomicUsize::new(self.next_id.load(SeqCst));
let outbound_tx = self.outbound_tx.clone(); let outbound_tx = self.outbound_tx.clone();
let executor = self.executor.clone();
let mut output_done = self.output_done_rx.lock().take().unwrap(); let mut output_done = self.output_done_rx.lock().take().unwrap();
let shutdown_request = Self::request_internal::<request::Shutdown>( let shutdown_request = Self::request_internal::<request::Shutdown>(
&next_id, &next_id,
&response_handlers, &response_handlers,
&outbound_tx, &outbound_tx,
&executor,
(), (),
); );
let exit = Self::notify_internal::<notification::Exit>(&outbound_tx, ()); let exit = Self::notify_internal::<notification::Exit>(&outbound_tx, ());
@ -658,6 +660,7 @@ impl LanguageServer {
&self.next_id, &self.next_id,
&self.response_handlers, &self.response_handlers,
&self.outbound_tx, &self.outbound_tx,
&self.executor,
params, params,
) )
} }
@ -666,6 +669,7 @@ impl LanguageServer {
next_id: &AtomicUsize, next_id: &AtomicUsize,
response_handlers: &Mutex<Option<HashMap<usize, ResponseHandler>>>, response_handlers: &Mutex<Option<HashMap<usize, ResponseHandler>>>,
outbound_tx: &channel::Sender<String>, outbound_tx: &channel::Sender<String>,
executor: &Arc<executor::Background>,
params: T::Params, params: T::Params,
) -> impl 'static + Future<Output = Result<T::Result>> ) -> impl 'static + Future<Output = Result<T::Result>>
where where
@ -686,15 +690,20 @@ impl LanguageServer {
.as_mut() .as_mut()
.ok_or_else(|| anyhow!("server shut down")) .ok_or_else(|| anyhow!("server shut down"))
.map(|handlers| { .map(|handlers| {
let executor = executor.clone();
handlers.insert( handlers.insert(
id, id,
Box::new(move |result| { Box::new(move |result| {
let response = match result { executor
Ok(response) => serde_json::from_str(response) .spawn(async move {
.context("failed to deserialize response"), let response = match result {
Err(error) => Err(anyhow!("{}", error.message)), Ok(response) => serde_json::from_str(&response)
}; .context("failed to deserialize response"),
let _ = tx.send(response); Err(error) => Err(anyhow!("{}", error.message)),
};
let _ = tx.send(response);
})
.detach();
}), }),
); );
}); });