diff options
Diffstat (limited to 'crates/ra_hir_expand/src/db.rs')
-rw-r--r-- | crates/ra_hir_expand/src/db.rs | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index a4ee9a529..b789c6e7b 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs | |||
@@ -22,9 +22,12 @@ pub trait AstDatabase: SourceDatabase { | |||
22 | 22 | ||
23 | #[salsa::interned] | 23 | #[salsa::interned] |
24 | fn intern_macro(&self, macro_call: MacroCallLoc) -> MacroCallId; | 24 | fn intern_macro(&self, macro_call: MacroCallLoc) -> MacroCallId; |
25 | fn macro_arg(&self, id: MacroCallId) -> Option<Arc<tt::Subtree>>; | 25 | fn macro_arg(&self, id: MacroCallId) -> Option<Arc<(tt::Subtree, mbe::TokenMap)>>; |
26 | fn macro_def(&self, id: MacroDefId) -> Option<Arc<mbe::MacroRules>>; | 26 | fn macro_def(&self, id: MacroDefId) -> Option<Arc<(mbe::MacroRules, mbe::TokenMap)>>; |
27 | fn parse_macro(&self, macro_file: MacroFile) -> Option<Parse<SyntaxNode>>; | 27 | fn parse_macro( |
28 | &self, | ||
29 | macro_file: MacroFile, | ||
30 | ) -> Option<(Parse<SyntaxNode>, Arc<mbe::RevTokenMap>)>; | ||
28 | fn macro_expand(&self, macro_call: MacroCallId) -> Result<Arc<tt::Subtree>, String>; | 31 | fn macro_expand(&self, macro_call: MacroCallId) -> Result<Arc<tt::Subtree>, String>; |
29 | } | 32 | } |
30 | 33 | ||
@@ -34,10 +37,13 @@ pub(crate) fn ast_id_map(db: &dyn AstDatabase, file_id: HirFileId) -> Arc<AstIdM | |||
34 | Arc::new(map) | 37 | Arc::new(map) |
35 | } | 38 | } |
36 | 39 | ||
37 | pub(crate) fn macro_def(db: &dyn AstDatabase, id: MacroDefId) -> Option<Arc<MacroRules>> { | 40 | pub(crate) fn macro_def( |
41 | db: &dyn AstDatabase, | ||
42 | id: MacroDefId, | ||
43 | ) -> Option<Arc<(mbe::MacroRules, mbe::TokenMap)>> { | ||
38 | let macro_call = id.ast_id.to_node(db); | 44 | let macro_call = id.ast_id.to_node(db); |
39 | let arg = macro_call.token_tree()?; | 45 | let arg = macro_call.token_tree()?; |
40 | let (tt, _) = mbe::ast_to_token_tree(&arg).or_else(|| { | 46 | let (tt, tmap) = mbe::ast_to_token_tree(&arg).or_else(|| { |
41 | log::warn!("fail on macro_def to token tree: {:#?}", arg); | 47 | log::warn!("fail on macro_def to token tree: {:#?}", arg); |
42 | None | 48 | None |
43 | })?; | 49 | })?; |
@@ -45,15 +51,18 @@ pub(crate) fn macro_def(db: &dyn AstDatabase, id: MacroDefId) -> Option<Arc<Macr | |||
45 | log::warn!("fail on macro_def parse: {:#?}", tt); | 51 | log::warn!("fail on macro_def parse: {:#?}", tt); |
46 | None | 52 | None |
47 | })?; | 53 | })?; |
48 | Some(Arc::new(rules)) | 54 | Some(Arc::new((rules, tmap))) |
49 | } | 55 | } |
50 | 56 | ||
51 | pub(crate) fn macro_arg(db: &dyn AstDatabase, id: MacroCallId) -> Option<Arc<tt::Subtree>> { | 57 | pub(crate) fn macro_arg( |
58 | db: &dyn AstDatabase, | ||
59 | id: MacroCallId, | ||
60 | ) -> Option<Arc<(tt::Subtree, mbe::TokenMap)>> { | ||
52 | let loc = db.lookup_intern_macro(id); | 61 | let loc = db.lookup_intern_macro(id); |
53 | let macro_call = loc.ast_id.to_node(db); | 62 | let macro_call = loc.ast_id.to_node(db); |
54 | let arg = macro_call.token_tree()?; | 63 | let arg = macro_call.token_tree()?; |
55 | let (tt, _) = mbe::ast_to_token_tree(&arg)?; | 64 | let (tt, tmap) = mbe::ast_to_token_tree(&arg)?; |
56 | Some(Arc::new(tt)) | 65 | Some(Arc::new((tt, tmap))) |
57 | } | 66 | } |
58 | 67 | ||
59 | pub(crate) fn macro_expand( | 68 | pub(crate) fn macro_expand( |
@@ -64,7 +73,7 @@ pub(crate) fn macro_expand( | |||
64 | let macro_arg = db.macro_arg(id).ok_or("Fail to args in to tt::TokenTree")?; | 73 | let macro_arg = db.macro_arg(id).ok_or("Fail to args in to tt::TokenTree")?; |
65 | 74 | ||
66 | let macro_rules = db.macro_def(loc.def).ok_or("Fail to find macro definition")?; | 75 | let macro_rules = db.macro_def(loc.def).ok_or("Fail to find macro definition")?; |
67 | let tt = macro_rules.expand(¯o_arg).map_err(|err| format!("{:?}", err))?; | 76 | let tt = macro_rules.0.expand(¯o_arg.0).map_err(|err| format!("{:?}", err))?; |
68 | // Set a hard limit for the expanded tt | 77 | // Set a hard limit for the expanded tt |
69 | let count = tt.count(); | 78 | let count = tt.count(); |
70 | if count > 65536 { | 79 | if count > 65536 { |
@@ -77,7 +86,7 @@ pub(crate) fn parse_or_expand(db: &dyn AstDatabase, file_id: HirFileId) -> Optio | |||
77 | match file_id.0 { | 86 | match file_id.0 { |
78 | HirFileIdRepr::FileId(file_id) => Some(db.parse(file_id).tree().syntax().clone()), | 87 | HirFileIdRepr::FileId(file_id) => Some(db.parse(file_id).tree().syntax().clone()), |
79 | HirFileIdRepr::MacroFile(macro_file) => { | 88 | HirFileIdRepr::MacroFile(macro_file) => { |
80 | db.parse_macro(macro_file).map(|it| it.syntax_node()) | 89 | db.parse_macro(macro_file).map(|(it, _)| it.syntax_node()) |
81 | } | 90 | } |
82 | } | 91 | } |
83 | } | 92 | } |
@@ -85,8 +94,9 @@ pub(crate) fn parse_or_expand(db: &dyn AstDatabase, file_id: HirFileId) -> Optio | |||
85 | pub(crate) fn parse_macro( | 94 | pub(crate) fn parse_macro( |
86 | db: &dyn AstDatabase, | 95 | db: &dyn AstDatabase, |
87 | macro_file: MacroFile, | 96 | macro_file: MacroFile, |
88 | ) -> Option<Parse<SyntaxNode>> { | 97 | ) -> Option<(Parse<SyntaxNode>, Arc<mbe::RevTokenMap>)> { |
89 | let _p = profile("parse_macro_query"); | 98 | let _p = profile("parse_macro_query"); |
99 | |||
90 | let macro_call_id = macro_file.macro_call_id; | 100 | let macro_call_id = macro_file.macro_call_id; |
91 | let tt = db | 101 | let tt = db |
92 | .macro_expand(macro_call_id) | 102 | .macro_expand(macro_call_id) |
@@ -97,8 +107,13 @@ pub(crate) fn parse_macro( | |||
97 | log::warn!("fail on macro_parse: (reason: {})", err,); | 107 | log::warn!("fail on macro_parse: (reason: {})", err,); |
98 | }) | 108 | }) |
99 | .ok()?; | 109 | .ok()?; |
110 | |||
100 | match macro_file.macro_file_kind { | 111 | match macro_file.macro_file_kind { |
101 | MacroFileKind::Items => mbe::token_tree_to_items(&tt).ok().map(Parse::to_syntax), | 112 | MacroFileKind::Items => { |
102 | MacroFileKind::Expr => mbe::token_tree_to_expr(&tt).ok().map(Parse::to_syntax), | 113 | mbe::token_tree_to_items(&tt).ok().map(|(p, map)| (p.to_syntax(), Arc::new(map))) |
114 | } | ||
115 | MacroFileKind::Expr => { | ||
116 | mbe::token_tree_to_expr(&tt).ok().map(|(p, map)| (p.to_syntax(), Arc::new(map))) | ||
117 | } | ||
103 | } | 118 | } |
104 | } | 119 | } |