diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-09 15:30:09 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-02-09 15:30:09 +0000 |
commit | 12c7b66a7c6963d42ab5f33a9ac3f0b30e351b69 (patch) | |
tree | 952bfc7c6274568d90192c847485a22e8c16fb37 /crates/ide/src/goto_definition.rs | |
parent | 4ae7d39f77995ad455c7a21c7fdfc1deb588e782 (diff) | |
parent | 9ea2c96ddd0ad8c8898f1c65667a57a78ba2218c (diff) |
Merge #7611
7611: Cleanups r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ide/src/goto_definition.rs')
-rw-r--r-- | crates/ide/src/goto_definition.rs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs index 1a997fa40..e86ae2a18 100644 --- a/crates/ide/src/goto_definition.rs +++ b/crates/ide/src/goto_definition.rs | |||
@@ -131,22 +131,11 @@ pub(crate) fn reference_definition( | |||
131 | #[cfg(test)] | 131 | #[cfg(test)] |
132 | mod tests { | 132 | mod tests { |
133 | use ide_db::base_db::FileRange; | 133 | use ide_db::base_db::FileRange; |
134 | use syntax::{TextRange, TextSize}; | ||
135 | 134 | ||
136 | use crate::fixture; | 135 | use crate::fixture; |
137 | 136 | ||
138 | fn check(ra_fixture: &str) { | 137 | fn check(ra_fixture: &str) { |
139 | let (analysis, position, mut annotations) = fixture::annotations(ra_fixture); | 138 | let (analysis, position, expected) = fixture::nav_target_annotation(ra_fixture); |
140 | let (mut expected, data) = annotations.pop().unwrap(); | ||
141 | match data.as_str() { | ||
142 | "" => (), | ||
143 | "file" => { | ||
144 | expected.range = | ||
145 | TextRange::up_to(TextSize::of(&*analysis.file_text(expected.file_id).unwrap())) | ||
146 | } | ||
147 | data => panic!("bad data: {}", data), | ||
148 | } | ||
149 | |||
150 | let mut navs = | 139 | let mut navs = |
151 | analysis.goto_definition(position).unwrap().expect("no definition found").info; | 140 | analysis.goto_definition(position).unwrap().expect("no definition found").info; |
152 | if navs.len() == 0 { | 141 | if navs.len() == 0 { |