Auto merge of #14114 - lh123:insert-ws-when-inline-macro, r=lnicola
fix: Insert spaces when inlining macros Fixes https://github.com/rust-lang/rust-analyzer/issues/14108
This commit is contained in:
commit
e2b868c534
@ -1,3 +1,4 @@
|
|||||||
|
use ide_db::syntax_helpers::insert_whitespace_into_node::insert_ws_into;
|
||||||
use syntax::ast::{self, AstNode};
|
use syntax::ast::{self, AstNode};
|
||||||
|
|
||||||
use crate::{AssistContext, AssistId, AssistKind, Assists};
|
use crate::{AssistContext, AssistId, AssistKind, Assists};
|
||||||
@ -35,7 +36,7 @@ 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 unexpanded = ctx.find_node_at_offset::<ast::MacroCall>()?;
|
let unexpanded = ctx.find_node_at_offset::<ast::MacroCall>()?;
|
||||||
let expanded = ctx.sema.expand(&unexpanded)?.clone_for_update();
|
let expanded = insert_ws_into(ctx.sema.expand(&unexpanded)?.clone_for_update());
|
||||||
|
|
||||||
let text_range = unexpanded.syntax().text_range();
|
let text_range = unexpanded.syntax().text_range();
|
||||||
|
|
||||||
@ -230,4 +231,27 @@ fn f() { let result = foo$0(); }
|
|||||||
"#,
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn inline_macro_with_whitespace() {
|
||||||
|
check_assist(
|
||||||
|
inline_macro,
|
||||||
|
r#"
|
||||||
|
macro_rules! whitespace {
|
||||||
|
() => {
|
||||||
|
if true {}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
fn f() { whitespace$0!(); }
|
||||||
|
"#,
|
||||||
|
r#"
|
||||||
|
macro_rules! whitespace {
|
||||||
|
() => {
|
||||||
|
if true {}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
fn f() { if true{}; }
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user