diff options
author | Edwin Cheng <[email protected]> | 2020-03-03 17:24:33 +0000 |
---|---|---|
committer | Edwin Cheng <[email protected]> | 2020-03-03 17:24:33 +0000 |
commit | 4d5e80c6c86aa6bfee50e9f8b80b365c3120ed80 (patch) | |
tree | 5fb0661acf0d672c72d5873bf94e0ad1b235d3a4 /crates | |
parent | 1e9a3233f753e1e4de6a56e84e46d1811526ddd9 (diff) |
Fix for rebasing
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_hir_expand/src/db.rs | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index ac8256a84..32e0d5ced 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs | |||
@@ -172,9 +172,20 @@ pub(crate) fn parse_macro( | |||
172 | // Note: | 172 | // Note: |
173 | // The final goal we would like to make all parse_macro success, | 173 | // The final goal we would like to make all parse_macro success, |
174 | // such that the following log will not call anyway. | 174 | // such that the following log will not call anyway. |
175 | let loc: MacroCallLoc = db.lookup_intern_macro(macro_call_id); | 175 | match macro_call_id { |
176 | let node = loc.kind.node(db); | 176 | MacroCallId::LazyMacro(id) => { |
177 | log::warn!("fail on macro_parse: (reason: {} macro_call: {:#})", err, node.value); | 177 | let loc: MacroCallLoc = db.lookup_intern_macro(id); |
178 | let node = loc.kind.node(db); | ||
179 | log::warn!( | ||
180 | "fail on macro_parse: (reason: {} macro_call: {:#})", | ||
181 | err, | ||
182 | node.value | ||
183 | ); | ||
184 | } | ||
185 | _ => { | ||
186 | log::warn!("fail on macro_parse: (reason: {})", err); | ||
187 | } | ||
188 | } | ||
178 | }) | 189 | }) |
179 | .ok()?; | 190 | .ok()?; |
180 | 191 | ||