Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 06:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use ? and destructing to simplifed long code

Browse source
This commit is contained in:
Edwin Cheng 2019-11-04 21:43:36 +08:00
parent e6709f64af
commit 7e28924012
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
crates/ra_hir_expand/src/db.rs
View file

@ -132,35 +132,33 @@ pub(crate) fn parse_macro_with_info(
log::warn!("fail on macro_parse: (reason: {})", err,); log::warn!("fail on macro_parse: (reason: {})", err,);
}) })
.ok()?; .ok()?;
let res = match macro_file.macro_file_kind {
let (parsed, exp_map) = match macro_file.macro_file_kind {
MacroFileKind::Items => { MacroFileKind::Items => {
mbe::token_tree_to_items(&tt.0).ok().map(|(p, map)| (Parse::to_syntax(p), map)) mbe::token_tree_to_items(&tt.0).map(|(p, map)| (p.to_syntax(), map)).ok()?
} }
MacroFileKind::Expr => { MacroFileKind::Expr => {
mbe::token_tree_to_expr(&tt.0).ok().map(|(p, map)| (Parse::to_syntax(p), map)) mbe::token_tree_to_expr(&tt.0).map(|(p, map)| (p.to_syntax(), map)).ok()?
} }
}; };
res.map(|(parsed, exp_map)| { let expand_info = tt.1;
let expand_info = tt.1; let loc: MacroCallLoc = db.lookup_intern_macro(macro_call_id);
let loc: MacroCallLoc = db.lookup_intern_macro(macro_call_id);
let def_start = let arg_tt = loc.ast_id.to_node(db).token_tree();
loc.def.ast_id.to_node(db).token_tree().map(|t| t.syntax().text_range().start()); let def_tt = loc.def.ast_id.to_node(db).token_tree();
let arg_start =
loc.ast_id.to_node(db).token_tree().map(|t| t.syntax().text_range().start());
let arg_map = arg_start let arg_start = arg_tt.map(|t| t.syntax().text_range().start());
.map(|start| exp_map.ranges(&expand_info.arg_map, start)) let def_start = def_tt.map(|t| t.syntax().text_range().start());
.unwrap_or_else(|| Vec::new());
let def_map = def_start
.map(|start| exp_map.ranges(&expand_info.def_map, start))
.unwrap_or_else(|| Vec::new());
let info = ExpansionInfo { arg_map, def_map }; let arg_map =
arg_start.map(|start| exp_map.ranges(&expand_info.arg_map, start)).unwrap_or_default();
let def_map =
def_start.map(|start| exp_map.ranges(&expand_info.def_map, start)).unwrap_or_default();
ParseMacroWithInfo { parsed, expansion_info: Arc::new(info) } let info = ExpansionInfo { arg_map, def_map };
})
Some(ParseMacroWithInfo { parsed, expansion_info: Arc::new(info) })
} }
pub(crate) fn macro_expansion_info( pub(crate) fn macro_expansion_info(