Skip to content

Commit 4484908

Browse files
committed
Rewrite goto definition tests
1 parent d34e725 commit 4484908

File tree

5 files changed

+487
-614
lines changed

5 files changed

+487
-614
lines changed

crates/ra_db/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub struct FilePosition {
8080
pub offset: TextSize,
8181
}
8282

83-
#[derive(Clone, Copy, Debug)]
83+
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
8484
pub struct FileRange {
8585
pub file_id: FileId,
8686
pub range: TextRange,

crates/ra_ide/src/display/navigation_target.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ impl NavigationTarget {
6464
self.file_id
6565
}
6666

67+
// TODO: inconsistent
6768
pub fn file_range(&self) -> FileRange {
6869
FileRange { file_id: self.file_id, range: self.full_range }
6970
}
@@ -283,11 +284,13 @@ impl ToNav for hir::ImplDef {
283284
} else {
284285
original_range(db, src.as_ref().map(|it| it.syntax()))
285286
};
287+
let focus_range =
288+
src.value.target_type().map(|ty| original_range(db, src.with_value(ty.syntax())).range);
286289

287290
NavigationTarget::from_syntax(
288291
frange.file_id,
289292
"impl".into(),
290-
None,
293+
focus_range,
291294
frange.range,
292295
src.value.syntax().kind(),
293296
)

0 commit comments

Comments
 (0)