Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 05:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Offload diagnostics serialization to the task pool

Browse source
This commit is contained in:
Lukas Wirth 2024-08-07 16:43:51 +02:00
parent bb60c21885
commit a147018e8e
2 changed files with 48 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
crates/rust-analyzer/src/global_state.rs
View file

@ -560,6 +560,49 @@ impl GlobalState {
fn send(&self, message: lsp_server::Message) { fn send(&self, message: lsp_server::Message) {
self.sender.send(message).unwrap() self.sender.send(message).unwrap()
} }
pub(crate) fn publish_diagnostics(
&mut self,
uri: Url,
version: Option<i32>,
mut diagnostics: Vec<lsp_types::Diagnostic>,
) {
// We put this on a separate thread to avoid blocking the main thread with serialization work
self.task_pool.handle.spawn_with_sender(stdx::thread::ThreadIntent::Worker, {
let sender = self.sender.clone();
move |_| {
// VSCode assumes diagnostic messages to be non-empty strings, so we need to patch
// empty diagnostics. Neither the docs of VSCode nor the LSP spec say whether
// diagnostic messages are actually allowed to be empty or not and patching this
// in the VSCode client does not work as the assertion happens in the protocol
// conversion. So this hack is here to stay, and will be considered a hack
// until the LSP decides to state that empty messages are allowed.
// See https://github.com/rust-lang/rust-analyzer/issues/11404
// See https://github.com/rust-lang/rust-analyzer/issues/13130
let patch_empty = |message: &mut String| {
if message.is_empty() {
" ".clone_into(message);
}
};
for d in &mut diagnostics {
patch_empty(&mut d.message);
if let Some(dri) = &mut d.related_information {
for dri in dri {
patch_empty(&mut dri.message);
}
}
}
let not = lsp_server::Notification::new(
<lsp_types::notification::PublishDiagnostics as lsp_types::notification::Notification>::METHOD.to_owned(),
lsp_types::PublishDiagnosticsParams { uri, diagnostics, version },
);
_ = sender.send(not.into());
}
});
}
} }
impl Drop for GlobalState { impl Drop for GlobalState {

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

@ -440,40 +440,13 @@ impl GlobalState {
if let Some(diagnostic_changes) = self.diagnostics.take_changes() { if let Some(diagnostic_changes) = self.diagnostics.take_changes() {
for file_id in diagnostic_changes { for file_id in diagnostic_changes {
let uri = file_id_to_url(&self.vfs.read().0, file_id); let uri = file_id_to_url(&self.vfs.read().0, file_id);
let mut diagnostics =
self.diagnostics.diagnostics_for(file_id).cloned().collect::<Vec<_>>();
// VSCode assumes diagnostic messages to be non-empty strings, so we need to patch
// empty diagnostics. Neither the docs of VSCode nor the LSP spec say whether
// diagnostic messages are actually allowed to be empty or not and patching this
// in the VSCode client does not work as the assertion happens in the protocol
// conversion. So this hack is here to stay, and will be considered a hack
// until the LSP decides to state that empty messages are allowed.
// See https://github.com/rust-lang/rust-analyzer/issues/11404
// See https://github.com/rust-lang/rust-analyzer/issues/13130
let patch_empty = |message: &mut String| {
if message.is_empty() {
" ".clone_into(message);
}
};
for d in &mut diagnostics {
patch_empty(&mut d.message);
if let Some(dri) = &mut d.related_information {
for dri in dri {
patch_empty(&mut dri.message);
}
}
}
let version = from_proto::vfs_path(&uri) let version = from_proto::vfs_path(&uri)
.map(|path| self.mem_docs.get(&path).map(|it| it.version)) .ok()
.unwrap_or_default(); .and_then(|path| self.mem_docs.get(&path).map(|it| it.version));
self.send_notification::<lsp_types::notification::PublishDiagnostics>( let diagnostics =
lsp_types::PublishDiagnosticsParams { uri, diagnostics, version }, self.diagnostics.diagnostics_for(file_id).cloned().collect::<Vec<_>>();
); self.publish_diagnostics(uri, version, diagnostics);
} }
} }