Skip to content

Commit cf10a1e

Browse files
committed
Auto merge of #12440 - Maan2003:empty-msg-diag, r=jonas-schievink
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)
2 parents 4f5c7aa + bad9311 commit cf10a1e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

crates/rust-analyzer/src/diagnostics/to_proto.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,10 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
462462
message: "original diagnostic".to_string(),
463463
};
464464
for sub in &subdiagnostics {
465-
// Filter out empty/non-existent messages, as they greatly confuse VS Code.
466-
if sub.related.message.is_empty() {
467-
continue;
465+
let mut message = sub.related.message.clone();
466+
// Change empty message to " ", as they greatly confuse VS Code.
467+
if message.is_empty() {
468+
message = String::from(" ");
468469
}
469470
diagnostics.push(MappedRustDiagnostic {
470471
url: sub.related.location.uri.clone(),
@@ -475,7 +476,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
475476
code: code.clone().map(lsp_types::NumberOrString::String),
476477
code_description: code_description.clone(),
477478
source: Some(source.clone()),
478-
message: sub.related.message.clone(),
479+
message,
479480
related_information: Some(vec![back_ref.clone()]),
480481
tags: None, // don't apply modifiers again
481482
data: None,

0 commit comments

Comments
 (0)