language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update assists test fixtures

Browse source
This commit is contained in:
Lukas Wirth 2024-05-22 14:28:07 +02:00
parent ca06b090d7
commit 760ad445e2
6 changed files with 18 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/hir/src/term_search/expr.rs
View file

@ -1,6 +1,5 @@
//! Type tree for term search
use hir_def::find_path::PrefixKind;
use hir_expand::mod_path::ModPath;
use hir_ty::{
db::HirDatabase,
@ -21,23 +20,8 @@ fn mod_item_path(
prefer_prelude: bool,
) -> Option<ModPath> {
let db = sema_scope.db;
// Account for locals shadowing items from module
let name_hit_count = def.name(db).map(|def_name| {
let mut name_hit_count = 0;
sema_scope.process_all_names(&mut |name, _| {
if name == def_name {
name_hit_count += 1;
}
});
name_hit_count
});
let m = sema_scope.module();
let prefix = match name_hit_count {
Some(0..=1) | None => PrefixKind::Plain,
Some(_) => PrefixKind::ByCrate,
};
m.find_use_path(db.upcast(), *def, prefix, prefer_no_std, prefer_prelude)
m.find_path(db.upcast(), *def, prefer_no_std, prefer_prelude)
}
/// Helper function to get path to `ModuleDef` as string