language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

migrate ra_db to new rowan

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-07 17:00:39 +03:00
parent b88775af7f
commit fe53b28250
3 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_db/src/syntax_ptr.rs
View file

@ -1,4 +1,4 @@
use ra_syntax::{SourceFileNode, SyntaxKind, SyntaxNode, SyntaxNodeRef, TextRange};
use ra_syntax::{AstNode, SourceFile, SyntaxKind, SyntaxNode, TextRange, TreePtr};
/// A pointer to a syntax node inside a file.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@ -8,18 +8,18 @@ pub struct LocalSyntaxPtr {
}
impl LocalSyntaxPtr {
pub fn new(node: SyntaxNodeRef) -> LocalSyntaxPtr {
pub fn new(node: &SyntaxNode) -> LocalSyntaxPtr {
LocalSyntaxPtr {
range: node.range(),
kind: node.kind(),
}
}
pub fn resolve(self, file: &SourceFileNode) -> SyntaxNode {
pub fn resolve(self, file: &SourceFile) -> TreePtr<SyntaxNode> {
let mut curr = file.syntax();
loop {
if curr.range() == self.range && curr.kind() == self.kind {
return curr.owned();
return curr.to_owned();
}
curr = curr
.children()
@ -40,7 +40,7 @@ impl LocalSyntaxPtr {
#[test]
fn test_local_syntax_ptr() {
use ra_syntax::{ast, AstNode};
let file = SourceFileNode::parse("struct Foo { f: u32, }");
let file = SourceFile::parse("struct Foo { f: u32, }");
let field = file
.syntax()
.descendants()
@ -48,5 +48,5 @@ fn test_local_syntax_ptr() {
.unwrap();
let ptr = LocalSyntaxPtr::new(field.syntax());
let field_syntax = ptr.resolve(&file);
assert_eq!(field.syntax(), field_syntax);
assert_eq!(field.syntax(), &*field_syntax);
}