Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-16 17:58:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show diagnostic fixes before assists

Browse source
This commit is contained in:
Laurențiu Nicola 2021-06-15 20:55:27 +03:00
parent 7f482afada
commit e58f63dc63
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/ide/src/lib.rs
View file

@ -567,7 +567,6 @@ impl Analysis {
};
self.with_db(|db| {
let ssr_assists = ssr::ssr_assists(db, &resolve, frange);
let diagnostic_assists = if include_fixes {
ide_diagnostics::diagnostics(db, diagnostics_config, &resolve, frange.file_id)
.into_iter()
@ -577,10 +576,12 @@ impl Analysis {
} else {
Vec::new()
};
let ssr_assists = ssr::ssr_assists(db, &resolve, frange);
let assists = ide_assists::assists(db, assist_config, resolve, frange);
let mut res = ide_assists::assists(db, assist_config, resolve, frange);
let mut res = diagnostic_assists;
res.extend(ssr_assists.into_iter());
res.extend(diagnostic_assists.into_iter());
res.extend(assists.into_iter());
res
})