diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-17 11:43:33 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-17 11:43:33 +0100 |
commit | 6ae6c1460e1e0524664af39fd0dbe3b1af3fac50 (patch) | |
tree | 7e2e84a42863d4cc284e2954198e944e3cc7b3a1 /crates/ra_ide/src/references.rs | |
parent | f157a0983a11132a3095f4241d60759c81a7ef26 (diff) | |
parent | d7548a36a7e814a165b05ffcb9ec5b55e0b291da (diff) |
Merge #5420
5420: Unclutter NavigationTarget API r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide/src/references.rs')
-rw-r--r-- | crates/ra_ide/src/references.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs index c2b0d5efe..fe1c074d1 100644 --- a/crates/ra_ide/src/references.rs +++ b/crates/ra_ide/src/references.rs | |||
@@ -74,8 +74,8 @@ impl IntoIterator for ReferenceSearchResult { | |||
74 | let mut v = Vec::with_capacity(self.len()); | 74 | let mut v = Vec::with_capacity(self.len()); |
75 | v.push(Reference { | 75 | v.push(Reference { |
76 | file_range: FileRange { | 76 | file_range: FileRange { |
77 | file_id: self.declaration.nav.file_id(), | 77 | file_id: self.declaration.nav.file_id, |
78 | range: self.declaration.nav.range(), | 78 | range: self.declaration.nav.focus_or_full_range(), |
79 | }, | 79 | }, |
80 | kind: self.declaration.kind, | 80 | kind: self.declaration.kind, |
81 | access: self.declaration.access, | 81 | access: self.declaration.access, |
@@ -112,7 +112,7 @@ pub(crate) fn find_all_refs( | |||
112 | .filter(|r| search_kind == ReferenceKind::Other || search_kind == r.kind) | 112 | .filter(|r| search_kind == ReferenceKind::Other || search_kind == r.kind) |
113 | .collect(); | 113 | .collect(); |
114 | 114 | ||
115 | let decl_range = def.try_to_nav(sema.db)?.range(); | 115 | let decl_range = def.try_to_nav(sema.db)?.focus_or_full_range(); |
116 | 116 | ||
117 | let declaration = Declaration { | 117 | let declaration = Declaration { |
118 | nav: def.try_to_nav(sema.db)?, | 118 | nav: def.try_to_nav(sema.db)?, |