diff options
Diffstat (limited to 'crates/ra_analysis/src/hir/query_definitions.rs')
-rw-r--r-- | crates/ra_analysis/src/hir/query_definitions.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/ra_analysis/src/hir/query_definitions.rs b/crates/ra_analysis/src/hir/query_definitions.rs index ae292e964..cdd986ce4 100644 --- a/crates/ra_analysis/src/hir/query_definitions.rs +++ b/crates/ra_analysis/src/hir/query_definitions.rs | |||
@@ -63,16 +63,17 @@ pub(crate) fn submodules( | |||
63 | db.check_canceled()?; | 63 | db.check_canceled()?; |
64 | let file_id = source.file_id(); | 64 | let file_id = source.file_id(); |
65 | let submodules = match source.resolve(db) { | 65 | let submodules = match source.resolve(db) { |
66 | ModuleSourceNode::SourceFile(it) => collect_submodules(file_id, it.borrowed()), | 66 | ModuleSourceNode::SourceFile(it) => collect_submodules(db, file_id, it.borrowed()), |
67 | ModuleSourceNode::Module(it) => it | 67 | ModuleSourceNode::Module(it) => it |
68 | .borrowed() | 68 | .borrowed() |
69 | .item_list() | 69 | .item_list() |
70 | .map(|it| collect_submodules(file_id, it)) | 70 | .map(|it| collect_submodules(db, file_id, it)) |
71 | .unwrap_or_else(Vec::new), | 71 | .unwrap_or_else(Vec::new), |
72 | }; | 72 | }; |
73 | return Ok(Arc::new(submodules)); | 73 | return Ok(Arc::new(submodules)); |
74 | 74 | ||
75 | fn collect_submodules<'a>( | 75 | fn collect_submodules<'a>( |
76 | db: &impl HirDatabase, | ||
76 | file_id: FileId, | 77 | file_id: FileId, |
77 | root: impl ast::ModuleItemOwner<'a>, | 78 | root: impl ast::ModuleItemOwner<'a>, |
78 | ) -> Vec<Submodule> { | 79 | ) -> Vec<Submodule> { |
@@ -81,7 +82,7 @@ pub(crate) fn submodules( | |||
81 | if m.has_semi() { | 82 | if m.has_semi() { |
82 | Submodule::Declaration(name) | 83 | Submodule::Declaration(name) |
83 | } else { | 84 | } else { |
84 | let src = ModuleSource::new_inline(file_id, m); | 85 | let src = ModuleSource::new_inline(db, file_id, m); |
85 | Submodule::Definition(name, src) | 86 | Submodule::Definition(name, src) |
86 | } | 87 | } |
87 | }) | 88 | }) |