mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #1605

Browse source 
1605: Resolve modules inside inline module r=matklad a=andreevlex

#1510 

Co-authored-by: Alexander Andreev <andreevlex.as@gmail.com>
This commit is contained in:
bors[bot] 2019-07-29 12:19:08 +00:00
commit 62bdcc0fb2
2 changed files with 151 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
crates/ra_hir/src/nameres/collector.rs
View file

@ -1,7 +1,7 @@
use std::borrow::Cow;
use std::sync::Arc;
use arrayvec::ArrayVec;
use ra_db::FileId;
use ra_db::{FileId, SourceRoot};
use ra_syntax::{ast, SmolStr};
use relative_path::RelativePathBuf;
use rustc_hash::FxHashMap;
@ -105,6 +105,7 @@ where
module_id,
file_id: file_id.into(),
raw_items: &raw_items,
parent_module: None,
}
.collect(raw_items.items());
@ -455,8 +456,14 @@ where
if !self.macro_stack_monitor.is_poison(macro_def_id) {
let file_id: HirFileId = macro_call_id.as_file(MacroFileKind::Items);
let raw_items = self.db.raw_items(file_id);
ModCollector { def_collector: &mut *self, file_id, module_id, raw_items: &raw_items }
.collect(raw_items.items());
ModCollector {
def_collector: &mut *self,
file_id,
module_id,
raw_items: &raw_items,
parent_module: None,
}
.collect(raw_items.items());
} else {
log::error!("Too deep macro expansion: {:?}", macro_call_id);
self.def_map.poison_macros.insert(macro_def_id);
@ -476,6 +483,7 @@ struct ModCollector<'a, D> {
module_id: CrateModuleId,
file_id: HirFileId,
raw_items: &'a raw::RawItems,
parent_module: Option<&'a Name>,
}
impl<DB> ModCollector<'_, &'_ mut DefCollector<&'_ DB>>
@ -508,6 +516,7 @@ where
module_id,
file_id: self.file_id,
raw_items: self.raw_items,
parent_module: Some(name),
}
.collect(&*items);
}
@ -521,6 +530,7 @@ where
name,
is_root,
attr_path.as_ref(),
self.parent_module,
) {
Ok(file_id) => {
let module_id = self.push_child_module(name.clone(), ast_id, Some(file_id));
@ -530,6 +540,7 @@ where
module_id,
file_id: file_id.into(),
raw_items: &raw_items,
parent_module: None,
}
.collect(raw_items.items())
}
@ -636,46 +647,47 @@ fn resolve_submodule(
name: &Name,
is_root: bool,
attr_path: Option<&SmolStr>,
parent_module: Option<&Name>,
) -> Result<FileId, RelativePathBuf> {
// FIXME: handle submodules of inline modules properly
let file_id = file_id.original_file(db);
let source_root_id = db.file_source_root(file_id);
let path = db.file_relative_path(file_id);
let root = RelativePathBuf::default();
let dir_path = path.parent().unwrap_or(&root);
let mod_name = path.file_stem().unwrap_or("unknown");
let is_dir_owner = is_root || mod_name == "mod";
let file_mod = dir_path.join(format!("{}.rs", name));
let dir_mod = dir_path.join(format!("{}/mod.rs", name));
let file_dir_mod = dir_path.join(format!("{}/{}.rs", mod_name, name));
let mut candidates = ArrayVec::<[_; 3]>::new();
let file_attr_mod = attr_path.map(|file_path| {
let file_path = normalize_attribute_path(file_path);
let file_attr_mod = dir_path.join(file_path.as_ref()).normalize();
candidates.push(file_attr_mod.clone());
file_attr_mod
});
if is_dir_owner {
candidates.push(file_mod.clone());
candidates.push(dir_mod);
} else {
candidates.push(file_dir_mod.clone());
};
let sr = db.source_root(source_root_id);
let mut points_to = candidates.into_iter().filter_map(|path| sr.files.get(&path)).copied();
// FIXME: handle ambiguity
match points_to.next() {
Some(file_id) => Ok(file_id),
None => {
if let Some(file_attr_mod) = file_attr_mod {
Err(file_attr_mod)
let resolve_mode = match (attr_path.filter(|p| !p.is_empty()), parent_module) {
(Some(file_path), Some(parent_name)) => {
let file_path = normalize_attribute_path(file_path);
let path = dir_path.join(format!("{}/{}", parent_name, file_path)).normalize();
ResolutionMode::InsideInlineModule(InsideInlineModuleMode::WithAttributePath(path))
}
(Some(file_path), None) => {
let file_path = normalize_attribute_path(file_path);
let path = dir_path.join(file_path.as_ref()).normalize();
ResolutionMode::OutOfLine(OutOfLineMode::WithAttributePath(path))
}
(None, Some(parent_name)) => {
let path = dir_path.join(format!("{}/{}.rs", parent_name, name));
ResolutionMode::InsideInlineModule(InsideInlineModuleMode::File(path))
}
_ => {
let is_dir_owner = is_root || mod_name == "mod";
if is_dir_owner {
let file_mod = dir_path.join(format!("{}.rs", name));
let dir_mod = dir_path.join(format!("{}/mod.rs", name));
ResolutionMode::OutOfLine(OutOfLineMode::RootOrModRs {
file: file_mod,
directory: dir_mod,
})
} else {
Err(if is_dir_owner { file_mod } else { file_dir_mod })
let path = dir_path.join(format!("{}/{}.rs", mod_name, name));
ResolutionMode::OutOfLine(OutOfLineMode::FileInDirectory(path))
}
}
}
};
resolve_mode.resolve(db.source_root(source_root_id))
}
fn normalize_attribute_path(file_path: &SmolStr) -> Cow<str> {
@ -693,6 +705,74 @@ fn normalize_attribute_path(file_path: &SmolStr) -> Cow<str> {
}
}
enum OutOfLineMode {
RootOrModRs { file: RelativePathBuf, directory: RelativePathBuf },
FileInDirectory(RelativePathBuf),
WithAttributePath(RelativePathBuf),
}
impl OutOfLineMode {
pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
match self {
OutOfLineMode::RootOrModRs { file, directory } => match source_root.files.get(file) {
None => resolve_simple_path(source_root, directory).map_err(|_| file.clone()),
file_id => resolve_find_result(file_id, file),
},
OutOfLineMode::FileInDirectory(path) => resolve_simple_path(source_root, path),
OutOfLineMode::WithAttributePath(path) => resolve_simple_path(source_root, path),
}
}
}
enum InsideInlineModuleMode {
File(RelativePathBuf),
WithAttributePath(RelativePathBuf),
}
impl InsideInlineModuleMode {
pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
match self {
InsideInlineModuleMode::File(path) => resolve_simple_path(source_root, path),
InsideInlineModuleMode::WithAttributePath(path) => {
resolve_simple_path(source_root, path)
}
}
}
}
enum ResolutionMode {
OutOfLine(OutOfLineMode),
InsideInlineModule(InsideInlineModuleMode),
}
impl ResolutionMode {
pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
use self::ResolutionMode::*;
match self {
OutOfLine(mode) => mode.resolve(source_root),
InsideInlineModule(mode) => mode.resolve(source_root),
}
}
}
fn resolve_simple_path(
source_root: Arc<SourceRoot>,
path: &RelativePathBuf,
) -> Result<FileId, RelativePathBuf> {
resolve_find_result(source_root.files.get(path), path)
}
fn resolve_find_result(
file_id: Option<&FileId>,
path: &RelativePathBuf,
) -> Result<FileId, RelativePathBuf> {
match file_id {
Some(file_id) => Ok(file_id.clone()),
None => Err(path.clone()),
}
}
#[cfg(test)]
mod tests {
use ra_db::SourceDatabase;

53
crates/ra_hir/src/nameres/tests/mods.rs
View file

@ -336,10 +336,10 @@ fn module_resolution_explicit_path_mod_rs_with_win_separator() {
"###);
}
// FIXME: issue #1510. not support out-of-line modules inside inline.
// FIXME: issue #1529. not support out-of-line modules inside inline.
#[test]
#[ignore]
fn module_resolution_decl_inside_inline_module() {
fn module_resolution_decl_inside_inline_module_with_path_attribute() {
let map = def_map_with_crate_graph(
r###"
//- /main.rs
@ -368,10 +368,39 @@ fn module_resolution_decl_inside_inline_module() {
"###);
}
// FIXME: issue #1510. not support out-of-line modules inside inline.
#[test]
fn module_resolution_decl_inside_inline_module() {
let map = def_map_with_crate_graph(
r###"
//- /main.rs
mod foo {
mod bar;
}
//- /foo/bar.rs
pub struct Baz;
"###,
crate_graph! {
"main": ("/main.rs", []),
},
);
assert_snapshot_matches!(map, @r###"
⋮crate
⋮foo: t
⋮
⋮crate::foo
⋮bar: t
⋮
⋮crate::foo::bar
⋮Baz: t v
"###);
}
// FIXME: issue #1529. not support out-of-line modules inside inline.
#[test]
#[ignore]
fn module_resolution_decl_inside_inline_module_2() {
fn module_resolution_decl_inside_inline_module_2_with_path_attribute() {
let map = def_map_with_crate_graph(
r###"
//- /main.rs
@ -400,7 +429,7 @@ fn module_resolution_decl_inside_inline_module_2() {
"###);
}
// FIXME: issue #1510. not support out-of-line modules inside inline.
// FIXME: issue #1529. not support out-of-line modules inside inline.
#[test]
#[ignore]
fn module_resolution_decl_inside_inline_module_3() {
@ -433,7 +462,7 @@ fn module_resolution_decl_inside_inline_module_3() {
"###);
}
// FIXME: issue #1510. not support out-of-line modules inside inline.
// FIXME: issue #1529. not support out-of-line modules inside inline.
#[test]
#[ignore]
fn module_resolution_decl_inside_inline_module_empty_path() {
@ -491,7 +520,7 @@ fn module_resolution_decl_empty_path() {
"###);
}
// FIXME: issue #1510. not support out-of-line modules inside inline.
// FIXME: issue #1529. not support out-of-line modules inside inline.
#[test]
#[ignore]
fn module_resolution_decl_inside_inline_module_relative_path() {
@ -523,9 +552,7 @@ fn module_resolution_decl_inside_inline_module_relative_path() {
"###);
}
// FIXME: issue #1510. not support out-of-line modules inside inline.
#[test]
#[ignore]
fn module_resolution_decl_inside_inline_module_in_crate_root() {
let map = def_map_with_crate_graph(
r###"
@ -557,9 +584,7 @@ fn module_resolution_decl_inside_inline_module_in_crate_root() {
"###);
}
// FIXME: issue #1510. not support out-of-line modules inside inline.
#[test]
#[ignore]
fn module_resolution_decl_inside_inline_module_in_mod_rs() {
let map = def_map_with_crate_graph(
r###"
@ -597,9 +622,7 @@ fn module_resolution_decl_inside_inline_module_in_mod_rs() {
"###);
}
// FIXME: issue #1510. not support out-of-line modules inside inline.
#[test]
#[ignore]
fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
let map = def_map_with_crate_graph(
r###"
@ -613,7 +636,7 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
}
use self::bar::baz::Baz;
//- /foo/bar/qwe.rs
//- /bar/qwe.rs
pub struct Baz;
"###,
crate_graph! {
@ -637,7 +660,7 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
"###);
}
// FIXME: issue #1510. not support out-of-line modules inside inline.
// FIXME: issue #1529. not support out-of-line modules inside inline.
#[test]
#[ignore]
fn module_resolution_decl_inside_inline_module_in_non_crate_root_2() {