From 7c25224f0522cb828c4aa2d791562b84ee2995f9 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 18 Dec 2019 16:25:15 +0100
Subject: Don't bother with focus range for navigation to locals
---
crates/ra_ide/src/display/navigation_target.rs | 15 +++++-----
crates/ra_ide/src/goto_definition.rs | 41 ++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 7 deletions(-)
(limited to 'crates/ra_ide/src')
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index 6a6b49afd..b9ae67828 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -328,22 +328,23 @@ impl ToNav for hir::AssocItem {
impl ToNav for hir::Local {
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
let src = self.source(db);
- let (full_range, focus_range) = match src.value {
- Either::Left(it) => {
- (it.syntax().text_range(), it.name().map(|it| it.syntax().text_range()))
+ let node = match &src.value {
+ Either::Left(bind_pat) => {
+ bind_pat.name().map_or_else(|| bind_pat.syntax().clone(), |it| it.syntax().clone())
}
- Either::Right(it) => (it.syntax().text_range(), Some(it.self_kw_token().text_range())),
+ Either::Right(it) => it.syntax().clone(),
};
+ let full_range = original_range(db, src.with_value(&node));
let name = match self.name(db) {
Some(it) => it.to_string().into(),
None => "".into(),
};
NavigationTarget {
- file_id: src.file_id.original_file(db),
+ file_id: full_range.file_id,
name,
kind: BIND_PAT,
- full_range,
- focus_range,
+ full_range: full_range.range,
+ focus_range: None,
container_name: None,
description: None,
docs: None,
diff --git a/crates/ra_ide/src/goto_definition.rs b/crates/ra_ide/src/goto_definition.rs
index 48757f170..184555792 100644
--- a/crates/ra_ide/src/goto_definition.rs
+++ b/crates/ra_ide/src/goto_definition.rs
@@ -817,4 +817,45 @@ mod tests {
"T",
);
}
+
+ #[test]
+ fn goto_within_macro() {
+ check_goto(
+ "
+ //- /lib.rs
+ macro_rules! id {
+ ($($tt:tt)*) => ($($tt)*)
+ }
+
+ fn foo() {
+ let x = 1;
+ id!({
+ let y = <|>x;
+ let z = y;
+ });
+ }
+ ",
+ "x BIND_PAT FileId(1) [69; 70)",
+ "x",
+ );
+
+ check_goto(
+ "
+ //- /lib.rs
+ macro_rules! id {
+ ($($tt:tt)*) => ($($tt)*)
+ }
+
+ fn foo() {
+ let x = 1;
+ id!({
+ let y = x;
+ let z = <|>y;
+ });
+ }
+ ",
+ "y BIND_PAT FileId(1) [98; 99)",
+ "y",
+ );
+ }
}
--
cgit v1.2.3