From 98718e0544f42e55642d2838b00d6a7bef1e2414 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Fri, 15 Jan 2021 21:07:38 +0100 Subject: Wrap remaining self/super/crate in Name{Ref} --- crates/ide/src/display/navigation_target.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'crates/ide/src/display') diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs index 685052e7f..00e601244 100644 --- a/crates/ide/src/display/navigation_target.rs +++ b/crates/ide/src/display/navigation_target.rs @@ -400,15 +400,13 @@ impl TryToNav for hir::GenericParam { impl ToNav for hir::Local { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { let src = self.source(db); - let (node, focus_range) = match &src.value { - Either::Left(bind_pat) => ( - bind_pat.syntax().clone(), - bind_pat - .name() - .map(|it| src.with_value(&it.syntax().clone()).original_file_range(db).range), - ), - Either::Right(it) => (it.syntax().clone(), it.self_token().map(|it| it.text_range())), + let (node, name) = match &src.value { + Either::Left(bind_pat) => (bind_pat.syntax().clone(), bind_pat.name()), + Either::Right(it) => (it.syntax().clone(), it.name()), }; + let focus_range = + name.map(|it| src.with_value(&it.syntax().clone()).original_file_range(db).range); + let full_range = src.with_value(&node).original_file_range(db); let name = match self.name(db) { Some(it) => it.to_string().into(), -- cgit v1.2.3