Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 09:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1160

Browse source 
1160: better formatting when adding trait members r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-04-17 11:11:31 +00:00
commit 112fd0ec7d
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
crates/ra_assists/src/add_missing_impl_members.rs
View file

@ -109,6 +109,7 @@ fn add_missing_impl_members_inner(
let replaced_text_range = TextUnit::of_str(&func_bodies);
edit.replace(changed_range, func_bodies);
// FIXME: place the cursor on the first unimplemented?
edit.set_cursor(
changed_range.start() + replaced_text_range - TextUnit::of_str(&trailing_whitespace),
);
@ -138,7 +139,7 @@ fn build_func_body(def: &ast::FnDef) -> String {
for child in def.syntax().children_with_tokens() {
match (child.prev_sibling_or_token().map(|c| c.kind()), child.kind()) {
(_, SyntaxKind::SEMI) => buf.push_str(" { unimplemented!() }"),
(_, SyntaxKind::SEMI) => buf.push_str(" {\n unimplemented!()\n}"),
(_, SyntaxKind::ATTR) | (_, SyntaxKind::COMMENT) => {}
(Some(SyntaxKind::ATTR), SyntaxKind::WHITESPACE)
| (Some(SyntaxKind::COMMENT), SyntaxKind::WHITESPACE) => {}
@ -182,8 +183,12 @@ struct S;
impl Foo for S {
fn bar(&self) {}
fn foo(&self) { unimplemented!() }
fn baz(&self) { unimplemented!() }<|>
fn foo(&self) {
unimplemented!()
}
fn baz(&self) {
unimplemented!()
}<|>
}",
);
}
@ -216,7 +221,9 @@ struct S;
impl Foo for S {
fn bar(&self) {}
fn foo(&self) { unimplemented!() }<|>
fn foo(&self) {
unimplemented!()
}<|>
}",
);
}
@ -233,7 +240,9 @@ impl Foo for S { <|> }",
trait Foo { fn foo(&self); }
struct S;
impl Foo for S {
fn foo(&self) { unimplemented!() }<|>
fn foo(&self) {
unimplemented!()
}<|>
}",
);
}
@ -250,7 +259,9 @@ impl Foo for S {}<|>",
trait Foo { fn foo(&self); }
struct S;
impl Foo for S {
fn foo(&self) { unimplemented!() }<|>
fn foo(&self) {
unimplemented!()
}<|>
}",
)
}
@ -301,7 +312,9 @@ struct S;
mod my_mod {
impl crate::Foo for S {
fn valid(some: u32) -> bool { unimplemented!() }<|>
fn valid(some: u32) -> bool {
unimplemented!()
}<|>
}
}",
)
@ -329,7 +342,9 @@ trait Foo {
}
struct S;
impl Foo for S {
fn foo(&self) { unimplemented!() }<|>
fn foo(&self) {
unimplemented!()
}<|>
}"#,
)
}