From cd878658d3072ee0741cd04c16d330e7d5907f94 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 4 Nov 2018 20:07:25 +0300 Subject: Introduce modules_from_source fn --- crates/ra_analysis/src/descriptors/module/mod.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_analysis/src/descriptors/module') diff --git a/crates/ra_analysis/src/descriptors/module/mod.rs b/crates/ra_analysis/src/descriptors/module/mod.rs index e22489fc1..4e871d16d 100644 --- a/crates/ra_analysis/src/descriptors/module/mod.rs +++ b/crates/ra_analysis/src/descriptors/module/mod.rs @@ -25,15 +25,19 @@ pub(crate) struct ModuleTree { } impl ModuleTree { - pub(crate) fn modules_for_file(&self, file_id: FileId) -> Vec { + pub(crate) fn modules_for_source(&self, source: ModuleSource) -> Vec { self.mods .iter() .enumerate() - .filter(|(_idx, it)| it.source.is_file(file_id)) + .filter(|(_idx, it)| it.source == source) .map(|(idx, _)| ModuleId(idx as u32)) .collect() } + pub(crate) fn modules_for_file(&self, file_id: FileId) -> Vec { + self.modules_for_source(ModuleSource::File(file_id)) + } + pub(crate) fn any_module_for_file(&self, file_id: FileId) -> Option { self.modules_for_file(file_id).pop() } @@ -178,10 +182,6 @@ impl ModuleSource { } } } - - fn is_file(self, file_id: FileId) -> bool { - self.as_file() == Some(file_id) - } } #[derive(Hash, Debug, PartialEq, Eq)] -- cgit v1.2.3 From 88a15d10d543c09ef66a9f105c3dcdb5011abbee Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 4 Nov 2018 20:21:20 +0300 Subject: use module_for_source --- crates/ra_analysis/src/descriptors/module/mod.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'crates/ra_analysis/src/descriptors/module') diff --git a/crates/ra_analysis/src/descriptors/module/mod.rs b/crates/ra_analysis/src/descriptors/module/mod.rs index 4e871d16d..13bab0087 100644 --- a/crates/ra_analysis/src/descriptors/module/mod.rs +++ b/crates/ra_analysis/src/descriptors/module/mod.rs @@ -34,12 +34,8 @@ impl ModuleTree { .collect() } - pub(crate) fn modules_for_file(&self, file_id: FileId) -> Vec { - self.modules_for_source(ModuleSource::File(file_id)) - } - - pub(crate) fn any_module_for_file(&self, file_id: FileId) -> Option { - self.modules_for_file(file_id).pop() + pub(crate) fn any_module_for_source(&self, source: ModuleSource) -> Option { + self.modules_for_source(source).pop() } } -- cgit v1.2.3 From e0b21b98996b8296942c23864c711b2c1078178a Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 4 Nov 2018 20:38:50 +0300 Subject: submodules works with module sources --- crates/ra_analysis/src/descriptors/module/imp.rs | 29 +++++++++++++++--------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'crates/ra_analysis/src/descriptors/module') diff --git a/crates/ra_analysis/src/descriptors/module/imp.rs b/crates/ra_analysis/src/descriptors/module/imp.rs index 3a010ecf5..b9cd81739 100644 --- a/crates/ra_analysis/src/descriptors/module/imp.rs +++ b/crates/ra_analysis/src/descriptors/module/imp.rs @@ -19,14 +19,25 @@ use super::{ ModuleTree, Problem, }; +#[derive(Clone, Hash, PartialEq, Eq, Debug)] +pub(crate) struct Submodule { + name: SmolStr +} + pub(crate) fn submodules( db: &impl DescriptorDatabase, - file_id: FileId, -) -> Cancelable>> { + source: ModuleSource, +) -> Cancelable>> { db::check_canceled(db)?; + let file_id = match source { + ModuleSource::File(it) => it, + _ => unimplemented!(), + }; let file = db.file_syntax(file_id); let root = file.ast(); - let submodules = modules(root).map(|(name, _)| name).collect(); + let submodules = modules(root) + .map(|(name, _)| Submodule { name }) + .collect(); Ok(Arc::new(submodules)) } @@ -66,11 +77,6 @@ pub(crate) fn module_tree( Ok(Arc::new(res)) } -#[derive(Clone, Hash, PartialEq, Eq, Debug)] -pub struct Submodule { - pub name: SmolStr, -} - fn create_module_tree<'a>( db: &impl DescriptorDatabase, source_root: SourceRootId, @@ -118,10 +124,11 @@ fn build_subtree( parent, children: Vec::new(), }); - for name in db.submodules(file_id)?.iter() { - let (points_to, problem) = resolve_submodule(file_id, name, &source_root.file_resolver); + for sub in db.submodules(ModuleSource::File(file_id))?.iter() { + let name = sub.name.clone(); + let (points_to, problem) = resolve_submodule(file_id, &name, &source_root.file_resolver); let link = tree.push_link(LinkData { - name: name.clone(), + name, owner: id, points_to: Vec::new(), problem: None, -- cgit v1.2.3 From 17a88928f49f31b9b076ef66d57354f45032be56 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 5 Nov 2018 13:08:52 +0300 Subject: collect all submodules --- crates/ra_analysis/src/descriptors/module/imp.rs | 46 ++++++++++++++---------- 1 file changed, 28 insertions(+), 18 deletions(-) (limited to 'crates/ra_analysis/src/descriptors/module') 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>> { 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 { + modules(root) + .filter(|(_, m)| m.has_semi()) + .map(|(name, _)| Submodule { name }) + .collect() + } } -pub(crate) fn modules(root: ast::Root<'_>) -> impl Iterator)> { - 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)> { + 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( -- cgit v1.2.3 From 44d891938493cc32efd2e44d81bc76cc3bc391c0 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 5 Nov 2018 13:23:37 +0300 Subject: Submodule is enum --- crates/ra_analysis/src/descriptors/module/imp.rs | 77 +++++++++++++++++------- crates/ra_analysis/src/descriptors/module/mod.rs | 7 +++ 2 files changed, 63 insertions(+), 21 deletions(-) (limited to 'crates/ra_analysis/src/descriptors/module') diff --git a/crates/ra_analysis/src/descriptors/module/imp.rs b/crates/ra_analysis/src/descriptors/module/imp.rs index d67ffa9de..257a323ed 100644 --- a/crates/ra_analysis/src/descriptors/module/imp.rs +++ b/crates/ra_analysis/src/descriptors/module/imp.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use ra_syntax::{ - ast::{self, ModuleItemOwner, NameOwner}, + ast::{self, ModuleItemOwner, NameOwner, AstNode}, SmolStr, }; use relative_path::RelativePathBuf; @@ -12,6 +12,7 @@ use crate::{ descriptors::DescriptorDatabase, input::{SourceRoot, SourceRootId}, Cancelable, FileId, FileResolverImp, + syntax_ptr::SyntaxPtr, }; use super::{ @@ -20,8 +21,18 @@ use super::{ }; #[derive(Clone, Hash, PartialEq, Eq, Debug)] -pub(crate) struct Submodule { - name: SmolStr, +pub(crate) enum Submodule { + Declaration(SmolStr), + Definition(SmolStr, SyntaxPtr), +} + +impl Submodule { + fn name(&self) -> &SmolStr { + match self { + Submodule::Declaration(name) => name, + Submodule::Definition(name, _) => name, + } + } } pub(crate) fn submodules( @@ -29,20 +40,29 @@ pub(crate) fn submodules( source: ModuleSource, ) -> Cancelable>> { db::check_canceled(db)?; + let file_id = source.file_id(); let submodules = match source.resolve(db) { - ModuleSourceNode::Root(it) => collect_submodules(it.ast()), + ModuleSourceNode::Root(it) => collect_submodules(file_id, it.ast()), ModuleSourceNode::Inline(it) => it .ast() .item_list() - .map(collect_submodules) + .map(|it| collect_submodules(file_id, it)) .unwrap_or_else(Vec::new), }; return Ok(Arc::new(submodules)); - fn collect_submodules<'a>(root: impl ast::ModuleItemOwner<'a>) -> Vec { + fn collect_submodules<'a>( + file_id: FileId, + root: impl ast::ModuleItemOwner<'a>, + ) -> Vec { modules(root) - .filter(|(_, m)| m.has_semi()) - .map(|(name, _)| Submodule { name }) + .map(|(name, m)| { + if m.has_semi() { + Submodule::Declaration(name) + } else { + Submodule::Definition(name, SyntaxPtr::new(file_id, m.syntax())) + } + }) .collect() } } @@ -135,25 +155,40 @@ fn build_subtree( children: Vec::new(), }); for sub in db.submodules(ModuleSource::File(file_id))?.iter() { - let name = sub.name.clone(); - let (points_to, problem) = resolve_submodule(file_id, &name, &source_root.file_resolver); let link = tree.push_link(LinkData { - name, + name: sub.name().clone(), owner: id, points_to: Vec::new(), problem: None, }); - let points_to = points_to - .into_iter() - .map(|file_id| match roots.remove(&file_id) { - Some(module_id) => { - tree.module_mut(module_id).parent = Some(link); - Ok(module_id) - } - None => build_subtree(db, source_root, tree, visited, roots, Some(link), file_id), - }) - .collect::>>()?; + let (points_to, problem) = match sub { + Submodule::Declaration(name) => { + let (points_to, problem) = + resolve_submodule(file_id, &name, &source_root.file_resolver); + let points_to = points_to + .into_iter() + .map(|file_id| match roots.remove(&file_id) { + Some(module_id) => { + tree.module_mut(module_id).parent = Some(link); + Ok(module_id) + } + None => build_subtree( + db, + source_root, + tree, + visited, + roots, + Some(link), + file_id, + ), + }) + .collect::>>()?; + (points_to, problem) + } + Submodule::Definition(..) => continue, + }; + tree.link_mut(link).points_to = points_to; tree.link_mut(link).problem = problem; } diff --git a/crates/ra_analysis/src/descriptors/module/mod.rs b/crates/ra_analysis/src/descriptors/module/mod.rs index 13bab0087..8464b0618 100644 --- a/crates/ra_analysis/src/descriptors/module/mod.rs +++ b/crates/ra_analysis/src/descriptors/module/mod.rs @@ -164,6 +164,13 @@ impl ModuleSource { } } + fn file_id(self) -> FileId { + match self { + ModuleSource::File(f) => f, + ModuleSource::Inline(ptr) => ptr.file_id(), + } + } + fn resolve(self, db: &impl SyntaxDatabase) -> ModuleSourceNode { match self { ModuleSource::File(file_id) => { -- cgit v1.2.3 From 6bbcfca7aec6408cf27415ae6f965adc472d6f18 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 5 Nov 2018 14:10:20 +0300 Subject: Fully add inline modules to module tree --- crates/ra_analysis/src/descriptors/module/imp.rs | 49 ++++++++++++++++-------- crates/ra_analysis/src/descriptors/module/mod.rs | 12 ++++-- 2 files changed, 42 insertions(+), 19 deletions(-) (limited to 'crates/ra_analysis/src/descriptors/module') diff --git a/crates/ra_analysis/src/descriptors/module/imp.rs b/crates/ra_analysis/src/descriptors/module/imp.rs index 257a323ed..b3b1f1f21 100644 --- a/crates/ra_analysis/src/descriptors/module/imp.rs +++ b/crates/ra_analysis/src/descriptors/module/imp.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use ra_syntax::{ - ast::{self, ModuleItemOwner, NameOwner, AstNode}, + ast::{self, ModuleItemOwner, NameOwner}, SmolStr, }; use relative_path::RelativePathBuf; @@ -12,7 +12,6 @@ use crate::{ descriptors::DescriptorDatabase, input::{SourceRoot, SourceRootId}, Cancelable, FileId, FileResolverImp, - syntax_ptr::SyntaxPtr, }; use super::{ @@ -23,7 +22,7 @@ use super::{ #[derive(Clone, Hash, PartialEq, Eq, Debug)] pub(crate) enum Submodule { Declaration(SmolStr), - Definition(SmolStr, SyntaxPtr), + Definition(SmolStr, ModuleSource), } impl Submodule { @@ -60,7 +59,8 @@ pub(crate) fn submodules( if m.has_semi() { Submodule::Declaration(name) } else { - Submodule::Definition(name, SyntaxPtr::new(file_id, m.syntax())) + let src = ModuleSource::new_inline(file_id, m); + Submodule::Definition(name, src) } }) .collect() @@ -121,7 +121,8 @@ fn create_module_tree<'a>( let source_root = db.source_root(source_root); for &file_id in source_root.files.iter() { - if visited.contains(&file_id) { + let source = ModuleSource::File(file_id); + if visited.contains(&source) { continue; // TODO: use explicit crate_roots here } assert!(!roots.contains_key(&file_id)); @@ -132,7 +133,7 @@ fn create_module_tree<'a>( &mut visited, &mut roots, None, - file_id, + source, )?; roots.insert(file_id, module_id); } @@ -143,18 +144,18 @@ fn build_subtree( db: &impl DescriptorDatabase, source_root: &SourceRoot, tree: &mut ModuleTree, - visited: &mut FxHashSet, + visited: &mut FxHashSet, roots: &mut FxHashMap, parent: Option, - file_id: FileId, + source: ModuleSource, ) -> Cancelable { - visited.insert(file_id); + visited.insert(source); let id = tree.push_mod(ModuleData { - source: ModuleSource::File(file_id), + source, parent, children: Vec::new(), }); - for sub in db.submodules(ModuleSource::File(file_id))?.iter() { + for sub in db.submodules(source)?.iter() { let link = tree.push_link(LinkData { name: sub.name().clone(), owner: id, @@ -165,7 +166,7 @@ fn build_subtree( let (points_to, problem) = match sub { Submodule::Declaration(name) => { let (points_to, problem) = - resolve_submodule(file_id, &name, &source_root.file_resolver); + resolve_submodule(source, &name, &source_root.file_resolver); let points_to = points_to .into_iter() .map(|file_id| match roots.remove(&file_id) { @@ -180,13 +181,24 @@ fn build_subtree( visited, roots, Some(link), - file_id, + ModuleSource::File(file_id), ), }) .collect::>>()?; (points_to, problem) } - Submodule::Definition(..) => continue, + Submodule::Definition(_name, submodule_source) => { + let points_to = build_subtree( + db, + source_root, + tree, + visited, + roots, + Some(link), + *submodule_source, + )?; + (vec![points_to], None) + } }; tree.link_mut(link).points_to = points_to; @@ -196,10 +208,17 @@ fn build_subtree( } fn resolve_submodule( - file_id: FileId, + source: ModuleSource, name: &SmolStr, file_resolver: &FileResolverImp, ) -> (Vec, Option) { + let file_id = match source { + ModuleSource::File(it) => it, + ModuleSource::Inline(..) => { + // TODO + return (Vec::new(), None); + } + }; let mod_name = file_resolver.file_stem(file_id); let is_dir_owner = mod_name == "mod" || mod_name == "lib" || mod_name == "main"; diff --git a/crates/ra_analysis/src/descriptors/module/mod.rs b/crates/ra_analysis/src/descriptors/module/mod.rs index 8464b0618..3d799ba05 100644 --- a/crates/ra_analysis/src/descriptors/module/mod.rs +++ b/crates/ra_analysis/src/descriptors/module/mod.rs @@ -142,9 +142,7 @@ impl LinkId { .1; ast.into() } - ModuleSourceNode::Inline(..) => { - unimplemented!("https://github.com/rust-analyzer/rust-analyzer/issues/181") - } + ModuleSourceNode::Inline(it) => it, } } } @@ -157,6 +155,12 @@ struct ModuleData { } impl ModuleSource { + pub(crate) fn new_inline(file_id: FileId, module: ast::Module) -> ModuleSource { + assert!(!module.has_semi()); + let ptr = SyntaxPtr::new(file_id, module.syntax()); + ModuleSource::Inline(ptr) + } + pub(crate) fn as_file(self) -> Option { match self { ModuleSource::File(f) => Some(f), @@ -164,7 +168,7 @@ impl ModuleSource { } } - fn file_id(self) -> FileId { + pub(crate) fn file_id(self) -> FileId { match self { ModuleSource::File(f) => f, ModuleSource::Inline(ptr) => ptr.file_id(), -- cgit v1.2.3