From c1139a5a4404f3a36c3b826d4ceb0b53da7c69b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Wed, 1 Jul 2020 11:48:15 +0300 Subject: Use the existing Semantics in auto_import --- crates/ra_assists/src/handlers/auto_import.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_assists') diff --git a/crates/ra_assists/src/handlers/auto_import.rs b/crates/ra_assists/src/handlers/auto_import.rs index e8060a491..7b6499a08 100644 --- a/crates/ra_assists/src/handlers/auto_import.rs +++ b/crates/ra_assists/src/handlers/auto_import.rs @@ -5,7 +5,7 @@ use hir::{ AsAssocItem, AssocItemContainer, ModPath, Module, ModuleDef, PathResolution, Semantics, Trait, Type, }; -use ra_ide_db::{imports_locator::ImportsLocator, RootDatabase}; +use ra_ide_db::{imports_locator, RootDatabase}; use ra_prof::profile; use ra_syntax::{ ast::{self, AstNode}, @@ -35,8 +35,8 @@ use crate::{utils::insert_use_statement, AssistContext, AssistId, Assists, Group // # pub mod std { pub mod collections { pub struct HashMap { } } } // ``` pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { - let auto_import_assets = AutoImportAssets::new(&ctx)?; - let proposed_imports = auto_import_assets.search_for_imports(ctx.db()); + let auto_import_assets = AutoImportAssets::new(ctx)?; + let proposed_imports = auto_import_assets.search_for_imports(ctx); if proposed_imports.is_empty() { return None; } @@ -127,11 +127,11 @@ impl AutoImportAssets { GroupLabel(name) } - fn search_for_imports(&self, db: &RootDatabase) -> BTreeSet { + fn search_for_imports(&self, ctx: &AssistContext) -> BTreeSet { let _p = profile("auto_import::search_for_imports"); + let db = ctx.db(); let current_crate = self.module_with_name_to_import.krate(); - ImportsLocator::new(db, current_crate) - .find_imports(&self.get_search_query()) + imports_locator::find_imports(&ctx.sema, current_crate, &self.get_search_query()) .into_iter() .filter_map(|candidate| match &self.import_candidate { ImportCandidate::TraitAssocItem(assoc_item_type, _) => { -- cgit v1.2.3