bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-def/src/nameres/mod_resolution.rs')
-rw-r--r--crates/hir-def/src/nameres/mod_resolution.rs23
1 files changed, 13 insertions, 10 deletions
diff --git a/crates/hir-def/src/nameres/mod_resolution.rs b/crates/hir-def/src/nameres/mod_resolution.rs
index 696fb6a961..ab4ffbb2c1 100644
--- a/crates/hir-def/src/nameres/mod_resolution.rs
+++ b/crates/hir-def/src/nameres/mod_resolution.rs
@@ -1,8 +1,10 @@
//! This module resolves `mod foo;` declaration to file.
use arrayvec::ArrayVec;
-use base_db::{AnchoredPath, FileId};
-use hir_expand::{name::Name, HirFileIdExt, MacroFileIdExt};
+use base_db::AnchoredPath;
+use hir_expand::{name::Name, HirFileIdExt};
use limit::Limit;
+use span::EditionedFileId;
+use syntax::ToSmolStr as _;
use crate::{db::DefDatabase, HirFileId};
@@ -33,7 +35,7 @@ impl ModDir {
let path = match attr_path {
None => {
let mut path = self.dir_path.clone();
- path.push(&name.unescaped().to_smol_str());
+ path.push(&name.unescaped().display_no_db().to_smolstr());
path
}
Some(attr_path) => {
@@ -63,7 +65,7 @@ impl ModDir {
file_id: HirFileId,
name: &Name,
attr_path: Option<&str>,
- ) -> Result<(FileId, bool, ModDir), Box<[String]>> {
+ ) -> Result<(EditionedFileId, bool, ModDir), Box<[String]>> {
let name = name.unescaped();
let mut candidate_files = ArrayVec::<_, 2>::new();
@@ -71,10 +73,6 @@ impl ModDir {
Some(attr_path) => {
candidate_files.push(self.dir_path.join_attr(attr_path, self.root_non_dir_owner))
}
- None if file_id.macro_file().map_or(false, |it| it.is_include_macro(db.upcast())) => {
- candidate_files.push(format!("{}.rs", name.display(db.upcast())));
- candidate_files.push(format!("{}/mod.rs", name.display(db.upcast())));
- }
None => {
candidate_files.push(format!(
"{}{}.rs",
@@ -91,7 +89,7 @@ impl ModDir {
let orig_file_id = file_id.original_file_respecting_includes(db.upcast());
for candidate in candidate_files.iter() {
- let path = AnchoredPath { anchor: orig_file_id, path: candidate.as_str() };
+ let path = AnchoredPath { anchor: orig_file_id.file_id(), path: candidate.as_str() };
if let Some(file_id) = db.resolve_path(path) {
let is_mod_rs = candidate.ends_with("/mod.rs");
@@ -102,7 +100,12 @@ impl ModDir {
DirPath::new(format!("{}/", name.display(db.upcast())))
};
if let Some(mod_dir) = self.child(dir_path, !root_dir_owner) {
- return Ok((file_id, is_mod_rs, mod_dir));
+ return Ok((
+ // FIXME: Edition, is this rightr?
+ EditionedFileId::new(file_id, orig_file_id.edition()),
+ is_mod_rs,
+ mod_dir,
+ ));
}
}
}