From d221ff4f9e0e270939a2944a2471bc3f027a674b Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Mon, 23 Mar 2020 00:19:55 +0200 Subject: [PATCH] Auto import macros --- crates/ra_assists/src/ast_transform.rs | 2 +- crates/ra_assists/src/handlers/auto_import.rs | 34 ++++++++++++------- .../src/handlers/fill_match_arms.rs | 5 +-- crates/ra_hir/src/code_model.rs | 31 ++++++++++------- crates/ra_ide_db/src/imports_locator.rs | 8 ++--- 5 files changed, 46 insertions(+), 34 deletions(-) diff --git a/crates/ra_assists/src/ast_transform.rs b/crates/ra_assists/src/ast_transform.rs index 45558c4487..34c816f162 100644 --- a/crates/ra_assists/src/ast_transform.rs +++ b/crates/ra_assists/src/ast_transform.rs @@ -129,7 +129,7 @@ impl<'a> QualifyPaths<'a> { let resolution = self.source_scope.resolve_hir_path(&hir_path?)?; match resolution { PathResolution::Def(def) => { - let found_path = from.find_use_path(self.source_scope.db, def)?; + let found_path = from.find_use_path(self.source_scope.db, def.into())?; let mut path = path_to_ast(found_path); let type_args = p diff --git a/crates/ra_assists/src/handlers/auto_import.rs b/crates/ra_assists/src/handlers/auto_import.rs index bb280f633d..49d8c4c3d0 100644 --- a/crates/ra_assists/src/handlers/auto_import.rs +++ b/crates/ra_assists/src/handlers/auto_import.rs @@ -4,7 +4,7 @@ use hir::{ AsAssocItem, AssocItemContainer, ModPath, Module, ModuleDef, PathResolution, Semantics, Trait, Type, }; -use ra_ide_db::{imports_locator::ImportsLocator, RootDatabase}; +use ra_ide_db::{defs::Definition, imports_locator::ImportsLocator, RootDatabase}; use ra_prof::profile; use ra_syntax::{ ast::{self, AstNode}, @@ -127,14 +127,16 @@ impl AutoImportAssets { ImportsLocator::new(db) .find_imports(&self.get_search_query()) .into_iter() - .filter_map(|module_def| match &self.import_candidate { + .filter_map(|definition| match &self.import_candidate { ImportCandidate::TraitAssocItem(assoc_item_type, _) => { - let located_assoc_item = match module_def { - ModuleDef::Function(located_function) => located_function - .as_assoc_item(db) - .map(|assoc| assoc.container(db)) - .and_then(Self::assoc_to_trait), - ModuleDef::Const(located_const) => located_const + let located_assoc_item = match definition { + Definition::ModuleDef(ModuleDef::Function(located_function)) => { + located_function + .as_assoc_item(db) + .map(|assoc| assoc.container(db)) + .and_then(Self::assoc_to_trait) + } + Definition::ModuleDef(ModuleDef::Const(located_const)) => located_const .as_assoc_item(db) .map(|assoc| assoc.container(db)) .and_then(Self::assoc_to_trait), @@ -152,11 +154,13 @@ impl AutoImportAssets { None, |_, assoc| Self::assoc_to_trait(assoc.container(db)), ) - .map(ModuleDef::from) + .map(|located_trait| ModuleDef::from(located_trait).into()) } ImportCandidate::TraitMethod(function_callee, _) => { let located_assoc_item = - if let ModuleDef::Function(located_function) = module_def { + if let Definition::ModuleDef(ModuleDef::Function(located_function)) = + definition + { located_function .as_assoc_item(db) .map(|assoc| assoc.container(db)) @@ -178,11 +182,15 @@ impl AutoImportAssets { Self::assoc_to_trait(function.as_assoc_item(db)?.container(db)) }, ) - .map(ModuleDef::from) + .map(|located_trait| ModuleDef::from(located_trait).into()) } - _ => Some(module_def), + _ => match definition { + Definition::ModuleDef(module_def) => Some(module_def.into()), + Definition::Macro(macro_def) => Some(macro_def.into()), + _ => None, + }, }) - .filter_map(|module_def| self.module_with_name_to_import.find_use_path(db, module_def)) + .filter_map(|item| self.module_with_name_to_import.find_use_path(db, item)) .filter(|use_path| !use_path.segments.is_empty()) .take(20) .collect::>() diff --git a/crates/ra_assists/src/handlers/fill_match_arms.rs b/crates/ra_assists/src/handlers/fill_match_arms.rs index 7463b2af77..869942b120 100644 --- a/crates/ra_assists/src/handlers/fill_match_arms.rs +++ b/crates/ra_assists/src/handlers/fill_match_arms.rs @@ -2,7 +2,7 @@ use std::iter; -use hir::{Adt, HasSource, Semantics}; +use hir::{Adt, HasSource, ModuleDef, Semantics}; use itertools::Itertools; use ra_ide_db::RootDatabase; @@ -154,7 +154,8 @@ fn resolve_tuple_of_enum_def( } fn build_pat(db: &RootDatabase, module: hir::Module, var: hir::EnumVariant) -> Option { - let path = crate::ast_transform::path_to_ast(module.find_use_path(db, var.into())?); + let path = + crate::ast_transform::path_to_ast(module.find_use_path(db, ModuleDef::from(var).into())?); // FIXME: use HIR for this; it doesn't currently expose struct vs. tuple vs. unit variants though let pat: ast::Pat = match var.source(db).value.kind() { diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index e91abf6f58..146e7820e6 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -139,6 +139,17 @@ impl ModuleDef { } } +impl From for ItemInNs { + fn from(module_def: ModuleDef) -> Self { + match module_def { + ModuleDef::Static(_) | ModuleDef::Const(_) | ModuleDef::Function(_) => { + ItemInNs::Values(module_def.into()) + } + _ => ItemInNs::Types(module_def.into()), + } + } +} + pub use hir_def::{ attr::Attrs, item_scope::ItemInNs, visibility::Visibility, AssocItemId, AssocItemLoc, }; @@ -275,19 +286,9 @@ impl Module { pub fn find_use_path( self, db: &dyn HirDatabase, - item: ModuleDef, + item: ItemInNs, ) -> Option { - // FIXME expose namespace choice - hir_def::find_path::find_path(db.upcast(), determine_item_namespace(item), self.into()) - } -} - -fn determine_item_namespace(module_def: ModuleDef) -> ItemInNs { - match module_def { - ModuleDef::Static(_) | ModuleDef::Const(_) | ModuleDef::Function(_) => { - ItemInNs::Values(module_def.into()) - } - _ => ItemInNs::Types(module_def.into()), + hir_def::find_path::find_path(db.upcast(), item, self.into()) } } @@ -759,6 +760,12 @@ impl MacroDef { } } +impl From for ItemInNs { + fn from(macro_def: MacroDef) -> Self { + ItemInNs::Macros(macro_def.into()) + } +} + /// Invariant: `inner.as_assoc_item(db).is_some()` /// We do not actively enforce this invariant. #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] diff --git a/crates/ra_ide_db/src/imports_locator.rs b/crates/ra_ide_db/src/imports_locator.rs index c963519829..24b6e4ad00 100644 --- a/crates/ra_ide_db/src/imports_locator.rs +++ b/crates/ra_ide_db/src/imports_locator.rs @@ -1,7 +1,7 @@ //! This module contains an import search funcionality that is provided to the ra_assists module. //! Later, this should be moved away to a separate crate that is accessible from the ra_assists module. -use hir::{ModuleDef, Semantics}; +use hir::Semantics; use ra_prof::profile; use ra_syntax::{ast, AstNode, SyntaxKind::NAME}; @@ -20,7 +20,7 @@ impl<'a> ImportsLocator<'a> { Self { sema: Semantics::new(db) } } - pub fn find_imports(&mut self, name_to_import: &str) -> Vec { + pub fn find_imports(&mut self, name_to_import: &str) -> Vec { let _p = profile("search_for_imports"); let db = self.sema.db; @@ -42,10 +42,6 @@ impl<'a> ImportsLocator<'a> { .into_iter() .chain(lib_results.into_iter()) .filter_map(|import_candidate| self.get_name_definition(&import_candidate)) - .filter_map(|name_definition_to_import| match name_definition_to_import { - Definition::ModuleDef(module_def) => Some(module_def), - _ => None, - }) .collect() }