diff options
-rw-r--r-- | crates/ide/src/goto_definition.rs | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs index 15792f947..d41dd3d92 100644 --- a/crates/ide/src/goto_definition.rs +++ b/crates/ide/src/goto_definition.rs | |||
@@ -3,12 +3,7 @@ use ide_db::{ | |||
3 | defs::{NameClass, NameRefClass}, | 3 | defs::{NameClass, NameRefClass}, |
4 | symbol_index, RootDatabase, | 4 | symbol_index, RootDatabase, |
5 | }; | 5 | }; |
6 | use syntax::{ | 6 | use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T}; |
7 | ast::{self}, | ||
8 | match_ast, AstNode, | ||
9 | SyntaxKind::*, | ||
10 | SyntaxToken, TokenAtOffset, T, | ||
11 | }; | ||
12 | 7 | ||
13 | use crate::{ | 8 | use crate::{ |
14 | display::{ToNav, TryToNav}, | 9 | display::{ToNav, TryToNav}, |
@@ -44,6 +39,12 @@ pub(crate) fn goto_definition( | |||
44 | let nav = def.try_to_nav(sema.db)?; | 39 | let nav = def.try_to_nav(sema.db)?; |
45 | vec![nav] | 40 | vec![nav] |
46 | }, | 41 | }, |
42 | ast::SelfParam(self_param) => { | ||
43 | let ty = sema.type_of_self(&self_param)?; | ||
44 | let adt_def = ty.autoderef(db).filter_map(|ty| ty.as_adt()).last()?; | ||
45 | let nav = adt_def.to_nav(db); | ||
46 | vec![nav] | ||
47 | }, | ||
47 | _ => return None, | 48 | _ => return None, |
48 | } | 49 | } |
49 | }; | 50 | }; |
@@ -984,4 +985,33 @@ fn g() -> <() as Iterator<A = (), B<|> = u8>>::A {} | |||
984 | "#, | 985 | "#, |
985 | ); | 986 | ); |
986 | } | 987 | } |
988 | |||
989 | #[test] | ||
990 | fn todo_def_type_for_self() { | ||
991 | check( | ||
992 | r#" | ||
993 | struct Foo {} | ||
994 | //^^^ | ||
995 | |||
996 | impl Foo { | ||
997 | fn bar(&self<|>) {} | ||
998 | } | ||
999 | "#, | ||
1000 | ); | ||
1001 | } | ||
1002 | |||
1003 | #[test] | ||
1004 | fn todo_def_type_for_arbitrary_self() { | ||
1005 | check( | ||
1006 | r#" | ||
1007 | struct Arc<T>(T); | ||
1008 | //^^^ | ||
1009 | struct Foo {} | ||
1010 | |||
1011 | impl Foo { | ||
1012 | fn bar(self<|>: Arc<Self>) {} | ||
1013 | } | ||
1014 | "#, | ||
1015 | ); | ||
1016 | } | ||
987 | } | 1017 | } |