From afce8e442639fa9ed954b3659a2d1eccb7d80113 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Tue, 29 Jan 2019 20:49:31 +0100 Subject: Use the new Resolver API for goto def --- crates/ra_ide_api/src/navigation_target.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'crates/ra_ide_api/src/navigation_target.rs') diff --git a/crates/ra_ide_api/src/navigation_target.rs b/crates/ra_ide_api/src/navigation_target.rs index 5ccb5cc2e..617908aed 100644 --- a/crates/ra_ide_api/src/navigation_target.rs +++ b/crates/ra_ide_api/src/navigation_target.rs @@ -1,9 +1,9 @@ use ra_db::FileId; use ra_syntax::{ - SyntaxNode, AstNode, SmolStr, TextRange, ast, + SyntaxNode, SyntaxNodePtr, AstNode, SmolStr, TextRange, ast, SyntaxKind::{self, NAME}, }; -use hir::{ModuleSource, FieldSource}; +use hir::{ModuleSource, FieldSource, Name}; use crate::{FileSymbol, db::RootDatabase}; @@ -58,12 +58,13 @@ impl NavigationTarget { pub(crate) fn from_scope_entry( file_id: FileId, - entry: &hir::ScopeEntryWithSyntax, + name: Name, + ptr: SyntaxNodePtr, ) -> NavigationTarget { NavigationTarget { file_id, - name: entry.name().to_string().into(), - full_range: entry.ptr().range(), + name: name.to_string().into(), + full_range: ptr.range(), focus_range: None, kind: NAME, } -- cgit v1.2.3