From d221ff4f9e0e270939a2944a2471bc3f027a674b Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Mon, 23 Mar 2020 00:19:55 +0200 Subject: Auto import macros --- crates/ra_assists/src/ast_transform.rs | 2 +- crates/ra_assists/src/handlers/auto_import.rs | 34 ++++++++++++++--------- crates/ra_assists/src/handlers/fill_match_arms.rs | 5 ++-- 3 files changed, 25 insertions(+), 16 deletions(-) (limited to 'crates/ra_assists') diff --git a/crates/ra_assists/src/ast_transform.rs b/crates/ra_assists/src/ast_transform.rs index 45558c448..34c816f16 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 bb280f633..49d8c4c3d 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 7463b2af7..869942b12 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() { -- cgit v1.2.3 From 944f28fe5bf2b8e4316cc67bf5f824333fc4f180 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Mon, 23 Mar 2020 13:34:56 +0200 Subject: Use more generic public api --- crates/ra_assists/Cargo.toml | 1 + crates/ra_assists/src/ast_transform.rs | 2 +- crates/ra_assists/src/handlers/auto_import.rs | 44 ++++++++++++----------- crates/ra_assists/src/handlers/fill_match_arms.rs | 3 +- 4 files changed, 26 insertions(+), 24 deletions(-) (limited to 'crates/ra_assists') diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml index 707746ad5..a87f4052a 100644 --- a/crates/ra_assists/Cargo.toml +++ b/crates/ra_assists/Cargo.toml @@ -12,6 +12,7 @@ format-buf = "1.0.0" join_to_string = "0.1.3" rustc-hash = "1.1.0" itertools = "0.9.0" +either = "1.5.3" ra_syntax = { path = "../ra_syntax" } ra_text_edit = { path = "../ra_text_edit" } diff --git a/crates/ra_assists/src/ast_transform.rs b/crates/ra_assists/src/ast_transform.rs index 34c816f16..45558c448 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.into())?; + let found_path = from.find_use_path(self.source_scope.db, def)?; 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 49d8c4c3d..443eeaaf0 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::{defs::Definition, imports_locator::ImportsLocator, RootDatabase}; +use ra_ide_db::{imports_locator::ImportsLocator, RootDatabase}; use ra_prof::profile; use ra_syntax::{ ast::{self, AstNode}, @@ -17,6 +17,7 @@ use crate::{ utils::insert_use_statement, AssistId, }; +use either::Either; // Assist: auto_import // @@ -127,16 +128,14 @@ impl AutoImportAssets { ImportsLocator::new(db) .find_imports(&self.get_search_query()) .into_iter() - .filter_map(|definition| match &self.import_candidate { + .filter_map(|candidate| match &self.import_candidate { ImportCandidate::TraitAssocItem(assoc_item_type, _) => { - 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 + let located_assoc_item = match candidate { + Either::Left(ModuleDef::Function(located_function)) => located_function + .as_assoc_item(db) + .map(|assoc| assoc.container(db)) + .and_then(Self::assoc_to_trait), + Either::Left(ModuleDef::Const(located_const)) => located_const .as_assoc_item(db) .map(|assoc| assoc.container(db)) .and_then(Self::assoc_to_trait), @@ -154,13 +153,12 @@ impl AutoImportAssets { None, |_, assoc| Self::assoc_to_trait(assoc.container(db)), ) - .map(|located_trait| ModuleDef::from(located_trait).into()) + .map(ModuleDef::from) + .map(Either::Left) } ImportCandidate::TraitMethod(function_callee, _) => { let located_assoc_item = - if let Definition::ModuleDef(ModuleDef::Function(located_function)) = - definition - { + if let Either::Left(ModuleDef::Function(located_function)) = candidate { located_function .as_assoc_item(db) .map(|assoc| assoc.container(db)) @@ -182,15 +180,19 @@ impl AutoImportAssets { Self::assoc_to_trait(function.as_assoc_item(db)?.container(db)) }, ) - .map(|located_trait| ModuleDef::from(located_trait).into()) + .map(ModuleDef::from) + .map(Either::Left) + } + _ => Some(candidate), + }) + .filter_map(|candidate| match candidate { + Either::Left(module_def) => { + self.module_with_name_to_import.find_use_path(db, module_def) + } + Either::Right(macro_def) => { + self.module_with_name_to_import.find_use_path(db, macro_def) } - _ => match definition { - Definition::ModuleDef(module_def) => Some(module_def.into()), - Definition::Macro(macro_def) => Some(macro_def.into()), - _ => None, - }, }) - .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 869942b12..88b4c8926 100644 --- a/crates/ra_assists/src/handlers/fill_match_arms.rs +++ b/crates/ra_assists/src/handlers/fill_match_arms.rs @@ -154,8 +154,7 @@ 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, ModuleDef::from(var).into())?); + let path = crate::ast_transform::path_to_ast(module.find_use_path(db, ModuleDef::from(var))?); // 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() { -- cgit v1.2.3 From dd3b64124b086cf68c3f8b1e838601b5770a9795 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Mon, 23 Mar 2020 23:23:26 +0200 Subject: Add a test --- crates/ra_assists/src/handlers/auto_import.rs | 25 +++++++++++++++++++++++ crates/ra_assists/src/lib.rs | 29 ++++++++++++++++++--------- 2 files changed, 45 insertions(+), 9 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 443eeaaf0..99682e023 100644 --- a/crates/ra_assists/src/handlers/auto_import.rs +++ b/crates/ra_assists/src/handlers/auto_import.rs @@ -59,6 +59,7 @@ pub(crate) fn auto_import(ctx: AssistCtx) -> Option { group.finish() } +#[derive(Debug)] struct AutoImportAssets { import_candidate: ImportCandidate, module_with_name_to_import: Module, @@ -449,6 +450,30 @@ mod tests { ); } + #[test] + fn macro_import() { + check_assist( + auto_import, + r" + //- /lib.rs crate:crate_with_macro + #[macro_export] + macro_rules! foo { + () => () + } + + //- /main.rs crate:main deps:crate_with_macro + fn main() { + foo<|> + }", + r"use crate_with_macro::foo; + +fn main() { + foo<|> +} +", + ); + } + #[test] fn auto_import_target() { check_assist_target( diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index b8704ea7d..bcc9b3f10 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs @@ -165,7 +165,6 @@ mod helpers { use ra_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt}; use ra_ide_db::{symbol_index::SymbolsDatabase, RootDatabase}; - use ra_syntax::TextRange; use test_utils::{add_cursor, assert_eq_text, extract_range_or_offset, RangeOrOffset}; use crate::{AssistCtx, AssistHandler}; @@ -175,8 +174,7 @@ mod helpers { let (mut db, file_id) = RootDatabase::with_single_file(text); // FIXME: ideally, this should be done by the above `RootDatabase::with_single_file`, // but it looks like this might need specialization? :( - let local_roots = vec![db.file_source_root(file_id)]; - db.set_local_roots(Arc::new(local_roots)); + db.set_local_roots(Arc::new(vec![db.file_source_root(file_id)])); (db, file_id) } @@ -206,11 +204,24 @@ mod helpers { } fn check(assist: AssistHandler, before: &str, expected: ExpectedResult) { - let (range_or_offset, before) = extract_range_or_offset(before); - let range: TextRange = range_or_offset.into(); + let (text_without_caret, file_with_caret_id, range_or_offset, db) = + if before.contains("//-") { + let (mut db, position) = RootDatabase::with_position(before); + db.set_local_roots(Arc::new(vec![db.file_source_root(position.file_id)])); + ( + db.file_text(position.file_id).as_ref().to_owned(), + position.file_id, + RangeOrOffset::Offset(position.offset), + db, + ) + } else { + let (range_or_offset, text_without_caret) = extract_range_or_offset(before); + let (db, file_id) = with_single_file(&text_without_caret); + (text_without_caret, file_id, range_or_offset, db) + }; + + let frange = FileRange { file_id: file_with_caret_id, range: range_or_offset.into() }; - let (db, file_id) = with_single_file(&before); - let frange = FileRange { file_id, range }; let sema = Semantics::new(&db); let assist_ctx = AssistCtx::new(&sema, frange, true); @@ -218,7 +229,7 @@ mod helpers { (Some(assist), ExpectedResult::After(after)) => { let action = assist.0[0].action.clone().unwrap(); - let mut actual = action.edit.apply(&before); + let mut actual = action.edit.apply(&text_without_caret); match action.cursor_position { None => { if let RangeOrOffset::Offset(before_cursor_pos) = range_or_offset { @@ -237,7 +248,7 @@ mod helpers { (Some(assist), ExpectedResult::Target(target)) => { let action = assist.0[0].action.clone().unwrap(); let range = action.target.expect("expected target on action"); - assert_eq_text!(&before[range], target); + assert_eq_text!(&text_without_caret[range], target); } (Some(_), ExpectedResult::NotApplicable) => panic!("assist should not be applicable!"), (None, ExpectedResult::After(_)) | (None, ExpectedResult::Target(_)) => { -- cgit v1.2.3