diff options
author | Aleksey Kladov <[email protected]> | 2019-02-11 18:12:06 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-02-11 18:12:06 +0000 |
commit | 0d34a256de5d33565e9a62d53bf149cf59510937 (patch) | |
tree | bac8f49c3902378a41c647e2a9235c64c0e53050 /crates/ra_mbe/src/syntax_bridge.rs | |
parent | 58897dd8ddfd08ef494b7bc05ac15f5b1e3a4e1a (diff) |
assign ids when converting tt
Diffstat (limited to 'crates/ra_mbe/src/syntax_bridge.rs')
-rw-r--r-- | crates/ra_mbe/src/syntax_bridge.rs | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs index d734f5597..798f9d8fa 100644 --- a/crates/ra_mbe/src/syntax_bridge.rs +++ b/crates/ra_mbe/src/syntax_bridge.rs | |||
@@ -1,10 +1,34 @@ | |||
1 | use ra_syntax::{ast, AstNode, SyntaxNode, SyntaxKind::*}; | 1 | use ra_syntax::{ |
2 | AstNode, SyntaxNode, TextRange, | ||
3 | ast, SyntaxKind::*, TextUnit | ||
4 | }; | ||
2 | 5 | ||
3 | pub fn ast_to_token_tree(ast: &ast::TokenTree) -> Option<tt::Subtree> { | 6 | #[derive(Default)] |
4 | convert_tt(ast.syntax()) | 7 | pub struct TokenMap { |
8 | /// Maps `tt::TokenId` to the *relative* source range. | ||
9 | toknes: Vec<TextRange>, | ||
5 | } | 10 | } |
6 | 11 | ||
7 | fn convert_tt(tt: &SyntaxNode) -> Option<tt::Subtree> { | 12 | pub fn ast_to_token_tree(ast: &ast::TokenTree) -> Option<(tt::Subtree, TokenMap)> { |
13 | let mut token_map = TokenMap::default(); | ||
14 | let node = ast.syntax(); | ||
15 | let tt = convert_tt(&mut token_map, node.range().start(), node)?; | ||
16 | Some((tt, token_map)) | ||
17 | } | ||
18 | |||
19 | impl TokenMap { | ||
20 | fn alloc(&mut self, relative_range: TextRange) -> tt::TokenId { | ||
21 | let id = self.toknes.len(); | ||
22 | self.toknes.push(relative_range); | ||
23 | tt::TokenId(id as u32) | ||
24 | } | ||
25 | } | ||
26 | |||
27 | fn convert_tt( | ||
28 | token_map: &mut TokenMap, | ||
29 | global_offset: TextUnit, | ||
30 | tt: &SyntaxNode, | ||
31 | ) -> Option<tt::Subtree> { | ||
8 | let first_child = tt.first_child()?; | 32 | let first_child = tt.first_child()?; |
9 | let last_child = tt.last_child()?; | 33 | let last_child = tt.last_child()?; |
10 | let delimiter = match (first_child.kind(), last_child.kind()) { | 34 | let delimiter = match (first_child.kind(), last_child.kind()) { |
@@ -34,10 +58,12 @@ fn convert_tt(tt: &SyntaxNode) -> Option<tt::Subtree> { | |||
34 | } | 58 | } |
35 | } else { | 59 | } else { |
36 | let child: tt::TokenTree = if child.kind() == TOKEN_TREE { | 60 | let child: tt::TokenTree = if child.kind() == TOKEN_TREE { |
37 | convert_tt(child)?.into() | 61 | convert_tt(token_map, global_offset, child)?.into() |
38 | } else if child.kind().is_keyword() || child.kind() == IDENT { | 62 | } else if child.kind().is_keyword() || child.kind() == IDENT { |
63 | let relative_range = child.range() - global_offset; | ||
64 | let id = token_map.alloc(relative_range); | ||
39 | let text = child.leaf_text().unwrap().clone(); | 65 | let text = child.leaf_text().unwrap().clone(); |
40 | tt::Leaf::from(tt::Ident { text, id: tt::TokenId::unspecified() }).into() | 66 | tt::Leaf::from(tt::Ident { text, id }).into() |
41 | } else if child.kind().is_literal() { | 67 | } else if child.kind().is_literal() { |
42 | tt::Leaf::from(tt::Literal { text: child.leaf_text().unwrap().clone() }).into() | 68 | tt::Leaf::from(tt::Literal { text: child.leaf_text().unwrap().clone() }).into() |
43 | } else { | 69 | } else { |