collect all submodules

2 files changed, 30 insertions, 20 deletions

diff --git a/crates/ra_analysis/src/descriptors/mod.rs b/crates/ra_analysis/src/descriptors/mod.rs
index 775949a88..56bde3849 100644
--- a/crates/ra_analysis/src/descriptors/mod.rs
+++ b/crates/ra_analysis/src/descriptors/mod.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 
 use ra_syntax::{
     ast::{self, AstNode, FnDefNode},
-    SmolStr, TextRange,
+    TextRange,
 };
 
 use crate::{
@@ -14,7 +14,7 @@ use crate::{
     descriptors::module::{ModuleId, ModuleScope, ModuleTree, ModuleSource},
     input::SourceRootId,
     syntax_ptr::LocalSyntaxPtr,
-    Cancelable, FileId,
+    Cancelable,
 };
 
 salsa::query_group! {
diff --git a/crates/ra_analysis/src/descriptors/module/imp.rs b/crates/ra_analysis/src/descriptors/module/imp.rs
index b9cd81739..d67ffa9de 100644
--- a/crates/ra_analysis/src/descriptors/module/imp.rs
+++ b/crates/ra_analysis/src/descriptors/module/imp.rs
@@ -21,7 +21,7 @@ use super::{
 
 #[derive(Clone, Hash, PartialEq, Eq, Debug)]
 pub(crate) struct Submodule {
-    name: SmolStr
+    name: SmolStr,
 }
 
 pub(crate) fn submodules(
@@ -29,26 +29,36 @@ pub(crate) fn submodules(
     source: ModuleSource,
 ) -> Cancelable<Arc<Vec<Submodule>>> {
     db::check_canceled(db)?;
-    let file_id = match source {
-        ModuleSource::File(it) => it,
-        _ => unimplemented!(),
+    let submodules = match source.resolve(db) {
+        ModuleSourceNode::Root(it) => collect_submodules(it.ast()),
+        ModuleSourceNode::Inline(it) => it
+            .ast()
+            .item_list()
+            .map(collect_submodules)
+            .unwrap_or_else(Vec::new),
     };
-    let file = db.file_syntax(file_id);
-    let root = file.ast();
-    let submodules = modules(root)
-        .map(|(name, _)| Submodule { name })
-        .collect();
-    Ok(Arc::new(submodules))
+    return Ok(Arc::new(submodules));
+
+    fn collect_submodules<'a>(root: impl ast::ModuleItemOwner<'a>) -> Vec<Submodule> {
+        modules(root)
+            .filter(|(_, m)| m.has_semi())
+            .map(|(name, _)| Submodule { name })
+            .collect()
+    }
 }
 
-pub(crate) fn modules(root: ast::Root<'_>) -> impl Iterator<Item = (SmolStr, ast::Module<'_>)> {
-    root.modules().filter_map(|module| {
-        let name = module.name()?.text();
-        if !module.has_semi() {
-            return None;
-        }
-        Some((name, module))
-    })
+pub(crate) fn modules<'a>(
+    root: impl ast::ModuleItemOwner<'a>,
+) -> impl Iterator<Item = (SmolStr, ast::Module<'a>)> {
+    root.items()
+        .filter_map(|item| match item {
+            ast::ModuleItem::Module(m) => Some(m),
+            _ => None,
+        })
+        .filter_map(|module| {
+            let name = module.name()?.text();
+            Some((name, module))
+        })
 }
 
 pub(crate) fn module_scope(