mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #13016 - Veykril:vscode-diag-workaround, r=Veykril

Browse Source 
Move VSCode diagnostics workaroudn into client code
This commit is contained in:
bors 2022-08-13 18:35:09 +00:00
commit bbe5637bbf
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/rust-analyzer/src/handlers.rs
View File

@ -1320,8 +1320,7 @@ pub(crate) fn publish_diagnostics(
.unwrap(),
}),
source: Some("rust-analyzer".to_string()),
// https://github.com/rust-lang/rust-analyzer/issues/11404
message: if !d.message.is_empty() { d.message } else { " ".to_string() },
message: d.message,
related_information: None,
tags: if d.unused { Some(vec![DiagnosticTag::UNNECESSARY]) } else { None },
data: None,

22
crates/rust-analyzer/src/main_loop.rs
View File

@ -327,29 +327,15 @@ fn handle_event(&mut self, event: Event) -> Result<()> {
continue;
}
let url = file_id_to_url(&self.vfs.read().0, file_id);
let mut diagnostics =
let uri = file_id_to_url(&self.vfs.read().0, file_id);
let diagnostics =
self.diagnostics.diagnostics_for(file_id).cloned().collect::<Vec<_>>();
for d in &mut diagnostics {
// https://github.com/rust-lang/rust-analyzer/issues/11404
// FIXME: We should move this workaround into the client code
if d.message.is_empty() {
d.message = " ".to_string();
}
if let Some(rds) = d.related_information.as_mut() {
for rd in rds {
if rd.message.is_empty() {
rd.message = " ".to_string();
}
}
}
}
let version = from_proto::vfs_path(&url)
let version = from_proto::vfs_path(&uri)
.map(|path| self.mem_docs.get(&path).map(|it| it.version))
.unwrap_or_default();
self.send_notification::<lsp_types::notification::PublishDiagnostics>(
lsp_types::PublishDiagnosticsParams { uri: url, diagnostics, version },
lsp_types::PublishDiagnosticsParams { uri, diagnostics, version },
);
}
}

9
editors/code/src/client.ts
View File

@ -105,6 +105,15 @@ export async function createClient(
traceOutputChannel: traceOutputChannel(),
outputChannel: outputChannel(),
middleware: {
async handleDiagnostics(uri, diagnostics, next) {
// Workaround for https://github.com/microsoft/vscode/issues/155531
for (const diagnostic of diagnostics) {
if (!diagnostic.message) {
diagnostic.message = " ";
}
}
next(uri, diagnostics);
},
async provideHover(
document: vscode.TextDocument,
position: vscode.Position,