move SyntaxPtr to ra_syntax

3 files changed, 10 insertions, 10 deletions

diff --git a/crates/ra_ide_api/src/call_info.rs b/crates/ra_ide_api/src/call_info.rs
index 798fb7c13..0449c1902 100644
--- a/crates/ra_ide_api/src/call_info.rs
+++ b/crates/ra_ide_api/src/call_info.rs
@@ -23,8 +23,8 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
         .into_iter()
         .find(|it| it.ptr.kind() == FN_DEF)?;
     let fn_file = db.source_file(symbol.file_id);
-    let fn_def = symbol.ptr.resolve(&fn_file);
-    let fn_def = ast::FnDef::cast(&fn_def).unwrap();
+    let fn_def = symbol.ptr.to_node(&fn_file);
+    let fn_def = ast::FnDef::cast(fn_def).unwrap();
     let mut call_info = CallInfo::new(fn_def)?;
     // If we have a calling expression let's find which argument we are on
     let num_params = call_info.parameters.len();
diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs
index fa79908a1..ddd9354ec 100644
--- a/crates/ra_ide_api/src/imp.rs
+++ b/crates/ra_ide_api/src/imp.rs
@@ -153,7 +153,7 @@ impl db::RootDatabase {
                 source_binder::function_from_child_node(db, position.file_id, name_ref.syntax())?;
             let scope = descr.scopes(db);
             let resolved = scope.resolve_local_name(name_ref)?;
-            let resolved = resolved.ptr().resolve(source_file);
+            let resolved = resolved.ptr().to_node(source_file);
             let binding = find_node_at_offset::<ast::BindPat>(syntax, resolved.range().end())?;
             Some((binding, descr))
         }
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
index b563dfe88..1b5d1eb1d 100644
--- a/crates/ra_ide_api/src/symbol_index.rs
+++ b/crates/ra_ide_api/src/symbol_index.rs
@@ -27,13 +27,13 @@ use std::{
 
 use fst::{self, Streamer};
 use ra_syntax::{
-    SyntaxNode, SourceFile, SmolStr, TreeArc, AstNode,
+    SyntaxNode, SyntaxNodePtr, SourceFile, SmolStr, TreeArc, AstNode,
     algo::{visit::{visitor, Visitor}, find_covering_node},
     SyntaxKind::{self, *},
     ast::{self, NameOwner},
 };
 use ra_db::{
-    SourceRootId, FilesDatabase, LocalSyntaxPtr,
+    SourceRootId, FilesDatabase,
     salsa::{self, ParallelDatabase},
 };
 use rayon::prelude::*;
@@ -62,7 +62,7 @@ fn file_symbols(db: &impl SymbolsDatabase, file_id: FileId) -> Arc<SymbolIndex>
 
     for (name, text_range) in hir::source_binder::macro_symbols(db, file_id) {
         let node = find_covering_node(source_file.syntax(), text_range);
-        let ptr = LocalSyntaxPtr::new(node);
+        let ptr = SyntaxNodePtr::new(node);
         symbols.push(FileSymbol { file_id, name, ptr })
     }
 
@@ -196,13 +196,13 @@ fn is_type(kind: SyntaxKind) -> bool {
 pub(crate) struct FileSymbol {
     pub(crate) file_id: FileId,
     pub(crate) name: SmolStr,
-    pub(crate) ptr: LocalSyntaxPtr,
+    pub(crate) ptr: SyntaxNodePtr,
 }
 
-fn to_symbol(node: &SyntaxNode) -> Option<(SmolStr, LocalSyntaxPtr)> {
-    fn decl<N: NameOwner>(node: &N) -> Option<(SmolStr, LocalSyntaxPtr)> {
+fn to_symbol(node: &SyntaxNode) -> Option<(SmolStr, SyntaxNodePtr)> {
+    fn decl<N: NameOwner>(node: &N) -> Option<(SmolStr, SyntaxNodePtr)> {
         let name = node.name()?.text().clone();
-        let ptr = LocalSyntaxPtr::new(node.syntax());
+        let ptr = SyntaxNodePtr::new(node.syntax());
         Some((name, ptr))
     }
     visitor()