mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify code with @Veykril's suggestion.

Browse Source
This commit is contained in:
Tom Kunc 2023-01-09 07:01:41 -07:00
parent 16654ce154
commit 769273ca4c
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ide-assists/src/handlers/inline_macro.rs
View File

@ -34,25 +34,16 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
// } // }
// ``` // ```
pub(crate) fn inline_macro(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { pub(crate) fn inline_macro(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
let tok = ctx.token_at_offset().right_biased()?; let unexpanded = ctx.find_node_at_offset::<ast::MacroCall>()?;
let expanded = ctx.sema.expand(&unexpanded)?.clone_for_update();
let mut anc = tok.parent_ancestors(); let text_range = unexpanded.syntax().text_range();
let (_name, expanded, unexpanded) = loop {
let node = anc.next()?;
if let Some(mac) = ast::MacroCall::cast(node.clone()) {
break (
mac.path()?.segment()?.name_ref()?.to_string(),
ctx.sema.expand(&mac)?.clone_for_update(),
node,
);
}
};
acc.add( acc.add(
AssistId("inline_macro", AssistKind::RefactorRewrite), AssistId("inline_macro", AssistKind::RefactorRewrite),
format!("Inline macro"), format!("Inline macro"),
unexpanded.text_range(), text_range,
|builder| builder.replace(unexpanded.text_range(), expanded.to_string()), |builder| builder.replace(text_range, expanded.to_string()),
) )
} }