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

Auto merge of #12440 - Maan2003:empty-msg-diag, r=jonas-schievink

Browse Source 
fix(diagnostic): Don't remove diagnostic with empty message

Use " " as message if it is empty

[discussion on zulip](https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/empty.20diagnostic.20message)

![image](https://user-images.githubusercontent.com/49202620/171412661-9b9575e9-e71b-4b84-a5c0-00271548d50c.png)
This commit is contained in:
bors 2022-06-01 14:31:14 +00:00
commit cf10a1ee3e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/rust-analyzer/src/diagnostics/to_proto.rs
View File

@ -462,9 +462,10 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
message: "original diagnostic".to_string(), message: "original diagnostic".to_string(),
}; };
for sub in &subdiagnostics { for sub in &subdiagnostics {
// Filter out empty/non-existent messages, as they greatly confuse VS Code. let mut message = sub.related.message.clone();
if sub.related.message.is_empty() { // Change empty message to " ", as they greatly confuse VS Code.
continue; if message.is_empty() {
message = String::from(" ");
} }
diagnostics.push(MappedRustDiagnostic { diagnostics.push(MappedRustDiagnostic {
url: sub.related.location.uri.clone(), url: sub.related.location.uri.clone(),
@ -475,7 +476,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
code: code.clone().map(lsp_types::NumberOrString::String), code: code.clone().map(lsp_types::NumberOrString::String),
code_description: code_description.clone(), code_description: code_description.clone(),
source: Some(source.clone()), source: Some(source.clone()),
message: sub.related.message.clone(), message,
related_information: Some(vec![back_ref.clone()]), related_information: Some(vec![back_ref.clone()]),
tags: None, // don't apply modifiers again tags: None, // don't apply modifiers again
data: None, data: None,