diff options
Diffstat (limited to 'crates/ra_hir_def/src/body.rs')
-rw-r--r-- | crates/ra_hir_def/src/body.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs index 5d8c299ba..1c9c86449 100644 --- a/crates/ra_hir_def/src/body.rs +++ b/crates/ra_hir_def/src/body.rs | |||
@@ -18,6 +18,7 @@ use crate::{ | |||
18 | 18 | ||
19 | pub struct Expander { | 19 | pub struct Expander { |
20 | crate_def_map: Arc<CrateDefMap>, | 20 | crate_def_map: Arc<CrateDefMap>, |
21 | original_file_id: HirFileId, | ||
21 | current_file_id: HirFileId, | 22 | current_file_id: HirFileId, |
22 | module: ModuleId, | 23 | module: ModuleId, |
23 | } | 24 | } |
@@ -25,7 +26,12 @@ pub struct Expander { | |||
25 | impl Expander { | 26 | impl Expander { |
26 | pub fn new(db: &impl DefDatabase2, current_file_id: HirFileId, module: ModuleId) -> Expander { | 27 | pub fn new(db: &impl DefDatabase2, current_file_id: HirFileId, module: ModuleId) -> Expander { |
27 | let crate_def_map = db.crate_def_map(module.krate); | 28 | let crate_def_map = db.crate_def_map(module.krate); |
28 | Expander { crate_def_map, current_file_id, module } | 29 | Expander { crate_def_map, original_file_id: current_file_id, current_file_id, module } |
30 | } | ||
31 | |||
32 | // FIXME: remove this. | ||
33 | fn is_in_expansion(&self) -> bool { | ||
34 | self.original_file_id != self.current_file_id | ||
29 | } | 35 | } |
30 | 36 | ||
31 | fn resolve_path_as_macro(&self, db: &impl DefDatabase2, path: &Path) -> Option<MacroDefId> { | 37 | fn resolve_path_as_macro(&self, db: &impl DefDatabase2, path: &Path) -> Option<MacroDefId> { |