aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-06 16:50:01 +0000
committerGitHub <[email protected]>2020-02-06 16:50:01 +0000
commit895cdb588314f4e04529d1adf8cd232856497dad (patch)
tree6466cb45c30478eb0c413c25cc6d07cf23d39d3a /crates/ra_ide
parent8b957caf83b18b3fea153f770bfd0ed979227eff (diff)
parentd1e8b8d134da802eecef5cbcd5486bd542ad75b5 (diff)
Merge #3034
3034: Remove ImportLocator hack r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide')
-rw-r--r--crates/ra_ide/src/assists.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_ide/src/assists.rs b/crates/ra_ide/src/assists.rs
index 4a7d8cfa9..c3b2c638b 100644
--- a/crates/ra_ide/src/assists.rs
+++ b/crates/ra_ide/src/assists.rs
@@ -3,7 +3,7 @@
3use either::Either; 3use either::Either;
4use ra_assists::{AssistAction, AssistLabel}; 4use ra_assists::{AssistAction, AssistLabel};
5use ra_db::{FilePosition, FileRange}; 5use ra_db::{FilePosition, FileRange};
6use ra_ide_db::{imports_locator::ImportsLocatorIde, RootDatabase}; 6use ra_ide_db::RootDatabase;
7 7
8use crate::{FileId, SourceChange, SourceFileEdit}; 8use crate::{FileId, SourceChange, SourceFileEdit};
9 9
@@ -17,7 +17,7 @@ pub struct Assist {
17} 17}
18 18
19pub(crate) fn assists(db: &RootDatabase, frange: FileRange) -> Vec<Assist> { 19pub(crate) fn assists(db: &RootDatabase, frange: FileRange) -> Vec<Assist> {
20 ra_assists::assists_with_imports_locator(db, frange, ImportsLocatorIde::new(db)) 20 ra_assists::assists(db, frange)
21 .into_iter() 21 .into_iter()
22 .map(|assist| { 22 .map(|assist| {
23 let file_id = frange.file_id; 23 let file_id = frange.file_id;