rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't duplicate rustc diagnostics fixes

Browse Source
This commit is contained in:
Jonas Schievink
2021-01-15 18:11:54 +01:00
parent 0c58aa9dc0
commit 36500fe496
5 changed files with 32 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt
View File

@@ -66,52 +66,7 @@
), ),
data: None, data: None,
}, },
fixes: [ fixes: [],
CodeAction {
title: "consider prefixing with an underscore",
group: None,
kind: Some(
CodeActionKind(
"quickfix",
),
),
edit: Some(
SnippetWorkspaceEdit {
changes: Some(
{
Url {
scheme: "file",
host: None,
port: None,
path: "/test/driver/subcommand/repl.rs",
query: None,
fragment: None,
}: [
TextEdit {
range: Range {
start: Position {
line: 290,
character: 8,
},
end: Position {
line: 290,
character: 11,
},
},
new_text: "_foo",
},
],
},
),
document_changes: None,
},
),
is_preferred: Some(
true,
),
data: None,
},
],
}, },
MappedRustDiagnostic { MappedRustDiagnostic {
url: Url { url: Url {

47
crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt
View File

@@ -66,52 +66,7 @@
), ),
data: None, data: None,
}, },
fixes: [ fixes: [],
CodeAction {
title: "consider prefixing with an underscore",
group: None,
kind: Some(
CodeActionKind(
"quickfix",
),
),
edit: Some(
SnippetWorkspaceEdit {
changes: Some(
{
Url {
scheme: "file",
host: None,
port: None,
path: "/test/driver/subcommand/repl.rs",
query: None,
fragment: None,
}: [
TextEdit {
range: Range {
start: Position {
line: 290,
character: 8,
},
end: Position {
line: 290,
character: 11,
},
},
new_text: "_foo",
},
],
},
),
document_changes: None,
},
),
is_preferred: Some(
true,
),
data: None,
},
],
}, },
MappedRustDiagnostic { MappedRustDiagnostic {
url: Url { url: Url {

47
crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt
View File

@@ -66,52 +66,7 @@
), ),
data: None, data: None,
}, },
fixes: [ fixes: [],
CodeAction {
title: "consider prefixing with an underscore",
group: None,
kind: Some(
CodeActionKind(
"quickfix",
),
),
edit: Some(
SnippetWorkspaceEdit {
changes: Some(
{
Url {
scheme: "file",
host: None,
port: None,
path: "/test/driver/subcommand/repl.rs",
query: None,
fragment: None,
}: [
TextEdit {
range: Range {
start: Position {
line: 290,
character: 8,
},
end: Position {
line: 290,
character: 11,
},
},
new_text: "_foo",
},
],
},
),
document_changes: None,
},
),
is_preferred: Some(
true,
),
data: None,
},
],
}, },
MappedRustDiagnostic { MappedRustDiagnostic {
url: Url { url: Url {

120
crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt
View File

@@ -102,65 +102,7 @@
tags: None, tags: None,
data: None, data: None,
}, },
fixes: [ fixes: [],
CodeAction {
title: "return the expression directly",
group: None,
kind: Some(
CodeActionKind(
"quickfix",
),
),
edit: Some(
SnippetWorkspaceEdit {
changes: Some(
{
Url {
scheme: "file",
host: None,
port: None,
path: "/test/src/main.rs",
query: None,
fragment: None,
}: [
TextEdit {
range: Range {
start: Position {
line: 2,
character: 4,
},
end: Position {
line: 2,
character: 30,
},
},
new_text: "",
},
TextEdit {
range: Range {
start: Position {
line: 3,
character: 4,
},
end: Position {
line: 3,
character: 5,
},
},
new_text: "(0..10).collect()",
},
],
},
),
document_changes: None,
},
),
is_preferred: Some(
true,
),
data: None,
},
],
}, },
MappedRustDiagnostic { MappedRustDiagnostic {
url: Url { url: Url {
@@ -242,65 +184,7 @@
tags: None, tags: None,
data: None, data: None,
}, },
fixes: [ fixes: [],
CodeAction {
title: "return the expression directly",
group: None,
kind: Some(
CodeActionKind(
"quickfix",
),
),
edit: Some(
SnippetWorkspaceEdit {
changes: Some(
{
Url {
scheme: "file",
host: None,
port: None,
path: "/test/src/main.rs",
query: None,
fragment: None,
}: [
TextEdit {
range: Range {
start: Position {
line: 2,
character: 4,
},
end: Position {
line: 2,
character: 30,
},
},
new_text: "",
},
TextEdit {
range: Range {
start: Position {
line: 3,
character: 4,
},
end: Position {
line: 3,
character: 5,
},
},
new_text: "(0..10).collect()",
},
],
},
),
document_changes: None,
},
),
is_preferred: Some(
true,
),
data: None,
},
],
}, },
MappedRustDiagnostic { MappedRustDiagnostic {
url: Url { url: Url {

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

@@ -74,11 +74,13 @@ fn diagnostic_related_information(
Some(lsp_types::DiagnosticRelatedInformation { location, message }) Some(lsp_types::DiagnosticRelatedInformation { location, message })
} }
enum MappedRustChildDiagnostic { struct SubDiagnostic {
Related {
related: lsp_types::DiagnosticRelatedInformation, related: lsp_types::DiagnosticRelatedInformation,
suggested_fix: Option<lsp_ext::CodeAction>, suggested_fix: Option<lsp_ext::CodeAction>,
}, }
enum MappedRustChildDiagnostic {
SubDiagnostic(SubDiagnostic),
MessageLine(String), MessageLine(String),
} }
@@ -105,15 +107,15 @@ fn map_rust_child_diagnostic(
} }
if edit_map.is_empty() { if edit_map.is_empty() {
MappedRustChildDiagnostic::Related { MappedRustChildDiagnostic::SubDiagnostic(SubDiagnostic {
related: lsp_types::DiagnosticRelatedInformation { related: lsp_types::DiagnosticRelatedInformation {
location: location(workspace_root, spans[0]), location: location(workspace_root, spans[0]),
message: rd.message.clone(), message: rd.message.clone(),
}, },
suggested_fix: None, suggested_fix: None,
} })
} else { } else {
MappedRustChildDiagnostic::Related { MappedRustChildDiagnostic::SubDiagnostic(SubDiagnostic {
related: lsp_types::DiagnosticRelatedInformation { related: lsp_types::DiagnosticRelatedInformation {
location: location(workspace_root, spans[0]), location: location(workspace_root, spans[0]),
message: rd.message.clone(), message: rd.message.clone(),
@@ -130,7 +132,7 @@ fn map_rust_child_diagnostic(
is_preferred: Some(true), is_preferred: Some(true),
data: None, data: None,
}), }),
} })
} }
} }
@@ -175,26 +177,22 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
} }
let mut needs_primary_span_label = true; let mut needs_primary_span_label = true;
let mut related_information = Vec::new(); let mut subdiagnostics = Vec::new();
let mut tags = Vec::new(); let mut tags = Vec::new();
for secondary_span in rd.spans.iter().filter(|s| !s.is_primary) { for secondary_span in rd.spans.iter().filter(|s| !s.is_primary) {
let related = diagnostic_related_information(workspace_root, secondary_span); let related = diagnostic_related_information(workspace_root, secondary_span);
if let Some(related) = related { if let Some(related) = related {
related_information.push(related); subdiagnostics.push(SubDiagnostic { related, suggested_fix: None });
} }
} }
let mut fixes = Vec::new();
let mut message = rd.message.clone(); let mut message = rd.message.clone();
for child in &rd.children { for child in &rd.children {
let child = map_rust_child_diagnostic(workspace_root, &child); let child = map_rust_child_diagnostic(workspace_root, &child);
match child { match child {
MappedRustChildDiagnostic::Related { related, suggested_fix } => { MappedRustChildDiagnostic::SubDiagnostic(sub) => {
related_information.push(related); subdiagnostics.push(sub);
if let Some(code_action) = suggested_fix {
fixes.push(code_action);
}
} }
MappedRustChildDiagnostic::MessageLine(message_line) => { MappedRustChildDiagnostic::MessageLine(message_line) => {
format_to!(message, "\n{}", message_line); format_to!(message, "\n{}", message_line);
@@ -284,7 +282,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
diagnostics.push(MappedRustDiagnostic { diagnostics.push(MappedRustDiagnostic {
url: in_macro_location.uri, url: in_macro_location.uri,
diagnostic, diagnostic,
fixes: fixes.clone(), fixes: Vec::new(),
}); });
} }
@@ -298,17 +296,20 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
code_description: code_description.clone(), code_description: code_description.clone(),
source: Some(source.clone()), source: Some(source.clone()),
message, message,
related_information: if related_information.is_empty() { related_information: if subdiagnostics.is_empty() {
None None
} else { } else {
let mut related = related_information.clone(); let mut related = subdiagnostics
.iter()
.map(|sub| sub.related.clone())
.collect::<Vec<_>>();
related.extend(related_macro_info); related.extend(related_macro_info);
Some(related) Some(related)
}, },
tags: if tags.is_empty() { None } else { Some(tags.clone()) }, tags: if tags.is_empty() { None } else { Some(tags.clone()) },
data: None, data: None,
}, },
fixes: fixes.clone(), fixes: Vec::new(),
}); });
// Emit hint-level diagnostics for all `related_information` entries such as "help"s. // Emit hint-level diagnostics for all `related_information` entries such as "help"s.
@@ -318,21 +319,21 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
location, location,
message: "original diagnostic".to_string(), message: "original diagnostic".to_string(),
}; };
for info in &related_information { for sub in &subdiagnostics {
// Filter out empty/non-existent messages, as they greatly confuse VS Code. // Filter out empty/non-existent messages, as they greatly confuse VS Code.
if info.message.is_empty() { if sub.related.message.is_empty() {
continue; continue;
} }
diagnostics.push(MappedRustDiagnostic { diagnostics.push(MappedRustDiagnostic {
url: info.location.uri.clone(), url: sub.related.location.uri.clone(),
fixes: fixes.clone(), // share fixes to make them easier to apply fixes: sub.suggested_fix.iter().cloned().collect(),
diagnostic: lsp_types::Diagnostic { diagnostic: lsp_types::Diagnostic {
range: info.location.range, range: sub.related.location.range,
severity: Some(lsp_types::DiagnosticSeverity::Hint), severity: Some(lsp_types::DiagnosticSeverity::Hint),
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: info.message.clone(), message: sub.related.message.clone(),
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,