itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 11:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve indentation

Browse Source
This commit is contained in:
Jonas Schievink 2021-06-02 22:27:12 +02:00
parent e4c019fcaa
commit 6c0e58d107
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
crates/ide_assists/src/handlers/extract_type_alias.rs
View File

@ -1,5 +1,5 @@
use syntax::{
ast::{self, AstNode},
ast::{self, edit::IndentLevel, AstNode},
match_ast,
};
@ -31,10 +31,12 @@ pub(crate) fn extract_type_alias(acc: &mut Assists, ctx: &AssistContext) -> Opti
let item = ctx.find_node_at_offset::<ast::Item>()?;
let insert = match_ast! {
match (item.syntax().parent()?) {
ast::AssocItemList(it) => it.syntax().parent()?.text_range().start(),
_ => item.syntax().text_range().start(),
ast::AssocItemList(it) => it.syntax().parent()?.clone(),
_ => item.syntax().clone(),
}
};
let indent = IndentLevel::from_node(&insert);
let insert = insert.text_range().start();
let target = node.syntax().text_range();
acc.add(
@ -46,10 +48,14 @@ pub(crate) fn extract_type_alias(acc: &mut Assists, ctx: &AssistContext) -> Opti
builder.replace(target, "Type");
match ctx.config.snippet_cap {
Some(cap) => {
builder.insert_snippet(cap, insert, format!("type $0Type = {};\n\n", node));
builder.insert_snippet(
cap,
insert,
format!("type $0Type = {};\n\n{}", node, indent),
);
}
None => {
builder.insert(insert, format!("type Type = {};\n\n", node));
builder.insert(insert, format!("type Type = {};\n\n{}", node, indent));
}
}
},
@ -191,4 +197,23 @@ trait Tr {
"#,
);
}
#[test]
fn indentation() {
check_assist(
extract_type_alias,
r#"
mod m {
fn f() -> $0u8$0 {}
}
"#,
r#"
mod m {
type $0Type = u8;
fn f() -> Type {}
}
"#,
);
}
}