mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-01 23:12:02 +00:00
Move VSCode diagnostics workaroudn into client code
This commit is contained in:
parent
038c36a1f5
commit
ec8256dd80
@ -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,
|
||||
|
@ -327,29 +327,15 @@ impl GlobalState {
|
||||
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 },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user