aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_analysis')
-rw-r--r--crates/ra_analysis/src/descriptors/mod.rs3
-rw-r--r--crates/ra_analysis/src/lib.rs1
-rw-r--r--crates/ra_analysis/src/syntax_ptr.rs67
3 files changed, 69 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/descriptors/mod.rs b/crates/ra_analysis/src/descriptors/mod.rs
index 873eb47e4..0220f7d5d 100644
--- a/crates/ra_analysis/src/descriptors/mod.rs
+++ b/crates/ra_analysis/src/descriptors/mod.rs
@@ -2,7 +2,6 @@ pub(crate) mod module;
2 2
3use ra_syntax::{ 3use ra_syntax::{
4 ast::{self, AstNode, NameOwner}, 4 ast::{self, AstNode, NameOwner},
5 text_utils::is_subrange,
6}; 5};
7 6
8#[derive(Debug, Clone)] 7#[derive(Debug, Clone)]
@@ -23,7 +22,7 @@ impl FnDescriptor {
23 let label: String = node 22 let label: String = node
24 .syntax() 23 .syntax()
25 .children() 24 .children()
26 .filter(|child| !is_subrange(body_range, child.range())) 25 .filter(|child| !child.range().is_subrange(&body_range))
27 .map(|node| node.text().to_string()) 26 .map(|node| node.text().to_string())
28 .collect(); 27 .collect();
29 label 28 label
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index a67cac21e..363c72c0b 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -12,6 +12,7 @@ mod descriptors;
12mod imp; 12mod imp;
13mod symbol_index; 13mod symbol_index;
14mod completion; 14mod completion;
15mod syntax_ptr;
15 16
16use std::{ 17use std::{
17 fmt, 18 fmt,
diff --git a/crates/ra_analysis/src/syntax_ptr.rs b/crates/ra_analysis/src/syntax_ptr.rs
new file mode 100644
index 000000000..863ad2672
--- /dev/null
+++ b/crates/ra_analysis/src/syntax_ptr.rs
@@ -0,0 +1,67 @@
1use ra_syntax::{
2 File, TextRange, SyntaxKind, SyntaxNode, SyntaxNodeRef,
3 ast::{self, AstNode},
4};
5
6use crate::FileId;
7use crate::db::SyntaxDatabase;
8
9/// SyntaxPtr is a cheap `Copy` id which identifies a particular syntax node,
10/// without retainig syntax tree in memory. You need to explicitelly `resovle`
11/// `SyntaxPtr` to get a `SyntaxNode`
12#[derive(Debug, Clone, Copy, PartialEq, Eq)]
13pub(crate) struct SyntaxPtr {
14 file_id: FileId,
15 local: LocalSyntaxPtr,
16}
17
18impl SyntaxPtr {
19 pub(crate) fn new(file_id: FileId, node: SyntaxNodeRef) -> SyntaxPtr {
20 let local = LocalSyntaxPtr::new(node);
21 SyntaxPtr { file_id, local }
22 }
23
24 pub(crate) fn resolve(self, db: &impl SyntaxDatabase) -> SyntaxNode {
25 let syntax = db.file_syntax(self.file_id);
26 self.local.resolve(&syntax)
27 }
28}
29
30
31/// A pionter to a syntax node inside a file.
32#[derive(Debug, Clone, Copy, PartialEq, Eq)]
33struct LocalSyntaxPtr {
34 range: TextRange,
35 kind: SyntaxKind,
36}
37
38impl LocalSyntaxPtr {
39 fn new(node: SyntaxNodeRef) -> LocalSyntaxPtr {
40 LocalSyntaxPtr {
41 range: node.range(),
42 kind: node.kind(),
43 }
44 }
45
46 fn resolve(self, file: &File) -> SyntaxNode {
47 let mut curr = file.syntax();
48 loop {
49 if curr.range() == self.range && curr.kind() == self.kind {
50 return curr.owned();
51 }
52 curr = curr.children()
53 .find(|it| self.range.is_subrange(&it.range()))
54 .unwrap_or_else(|| panic!("can't resovle local ptr to SyntaxNode: {:?}", self))
55 }
56 }
57}
58
59
60#[test]
61fn test_local_syntax_ptr() {
62 let file = File::parse("struct Foo { f: u32, }");
63 let field = file.syntax().descendants().find_map(ast::NamedFieldDef::cast).unwrap();
64 let ptr = LocalSyntaxPtr::new(field.syntax());
65 let field_syntax = ptr.resolve(&file);
66 assert_eq!(field.syntax(), field_syntax);
67}