From 7b901f86cd1d0198994e5a2ab7eea18f444dd148 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 23 Jan 2019 17:37:10 +0300 Subject: move SyntaxPtr to ra_syntax --- crates/ra_ide_api/src/symbol_index.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'crates/ra_ide_api/src/symbol_index.rs') 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 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(node: &N) -> Option<(SmolStr, LocalSyntaxPtr)> { +fn to_symbol(node: &SyntaxNode) -> Option<(SmolStr, SyntaxNodePtr)> { + fn decl(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() -- cgit v1.2.3