diff options
Diffstat (limited to 'crates/ide/src/references.rs')
-rw-r--r-- | crates/ide/src/references.rs | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs index ec7c7686d..379674530 100644 --- a/crates/ide/src/references.rs +++ b/crates/ide/src/references.rs | |||
@@ -148,14 +148,15 @@ fn decl_access(def: &Definition, syntax: &SyntaxNode, range: TextRange) -> Optio | |||
148 | 148 | ||
149 | fn get_name_of_item_declaration(syntax: &SyntaxNode, position: FilePosition) -> Option<ast::Name> { | 149 | fn get_name_of_item_declaration(syntax: &SyntaxNode, position: FilePosition) -> Option<ast::Name> { |
150 | let token = syntax.token_at_offset(position.offset).right_biased()?; | 150 | let token = syntax.token_at_offset(position.offset).right_biased()?; |
151 | let token_parent = token.parent()?; | ||
151 | let kind = token.kind(); | 152 | let kind = token.kind(); |
152 | if kind == T![;] { | 153 | if kind == T![;] { |
153 | ast::Struct::cast(token.parent()) | 154 | ast::Struct::cast(token_parent) |
154 | .filter(|struct_| struct_.field_list().is_none()) | 155 | .filter(|struct_| struct_.field_list().is_none()) |
155 | .and_then(|struct_| struct_.name()) | 156 | .and_then(|struct_| struct_.name()) |
156 | } else if kind == T!['{'] { | 157 | } else if kind == T!['{'] { |
157 | match_ast! { | 158 | match_ast! { |
158 | match (token.parent()) { | 159 | match token_parent { |
159 | ast::RecordFieldList(rfl) => match_ast! { | 160 | ast::RecordFieldList(rfl) => match_ast! { |
160 | match (rfl.syntax().parent()?) { | 161 | match (rfl.syntax().parent()?) { |
161 | ast::Variant(it) => it.name(), | 162 | ast::Variant(it) => it.name(), |
@@ -169,7 +170,7 @@ fn get_name_of_item_declaration(syntax: &SyntaxNode, position: FilePosition) -> | |||
169 | } | 170 | } |
170 | } | 171 | } |
171 | } else if kind == T!['('] { | 172 | } else if kind == T!['('] { |
172 | let tfl = ast::TupleFieldList::cast(token.parent())?; | 173 | let tfl = ast::TupleFieldList::cast(token_parent)?; |
173 | match_ast! { | 174 | match_ast! { |
174 | match (tfl.syntax().parent()?) { | 175 | match (tfl.syntax().parent()?) { |
175 | ast::Variant(it) => it.name(), | 176 | ast::Variant(it) => it.name(), |
@@ -1270,4 +1271,27 @@ fn foo(_: bool) -> bo$0ol { true } | |||
1270 | "#]], | 1271 | "#]], |
1271 | ); | 1272 | ); |
1272 | } | 1273 | } |
1274 | |||
1275 | #[test] | ||
1276 | fn test_transitive() { | ||
1277 | check( | ||
1278 | r#" | ||
1279 | //- /level3.rs new_source_root: crate:level3 | ||
1280 | pub struct Fo$0o; | ||
1281 | //- /level2.rs new_source_root: crate:level2 deps:level3 | ||
1282 | pub use level3::Foo; | ||
1283 | //- /level1.rs new_source_root: crate:level1 deps:level2 | ||
1284 | pub use level2::Foo; | ||
1285 | //- /level0.rs new_source_root: crate:level0 deps:level1 | ||
1286 | pub use level1::Foo; | ||
1287 | "#, | ||
1288 | expect![[r#" | ||
1289 | Foo Struct FileId(0) 0..15 11..14 | ||
1290 | |||
1291 | FileId(1) 16..19 | ||
1292 | FileId(2) 16..19 | ||
1293 | FileId(3) 16..19 | ||
1294 | "#]], | ||
1295 | ); | ||
1296 | } | ||
1273 | } | 1297 | } |