Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Record assoc item resolution

Browse source
This commit is contained in:
Florian Diebold 2019-10-31 15:13:52 +01:00
parent 7b7133ec58
commit c7cedea270
2 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir/src/ty/infer/path.rs
View file

@ -230,7 +230,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
&mut self,
ty: Ty,
name: &Name,
_id: ExprOrPatId,
id: ExprOrPatId,
) -> Option<(ValueNs, Option<Substs>)> {
let krate = self.resolver.krate()?;
@ -276,6 +276,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
trait_: t,
substs: trait_substs,
}));
self.write_assoc_resolution(id, *item);
return Some((ValueNs::Function(f), Some(substs)));
}
}

55
crates/ra_ide_api/src/goto_definition.rs
View file

@ -390,6 +390,61 @@ mod tests {
"spam RECORD_FIELD_DEF FileId(1) [17; 26) [17; 21)",
);
}
#[test]
fn goto_definition_works_for_ufcs_inherent_methods() {
check_goto(
"
//- /lib.rs
struct Foo;
impl Foo {
fn frobnicate() { }
}
fn bar(foo: &Foo) {
Foo::frobnicate<|>();
}
",
"frobnicate FN_DEF FileId(1) [27; 47) [30; 40)",
);
}
#[test]
fn goto_definition_works_for_ufcs_trait_methods_through_traits() {
check_goto(
"
//- /lib.rs
trait Foo {
fn frobnicate();
}
fn bar() {
Foo::frobnicate<|>();
}
",
"frobnicate FN_DEF FileId(1) [16; 32) [19; 29)",
);
}
#[test]
fn goto_definition_works_for_ufcs_trait_methods_through_self() {
check_goto(
"
//- /lib.rs
struct Foo;
trait Trait {
fn frobnicate();
}
impl Trait for Foo {}
fn bar() {
Foo::frobnicate<|>();
}
",
"frobnicate FN_DEF FileId(1) [30; 46) [33; 43)",
);
}
#[test]
fn goto_definition_on_self() {
check_goto(