language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Resolve single assist only

Browse source
This commit is contained in:
Kirill Bulatov 2021-05-03 18:03:28 +03:00
parent e5cdcb8b12
commit 1679a376f3
9 changed files with 78 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -522,7 +522,7 @@ impl Analysis {
frange: FileRange,
) -> Cancelable<Vec<Assist>> {
self.with_db(|db| {
let ssr_assists = ssr::ssr_assists(db, resolve, frange);
let ssr_assists = ssr::ssr_assists(db, &resolve, frange);
let mut acc = Assist::get(db, config, resolve, frange);
acc.extend(ssr_assists.into_iter());
acc
@ -536,7 +536,7 @@ impl Analysis {
resolve: AssistResolveStrategy,
file_id: FileId,
) -> Cancelable<Vec<Diagnostic>> {
self.with_db(|db| diagnostics::diagnostics(db, config, resolve, file_id))
self.with_db(|db| diagnostics::diagnostics(db, config, &resolve, file_id))
}
/// Convenience function to return assists + quick fixes for diagnostics
@ -553,9 +553,9 @@ impl Analysis {
};
self.with_db(|db| {
let ssr_assists = ssr::ssr_assists(db, resolve, frange);
let ssr_assists = ssr::ssr_assists(db, &resolve, frange);
let diagnostic_assists = if include_fixes {
diagnostics::diagnostics(db, diagnostics_config, resolve, frange.file_id)
diagnostics::diagnostics(db, diagnostics_config, &resolve, frange.file_id)
.into_iter()
.filter_map(|it| it.fix)
.filter(|it| it.target.intersect(frange.range).is_some())