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

Auto merge of #13887 - Veykril:rustc-diag-preferred, r=Veykril

Browse Source 
Only set machine-applicable rustc diagnostics as preferred

If they aren't machine applicable, then they might not be what the user wants, disrupting the workflow.
Example being:
![image](https://user-images.githubusercontent.com/3757771/210380233-ae25aa04-954e-4634-8dd1-4377cc2bd837.png)
Prior to the PR this the diagnostic quickfix was at the top, but usually isn't what the user wants.
This commit is contained in:
bors 2023-01-03 14:47:18 +00:00
commit a97c71f92d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,6 +191,7 @@ fn map_rust_child_diagnostic(
let mut edit_map: HashMap<lsp_types::Url, Vec<lsp_types::TextEdit>> = HashMap::new(); let mut edit_map: HashMap<lsp_types::Url, Vec<lsp_types::TextEdit>> = HashMap::new();
let mut suggested_replacements = Vec::new(); let mut suggested_replacements = Vec::new();
let mut is_preferred = true;
for &span in &spans { for &span in &spans {
if let Some(suggested_replacement) = &span.suggested_replacement { if let Some(suggested_replacement) = &span.suggested_replacement {
if !suggested_replacement.is_empty() { if !suggested_replacement.is_empty() {
@ -209,6 +210,8 @@ fn map_rust_child_diagnostic(
) { ) {
edit_map.entry(location.uri).or_default().push(edit); edit_map.entry(location.uri).or_default().push(edit);
} }
is_preferred &=
matches!(span.suggestion_applicability, Some(Applicability::MachineApplicable));
} }
} }
@ -251,7 +254,7 @@ fn map_rust_child_diagnostic(
document_changes: None, document_changes: None,
change_annotations: None, change_annotations: None,
}), }),
is_preferred: Some(true), is_preferred: Some(is_preferred),
data: None, data: None,
command: None, command: None,
}, },