From e58f63dc631abcc0cb9eb9f3bdc8991b320dbbd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Tue, 15 Jun 2021 20:55:27 +0300 Subject: Show diagnostic fixes before assists --- crates/ide/src/lib.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 9db387d26..4bd073cc3 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs @@ -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 }) -- cgit v1.2.3