Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 22:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify

Browse source
This commit is contained in:
Lukas Wirth 2023-01-11 23:04:35 +01:00
parent 1ce3e820dc
commit 5214a98d9c
1 changed files with 72 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

153
crates/ide-diagnostics/src/handlers/unlinked_file.rs
View file

@ -46,52 +46,51 @@ fn fixes(ctx: &DiagnosticsContext<'_>, file_id: FileId) -> Option<Vec<Assist>> {
let our_path = source_root.path_for_file(&file_id)?; let our_path = source_root.path_for_file(&file_id)?;
let parent = our_path.parent()?; let parent = our_path.parent()?;
let (module_name, _) = our_path.name_and_extension()?; let (module_name, _) = our_path.name_and_extension()?;
let (parent, module_name) = if module_name == "mod" { let (parent, module_name) = match module_name {
// for mod.rs we need to actually look up one higher // for mod.rs we need to actually look up one higher
// and take the parent as our to be module name // and take the parent as our to be module name
let (name, _) = parent.name_and_extension()?; "mod" => {
(parent.parent()?, name.to_owned()) let (name, _) = parent.name_and_extension()?;
} else { (parent.parent()?, name.to_owned())
(parent, module_name.to_owned()) }
_ => (parent, module_name.to_owned()),
}; };
// check crate roots, i.e. main.rs, lib.rs, ... // check crate roots, i.e. main.rs, lib.rs, ...
'outer: for &krate in &*ctx.sema.db.relevant_crates(file_id) { 'crates: for &krate in &*ctx.sema.db.relevant_crates(file_id) {
let crate_def_map = ctx.sema.db.crate_def_map(krate); let crate_def_map = ctx.sema.db.crate_def_map(krate);
if let Some(root_file_id) = crate_def_map[crate_def_map.root()].origin.file_id() {
if let Some(path) = source_root.path_for_file(&root_file_id) { let root_module = &crate_def_map[crate_def_map.root()];
let parent2 = path.parent()?; let Some(root_file_id) = root_module.origin.file_id() else { continue };
if let Some(rel) = parent.strip_prefix(&parent2) { let Some(crate_root_path) = source_root.path_for_file(&root_file_id) else { continue };
let mut current = &crate_def_map[crate_def_map.root()]; let Some(rel) = parent.strip_prefix(&crate_root_path.parent()?) else { continue };
for ele in rel.as_ref().components() {
let seg = match ele { // try resolving the relative difference of the paths as inline modules
std::path::Component::Normal(seg) => seg.to_str()?, let mut current = root_module;
std::path::Component::RootDir => continue, for ele in rel.as_ref().components() {
// shouldn't occur let seg = match ele {
_ => continue 'outer, std::path::Component::Normal(seg) => seg.to_str()?,
}; std::path::Component::RootDir => continue,
match current.children.iter().find(|(name, _)| name.to_smol_str() == seg) { // shouldn't occur
Some((_, child)) => { _ => continue 'crates,
current = &crate_def_map[*child]; };
} match current.children.iter().find(|(name, _)| name.to_smol_str() == seg) {
None => continue 'outer, Some((_, &child)) => current = &crate_def_map[child],
} None => continue 'crates,
} }
let InFile { file_id: parent_file_id, value: source } = if !current.origin.is_inline() {
current.definition_source(ctx.sema.db); continue 'crates;
if let Some(parent_file_id) = parent_file_id.file_id() {
return make_fixes(
ctx.sema.db,
parent_file_id,
source,
&module_name,
file_id,
);
}
}
} }
} }
let InFile { file_id: parent_file_id, value: source } =
current.definition_source(ctx.sema.db);
let parent_file_id = parent_file_id.file_id()?;
return make_fixes(ctx.sema.db, parent_file_id, source, &module_name, file_id);
} }
// if we aren't adding to a crate root, walk backwards such that we support `#[path = ...]` overrides if possible
// build all parent paths of the form `../module_name/mod.rs` and `../module_name.rs` // build all parent paths of the form `../module_name/mod.rs` and `../module_name.rs`
let paths = iter::successors(Some(parent.clone()), |prev| prev.parent()).filter_map(|path| { let paths = iter::successors(Some(parent.clone()), |prev| prev.parent()).filter_map(|path| {
let parent = path.parent()?; let parent = path.parent()?;
@ -99,53 +98,45 @@ fn fixes(ctx: &DiagnosticsContext<'_>, file_id: FileId) -> Option<Vec<Assist>> {
Some(([parent.join(&format!("{name}.rs"))?, path.join("mod.rs")?], name.to_owned())) Some(([parent.join(&format!("{name}.rs"))?, path.join("mod.rs")?], name.to_owned()))
}); });
let mut stack = vec![]; let mut stack = vec![];
if let Some(&parent_id) = paths let &parent_id =
.inspect(|(_, name)| stack.push(name.clone())) paths.inspect(|(_, name)| stack.push(name.clone())).find_map(|(paths, _)| {
.find_map(|(paths, _)| paths.into_iter().find_map(|path| source_root.file_for_path(&path))) paths.into_iter().find_map(|path| source_root.file_for_path(&path))
{ })?;
stack.pop(); stack.pop();
for &krate in ctx.sema.db.relevant_crates(parent_id).iter() { 'crates: for &krate in ctx.sema.db.relevant_crates(parent_id).iter() {
let crate_def_map = ctx.sema.db.crate_def_map(krate); let crate_def_map = ctx.sema.db.crate_def_map(krate);
'outer: for (_, module) in crate_def_map.modules() { let Some((_, module)) =
if module.origin.file_id() == Some(parent_id) { crate_def_map.modules()
if module.origin.is_inline() { .find(|(_, module)| module.origin.file_id() == Some(parent_id) && !module.origin.is_inline())
continue; else { continue };
}
if stack.is_empty() { if stack.is_empty() {
return make_fixes( return make_fixes(
ctx.sema.db, ctx.sema.db,
parent_id, parent_id,
module.definition_source(ctx.sema.db).value, module.definition_source(ctx.sema.db).value,
&module_name, &module_name,
file_id, file_id,
); );
} else { } else {
let mut current = module; // direct parent file is missing,
for s in stack.iter().rev() { // try finding a parent that has an inline tree from here on
match module.children.iter().find(|(name, _)| name.to_smol_str() == s) { let mut current = module;
Some((_, child)) => { for s in stack.iter().rev() {
current = &crate_def_map[*child]; match module.children.iter().find(|(name, _)| name.to_smol_str() == s) {
} Some((_, child)) => {
None => break 'outer, current = &crate_def_map[*child];
}
}
let InFile { file_id: parent_file_id, value: source } =
current.definition_source(ctx.sema.db);
if let Some(parent_file_id) = parent_file_id.file_id() {
if current.origin.is_inline() {
return make_fixes(
ctx.sema.db,
parent_file_id,
source,
&module_name,
file_id,
);
}
}
break;
} }
None => continue 'crates,
}
if !current.origin.is_inline() {
continue 'crates;
} }
} }
let InFile { file_id: parent_file_id, value: source } =
current.definition_source(ctx.sema.db);
let parent_file_id = parent_file_id.file_id()?;
return make_fixes(ctx.sema.db, parent_file_id, source, &module_name, file_id);
} }
} }