bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/handlers/inline_macro.rs')
-rw-r--r--crates/ide-assists/src/handlers/inline_macro.rs29
1 files changed, 16 insertions, 13 deletions
diff --git a/crates/ide-assists/src/handlers/inline_macro.rs b/crates/ide-assists/src/handlers/inline_macro.rs
index 280bd7f2ca..ef9b5d093f 100644
--- a/crates/ide-assists/src/handlers/inline_macro.rs
+++ b/crates/ide-assists/src/handlers/inline_macro.rs
@@ -1,6 +1,6 @@
use hir::db::ExpandDatabase;
use ide_db::syntax_helpers::prettify_macro_expansion;
-use syntax::ast::{self, AstNode};
+use syntax::ast::{self, AstNode, edit::AstNodeEdit};
use crate::{AssistContext, AssistId, Assists};
@@ -46,12 +46,15 @@ pub(crate) fn inline_macro(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option
"Inline macro".to_owned(),
text_range,
|builder| {
+ let editor = builder.make_editor(unexpanded.syntax());
let expanded = ctx.sema.parse_or_expand(macro_call.into());
let span_map = ctx.sema.db.expansion_span_map(macro_call);
// Don't call `prettify_macro_expansion()` outside the actual assist action; it does some heavy rowan tree manipulation,
// which can be very costly for big macros when it is done *even without the assist being invoked*.
let expanded = prettify_macro_expansion(ctx.db(), expanded, &span_map, target_crate_id);
- builder.replace(text_range, expanded.to_string())
+ let expanded = ast::edit::indent(&expanded, unexpanded.indent_level());
+ editor.replace(unexpanded.syntax(), expanded);
+ builder.add_file_edits(ctx.vfs_file_id(), editor);
},
)
}
@@ -207,15 +210,15 @@ macro_rules! num {
inline_macro,
r#"
macro_rules! foo {
- () => {foo!()}
+ ($t:tt) => {foo!(1)}
}
-fn f() { let result = foo$0!(); }
+fn f() { let result = foo$0!(0); }
"#,
r#"
macro_rules! foo {
- () => {foo!()}
+ ($t:tt) => {foo!(1)}
}
-fn f() { let result = foo!(); }
+fn f() { let result = foo!(1); }
"#,
);
}
@@ -258,7 +261,7 @@ macro_rules! whitespace {
if true {}
};
}
-fn f() { if true{}; }
+fn f() { if true {}; }
"#,
)
}
@@ -297,12 +300,12 @@ macro_rules! foo {
}
fn main() {
cfg_if!{
- if #[cfg(test)]{
- 1;
- }else {
- 1;
- }
-};
+ if #[cfg(test)]{
+ 1;
+ }else {
+ 1;
+ }
+ };
}
"#,
);