Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 01:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix test in qualify_method: stay in trait path

Browse source
This commit is contained in:
bitgaoshu 2022-06-24 22:17:26 +08:00
parent 9e6bff79f4
commit 9ea8d5806d
2 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
crates/ide-assists/src/handlers/qualify_method_call.rs
View file

@ -1,8 +1,5 @@
use hir::{ItemInNs, ModuleDef};
use ide_db::{
assists::{AssistId, AssistKind},
imports::import_assets::item_for_path_search,
};
use hir::{db::HirDatabase, AsAssocItem, AssocItem, AssocItemContainer, ItemInNs, ModuleDef};
use ide_db::assists::{AssistId, AssistKind};
use syntax::{ast, AstNode};
use crate::{
@ -67,6 +64,33 @@ pub(crate) fn qualify_method_call(acc: &mut Assists, ctx: &AssistContext) -> Opt
Some(())
}
fn item_for_path_search(db: &dyn HirDatabase, item: ItemInNs) -> Option<ItemInNs> {
Some(match item {
ItemInNs::Types(_) | ItemInNs::Values(_) => match item_as_assoc(db, item) {
Some(assoc_item) => match assoc_item.container(db) {
AssocItemContainer::Trait(trait_) => ItemInNs::from(ModuleDef::from(trait_)),
AssocItemContainer::Impl(impl_) => {
let impled_trait = if matches!(assoc_item, AssocItem::Function(..)) {
impl_.trait_(db)
} else {
None
};
match impled_trait {
None => ItemInNs::from(ModuleDef::from(impl_.self_ty(db).as_adt()?)),
Some(t) => ItemInNs::from(ModuleDef::from(t)),
}
}
},
None => item,
},
ItemInNs::Macros(_) => item,
})
}
fn item_as_assoc(db: &dyn HirDatabase, item: ItemInNs) -> Option<AssocItem> {
item.as_module_def().and_then(|module_def| module_def.as_assoc_item(db))
}
#[cfg(test)]
mod tests {
use super::*;
@ -281,7 +305,7 @@ use test_mod::*;
fn main() {
let test_struct = test_mod::TestStruct {};
TestStruct::test_method(&test_struct)
TestTrait::test_method(&test_struct)
}
"#,
);
@ -324,7 +348,7 @@ use test_mod::*;
fn main() {
let test_struct = test_mod::TestStruct {};
TestStruct::test_method(&test_struct, 12, 32u)
TestTrait::test_method(&test_struct, 12, 32u)
}
"#,
);
@ -367,7 +391,7 @@ use test_mod::*;
fn main() {
let test_struct = test_mod::TestStruct {};
TestStruct::test_method(test_struct, 12, 32u)
TestTrait::test_method(test_struct, 12, 32u)
}
"#,
);
@ -410,7 +434,7 @@ use test_mod::*;
fn main() {
let test_struct = test_mod::TestStruct {};
TestStruct::test_method(&mut test_struct, 12, 32u)
TestTrait::test_method(&mut test_struct, 12, 32u)
}
"#,
);
@ -480,7 +504,7 @@ use test_mod::*;
fn main() {
let test_struct = TestStruct {};
TestStruct::test_method::<()>(&test_struct)
TestTrait::test_method::<()>(&test_struct)
}
"#,
);

2
crates/ide-db/src/imports/import_assets.rs
View file

@ -401,7 +401,7 @@ fn import_for_item(
})
}
pub fn item_for_path_search(db: &RootDatabase, item: ItemInNs) -> Option<ItemInNs> {
fn item_for_path_search(db: &RootDatabase, item: ItemInNs) -> Option<ItemInNs> {
Some(match item {
ItemInNs::Types(_) | ItemInNs::Values(_) => match item_as_assoc(db, item) {
Some(assoc_item) => match assoc_item.container(db) {