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

Deduplicate

Browse source
This commit is contained in:
Lukas Wirth 2024-06-03 19:26:11 +02:00
parent db80216dac
commit 426d01eab0
1 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

48
crates/hir-def/src/find_path.rs
View file

@ -312,19 +312,27 @@ fn calculate_best_path(
if max_len <= 1 { if max_len <= 1 {
return None; return None;
} }
let mut best_path = None; let mut best_path = None;
let update_best_path = let mut best_path_len = max_len;
|best_path: &mut Option<_>, new_path: (ModPath, Stability)| match best_path { let mut process = |mut path: (ModPath, Stability), name, best_path_len: &mut _| {
path.0.push_segment(name);
let new_path = match best_path.take() {
Some(best_path) => select_best_path(best_path, path, ctx.cfg),
None => path,
};
if new_path.1 == Stable {
*best_path_len = new_path.0.len();
}
match &mut best_path {
Some((old_path, old_stability)) => { Some((old_path, old_stability)) => {
*old_path = new_path.0; *old_path = new_path.0;
*old_stability = zip_stability(*old_stability, new_path.1); *old_stability = zip_stability(*old_stability, new_path.1);
} }
None => *best_path = Some(new_path), None => best_path = Some(new_path),
}
}; };
let db = ctx.db; let db = ctx.db;
let mut best_path_len = max_len;
if item.krate(db) == Some(ctx.from.krate) { if item.krate(db) == Some(ctx.from.krate) {
// Item was defined in the same crate that wants to import it. It cannot be found in any // Item was defined in the same crate that wants to import it. It cannot be found in any
// dependency in this case. // dependency in this case.
@ -335,19 +343,10 @@ fn calculate_best_path(
} }
// we are looking for paths of length up to best_path_len, any longer will make it be // we are looking for paths of length up to best_path_len, any longer will make it be
// less optimal. The -1 is due to us pushing name onto it afterwards. // less optimal. The -1 is due to us pushing name onto it afterwards.
if let Some(mut path) = if let Some(path) =
find_path_for_module(ctx, def_map, visited_modules, module_id, best_path_len - 1) find_path_for_module(ctx, def_map, visited_modules, module_id, best_path_len - 1)
{ {
path.0.push_segment(name); process(path, name, &mut best_path_len);
let new_path = match best_path.take() {
Some(best_path) => select_best_path(best_path, path, ctx.cfg),
None => path,
};
if new_path.1 == Stable {
best_path_len = new_path.0.len();
}
update_best_path(&mut best_path, new_path);
} }
} }
} else { } else {
@ -373,25 +372,16 @@ fn calculate_best_path(
info.container, info.container,
best_path_len - 1, best_path_len - 1,
); );
let Some((mut path, path_stability)) = path else { let Some((path, path_stability)) = path else {
continue; continue;
}; };
cov_mark::hit!(partially_imported); cov_mark::hit!(partially_imported);
path.push_segment(info.name.clone()); let path = (
let path_with_stab = (
path, path,
zip_stability(path_stability, if info.is_unstable { Unstable } else { Stable }), zip_stability(path_stability, if info.is_unstable { Unstable } else { Stable }),
); );
let new_path = match best_path.take() { process(path, info.name.clone(), &mut best_path_len);
Some(best_path) => select_best_path(best_path, path_with_stab, ctx.cfg),
None => path_with_stab,
};
if new_path.1 == Stable {
best_path_len = new_path.0.len();
}
update_best_path(&mut best_path, new_path);
} }
} }
} }