language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge #1994

Browse source 
1994: remove last traces of source roots from hir r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-10-11 07:49:39 +00:00 • committed by GitHub
commit f70c54ccfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 71 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ra_hir/src/debug.rs
View file

@ -22,7 +22,7 @@ use std::fmt;
use ra_db::{CrateId, FileId};
use crate::{db::HirDatabase, Crate, Module, Name};
use crate::{db::HirDatabase, Crate, HirFileId, Module, Name};
impl Crate {
pub fn debug(self, db: &impl HirDebugDatabase) -> impl fmt::Debug + '_ {
@ -36,6 +36,12 @@ impl Module {
}
}
impl HirFileId {
pub fn debug(self, db: &impl HirDebugDatabase) -> impl fmt::Debug + '_ {
debug_fn(move |fmt| db.debug_hir_file_id(self, fmt))
}
}
pub trait HirDebugHelper: HirDatabase {
fn crate_name(&self, _krate: CrateId) -> Option<String> {
None
@ -48,6 +54,7 @@ pub trait HirDebugHelper: HirDatabase {
pub trait HirDebugDatabase {
fn debug_crate(&self, krate: Crate, fmt: &mut fmt::Formatter<'_>) -> fmt::Result;
fn debug_module(&self, module: Module, fmt: &mut fmt::Formatter<'_>) -> fmt::Result;
fn debug_hir_file_id(&self, file_id: HirFileId, fmt: &mut fmt::Formatter<'_>) -> fmt::Result;
}
impl<DB: HirDebugHelper> HirDebugDatabase for DB {
@ -62,12 +69,19 @@ impl<DB: HirDebugHelper> HirDebugDatabase for DB {
fn debug_module(&self, module: Module, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
let file_id = module.definition_source(self).file_id.original_file(self);
let path = self.file_path(file_id);
let path = self.file_path(file_id).unwrap_or_else(|| "N/A".to_string());
fmt.debug_struct("Module")
.field("name", &module.name(self).unwrap_or_else(Name::missing))
.field("path", &path.unwrap_or_else(|| "N/A".to_string()))
.field("path", &path)
.finish()
}
fn debug_hir_file_id(&self, file_id: HirFileId, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
let original = file_id.original_file(self);
let path = self.file_path(original).unwrap_or_else(|| "N/A".to_string());
let is_macro = file_id != original.into();
fmt.debug_struct("HirFileId").field("path", &path).field("macro", &is_macro).finish()
}
}
fn debug_fn(f: impl Fn(&mut fmt::Formatter<'_>) -> fmt::Result) -> impl fmt::Debug {

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

@ -584,7 +584,7 @@ where
// out of line module, resolve, parse and recurse
raw::ModuleData::Declaration { name, ast_id } => {
let ast_id = ast_id.with_file_id(self.file_id);
match self.mod_dir.resolve_submodule(
match self.mod_dir.resolve_declaration(
self.def_collector.db,
self.file_id,
name,

60
crates/ra_hir/src/nameres/mod_resolution.rs
View file

@ -1,9 +1,7 @@
//! This module resolves `mod foo;` declaration to file.
use std::borrow::Cow;
use ra_db::FileId;
use ra_syntax::SmolStr;
use relative_path::{RelativePath, RelativePathBuf};
use relative_path::RelativePathBuf;
use crate::{db::DefDatabase, HirFileId, Name};
@ -28,23 +26,22 @@ impl ModDir {
attr_path: Option<&SmolStr>,
) -> ModDir {
let mut path = self.path.clone();
match attr_path {
match attr_to_path(attr_path) {
None => path.push(&name.to_string()),
Some(attr_path) => {
if self.root_non_dir_owner {
path = path
.parent()
.map(|it| it.to_relative_path_buf())
.unwrap_or_else(RelativePathBuf::new);
// Workaround for relative path API: turn `lib.rs` into ``.
if !path.pop() {
path = RelativePathBuf::default();
}
}
let attr_path = &*normalize_attribute_path(attr_path);
path.push(RelativePath::new(attr_path));
path.push(attr_path);
}
}
ModDir { path, root_non_dir_owner: false }
}
pub(super) fn resolve_submodule(
pub(super) fn resolve_declaration(
&self,
db: &impl DefDatabase,
file_id: HirFileId,
@ -53,32 +50,25 @@ impl ModDir {
) -> Result<(FileId, ModDir), RelativePathBuf> {
let empty_path = RelativePathBuf::default();
let file_id = file_id.original_file(db);
let base_dir = {
let path = db.file_relative_path(file_id);
path.parent().unwrap_or(&empty_path).join(&self.path)
};
let mut candidate_files = Vec::new();
match attr_path {
Some(attr) => {
match attr_to_path(attr_path) {
Some(attr_path) => {
let base = if self.root_non_dir_owner {
base_dir.parent().unwrap_or(&empty_path)
self.path.parent().unwrap_or(&empty_path)
} else {
&base_dir
&self.path
};
candidate_files.push(base.join(&*normalize_attribute_path(attr)))
candidate_files.push(base.join(attr_path))
}
None => {
candidate_files.push(base_dir.join(&format!("{}.rs", name)));
candidate_files.push(base_dir.join(&format!("{}/mod.rs", name)));
candidate_files.push(self.path.join(&format!("{}.rs", name)));
candidate_files.push(self.path.join(&format!("{}/mod.rs", name)));
}
};
let source_root_id = db.file_source_root(file_id);
let source_root = db.source_root(source_root_id);
for candidate in candidate_files.iter() {
let candidate = candidate.normalize();
if let Some(file_id) = source_root.file_by_relative_path(&candidate) {
if let Some(file_id) = db.resolve_relative_path(file_id, candidate) {
let mut root_non_dir_owner = false;
let mut mod_path = RelativePathBuf::new();
if !(candidate.ends_with("mod.rs") || attr_path.is_some()) {
@ -88,22 +78,10 @@ impl ModDir {
return Ok((file_id, ModDir { path: mod_path, root_non_dir_owner }));
}
}
let suggestion = candidate_files.first().unwrap();
Err(base_dir.join(suggestion))
Err(candidate_files.remove(0))
}
}
fn normalize_attribute_path(file_path: &str) -> Cow<str> {
let current_dir = "./";
let windows_path_separator = r#"\"#;
let current_dir_normalize = if file_path.starts_with(current_dir) {
&file_path[current_dir.len()..]
} else {
file_path
};
if current_dir_normalize.contains(windows_path_separator) {
Cow::Owned(current_dir_normalize.replace(windows_path_separator, "/"))
} else {
Cow::Borrowed(current_dir_normalize)
}
fn attr_to_path(attr: Option<&SmolStr>) -> Option<RelativePathBuf> {
attr.and_then(|it| RelativePathBuf::from_path(&it.replace("\\", "/")).ok())
}