diff options
Diffstat (limited to 'crates/ra_ide/src/expand.rs')
-rw-r--r-- | crates/ra_ide/src/expand.rs | 84 |
1 files changed, 47 insertions, 37 deletions
diff --git a/crates/ra_ide/src/expand.rs b/crates/ra_ide/src/expand.rs index 661628ae4..7a22bb0a4 100644 --- a/crates/ra_ide/src/expand.rs +++ b/crates/ra_ide/src/expand.rs | |||
@@ -1,56 +1,66 @@ | |||
1 | //! Utilities to work with files, produced by macros. | 1 | //! Utilities to work with files, produced by macros. |
2 | use std::iter::successors; | 2 | use std::iter::successors; |
3 | 3 | ||
4 | use hir::InFile; | 4 | use hir::{InFile, Origin}; |
5 | use ra_db::FileId; | 5 | use ra_db::FileId; |
6 | use ra_syntax::{ast, AstNode, SyntaxNode, SyntaxToken, TextRange}; | 6 | use ra_syntax::{ast, AstNode, SyntaxNode, SyntaxToken, TextRange}; |
7 | 7 | ||
8 | use crate::{db::RootDatabase, FileRange}; | 8 | use crate::{db::RootDatabase, FileRange}; |
9 | 9 | ||
10 | pub(crate) fn original_range(db: &RootDatabase, node: InFile<&SyntaxNode>) -> FileRange { | 10 | pub(crate) fn original_range(db: &RootDatabase, node: InFile<&SyntaxNode>) -> FileRange { |
11 | let expansion = match node.file_id.expansion_info(db) { | 11 | if let Some((range, Origin::Call)) = original_range_and_origin(db, node) { |
12 | None => { | 12 | return range; |
13 | } | ||
14 | |||
15 | if let Some(expansion) = node.file_id.expansion_info(db) { | ||
16 | if let Some(call_node) = expansion.call_node() { | ||
13 | return FileRange { | 17 | return FileRange { |
14 | file_id: node.file_id.original_file(db), | 18 | file_id: call_node.file_id.original_file(db), |
15 | range: node.value.text_range(), | 19 | range: call_node.value.text_range(), |
16 | } | 20 | }; |
17 | } | 21 | } |
18 | Some(it) => it, | 22 | } |
19 | }; | 23 | |
24 | FileRange { file_id: node.file_id.original_file(db), range: node.value.text_range() } | ||
25 | } | ||
26 | |||
27 | fn original_range_and_origin( | ||
28 | db: &RootDatabase, | ||
29 | node: InFile<&SyntaxNode>, | ||
30 | ) -> Option<(FileRange, Origin)> { | ||
31 | let expansion = node.file_id.expansion_info(db)?; | ||
32 | |||
33 | // the input node has only one token ? | ||
34 | let single = node.value.first_token()? == node.value.last_token()?; | ||
35 | |||
20 | // FIXME: We should handle recurside macro expansions | 36 | // FIXME: We should handle recurside macro expansions |
37 | let (range, origin) = node.value.descendants().find_map(|it| { | ||
38 | let first = it.first_token()?; | ||
39 | let last = it.last_token()?; | ||
21 | 40 | ||
22 | let range = node.value.descendants_with_tokens().find_map(|it| { | 41 | if !single && first == last { |
23 | match it.as_token() { | 42 | return None; |
24 | // FIXME: Remove this branch after all `tt::TokenTree`s have a proper `TokenId`, | ||
25 | // and return the range of the overall macro expansions if mapping first and last tokens fails. | ||
26 | Some(token) => { | ||
27 | let token = expansion.map_token_up(node.with_value(&token))?; | ||
28 | Some(token.with_value(token.value.text_range())) | ||
29 | } | ||
30 | None => { | ||
31 | // Try to map first and last tokens of node, and, if success, return the union range of mapped tokens | ||
32 | let n = it.into_node()?; | ||
33 | let first = expansion.map_token_up(node.with_value(&n.first_token()?))?; | ||
34 | let last = expansion.map_token_up(node.with_value(&n.last_token()?))?; | ||
35 | |||
36 | // FIXME: Is is possible ? | ||
37 | if first.file_id != last.file_id { | ||
38 | return None; | ||
39 | } | ||
40 | |||
41 | // FIXME: Add union method in TextRange | ||
42 | let range = union_range(first.value.text_range(), last.value.text_range()); | ||
43 | Some(first.with_value(range)) | ||
44 | } | ||
45 | } | 43 | } |
46 | }); | ||
47 | 44 | ||
48 | return match range { | 45 | // Try to map first and last tokens of node, and, if success, return the union range of mapped tokens |
49 | Some(it) => FileRange { file_id: it.file_id.original_file(db), range: it.value }, | 46 | let (first, first_origin) = expansion.map_token_up(node.with_value(&first))?; |
50 | None => { | 47 | let (last, last_origin) = expansion.map_token_up(node.with_value(&last))?; |
51 | FileRange { file_id: node.file_id.original_file(db), range: node.value.text_range() } | 48 | |
49 | if first.file_id != last.file_id || first_origin != last_origin { | ||
50 | return None; | ||
52 | } | 51 | } |
53 | }; | 52 | |
53 | // FIXME: Add union method in TextRange | ||
54 | Some(( | ||
55 | first.with_value(union_range(first.value.text_range(), last.value.text_range())), | ||
56 | first_origin, | ||
57 | )) | ||
58 | })?; | ||
59 | |||
60 | return Some(( | ||
61 | FileRange { file_id: range.file_id.original_file(db), range: range.value }, | ||
62 | origin, | ||
63 | )); | ||
54 | 64 | ||
55 | fn union_range(a: TextRange, b: TextRange) -> TextRange { | 65 | fn union_range(a: TextRange, b: TextRange) -> TextRange { |
56 | let start = a.start().min(b.start()); | 66 | let start = a.start().min(b.start()); |