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

Allow expand-macro to be invoked anywhere inside a macro call

Browse Source
This commit is contained in:
Lukas Wirth 2021-06-02 21:39:53 +02:00
parent 5be653d426
commit 841feef79e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ide/src/expand_macro.rs
View File

@ -28,8 +28,8 @@ pub struct ExpandedMacro {
pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<ExpandedMacro> {
let sema = Semantics::new(db);
let file = sema.parse(position.file_id);
let name_ref = find_node_at_offset::<ast::NameRef>(file.syntax(), position.offset)?;
let mac = name_ref.syntax().ancestors().find_map(ast::MacroCall::cast)?;
let mac = find_node_at_offset::<ast::MacroCall>(file.syntax(), position.offset)?;
let name = mac.path()?.segment()?.name_ref()?;
let expanded = expand_macro_recur(&sema, &mac)?;
@ -37,7 +37,7 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<
// macro expansion may lose all white space information
// But we hope someday we can use ra_fmt for that
let expansion = insert_whitespaces(expanded);
Some(ExpandedMacro { name: name_ref.text().to_string(), expansion })
Some(ExpandedMacro { name: name.to_string(), expansion })
}
fn expand_macro_recur(