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

Merge #4525

Browse source 
4525: Better cursor placement when adding impl members r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-05-20 00:11:25 +00:00 committed by GitHub
commit efac093093
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
crates/ra_assists/src/handlers/add_missing_impl_members.rs
View file

@ -45,8 +45,8 @@ enum AddMissingImplMembersMode {
// } // }
// //
// impl Trait<u32> for () { // impl Trait<u32> for () {
// $0fn foo(&self) -> u32 { // fn foo(&self) -> u32 {
// todo!() // ${0:todo!()}
// } // }
// //
// } // }
@ -167,15 +167,23 @@ fn add_missing_impl_members_inner(
let original_range = impl_item_list.syntax().text_range(); let original_range = impl_item_list.syntax().text_range();
match ctx.config.snippet_cap { match ctx.config.snippet_cap {
None => builder.replace(original_range, new_impl_item_list.to_string()), None => builder.replace(original_range, new_impl_item_list.to_string()),
Some(cap) => builder.replace_snippet( Some(cap) => {
cap, let mut cursor = Cursor::Before(first_new_item.syntax());
original_range, let placeholder;
render_snippet( if let ast::AssocItem::FnDef(func) = &first_new_item {
if let Some(m) = func.syntax().descendants().find_map(ast::MacroCall::cast) {
if m.syntax().text() == "todo!()" {
placeholder = m;
cursor = Cursor::Replace(placeholder.syntax());
}
}
}
builder.replace_snippet(
cap, cap,
new_impl_item_list.syntax(), original_range,
Cursor::Before(first_new_item.syntax()), render_snippet(cap, new_impl_item_list.syntax(), cursor),
), )
), }
}; };
}) })
} }
@ -271,8 +279,8 @@ struct S;
impl Foo for S { impl Foo for S {
fn bar(&self) {} fn bar(&self) {}
$0fn foo(&self) { fn foo(&self) {
todo!() ${0:todo!()}
} }
}"#, }"#,
@ -291,8 +299,8 @@ impl Foo for S { <|> }"#,
trait Foo { fn foo(&self); } trait Foo { fn foo(&self); }
struct S; struct S;
impl Foo for S { impl Foo for S {
$0fn foo(&self) { fn foo(&self) {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -310,8 +318,8 @@ impl Foo<u32> for S { <|> }"#,
trait Foo<T> { fn foo(&self, t: T) -> &T; } trait Foo<T> { fn foo(&self, t: T) -> &T; }
struct S; struct S;
impl Foo<u32> for S { impl Foo<u32> for S {
$0fn foo(&self, t: u32) -> &u32 { fn foo(&self, t: u32) -> &u32 {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -329,8 +337,8 @@ impl<U> Foo<U> for S { <|> }"#,
trait Foo<T> { fn foo(&self, t: T) -> &T; } trait Foo<T> { fn foo(&self, t: T) -> &T; }
struct S; struct S;
impl<U> Foo<U> for S { impl<U> Foo<U> for S {
$0fn foo(&self, t: U) -> &U { fn foo(&self, t: U) -> &U {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -348,8 +356,8 @@ impl Foo for S {}<|>"#,
trait Foo { fn foo(&self); } trait Foo { fn foo(&self); }
struct S; struct S;
impl Foo for S { impl Foo for S {
$0fn foo(&self) { fn foo(&self) {
todo!() ${0:todo!()}
} }
}"#, }"#,
) )
@ -373,8 +381,8 @@ mod foo {
} }
struct S; struct S;
impl foo::Foo for S { impl foo::Foo for S {
$0fn foo(&self, bar: foo::Bar) { fn foo(&self, bar: foo::Bar) {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -398,8 +406,8 @@ mod foo {
} }
struct S; struct S;
impl foo::Foo for S { impl foo::Foo for S {
$0fn foo(&self, bar: foo::Bar<u32>) { fn foo(&self, bar: foo::Bar<u32>) {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -423,8 +431,8 @@ mod foo {
} }
struct S; struct S;
impl foo::Foo<u32> for S { impl foo::Foo<u32> for S {
$0fn foo(&self, bar: foo::Bar<u32>) { fn foo(&self, bar: foo::Bar<u32>) {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -451,8 +459,8 @@ mod foo {
struct Param; struct Param;
struct S; struct S;
impl foo::Foo<Param> for S { impl foo::Foo<Param> for S {
$0fn foo(&self, bar: Param) { fn foo(&self, bar: Param) {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -478,8 +486,8 @@ mod foo {
} }
struct S; struct S;
impl foo::Foo for S { impl foo::Foo for S {
$0fn foo(&self, bar: foo::Bar<u32>::Assoc) { fn foo(&self, bar: foo::Bar<u32>::Assoc) {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -505,8 +513,8 @@ mod foo {
} }
struct S; struct S;
impl foo::Foo for S { impl foo::Foo for S {
$0fn foo(&self, bar: foo::Bar<foo::Baz>) { fn foo(&self, bar: foo::Bar<foo::Baz>) {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -530,8 +538,8 @@ mod foo {
} }
struct S; struct S;
impl foo::Foo for S { impl foo::Foo for S {
$0fn foo(&self, bar: dyn Fn(u32) -> i32) { fn foo(&self, bar: dyn Fn(u32) -> i32) {
todo!() ${0:todo!()}
} }
}"#, }"#,
); );
@ -645,8 +653,8 @@ trait Foo<T = Self> {
struct S; struct S;
impl Foo for S { impl Foo for S {
$0fn bar(&self, other: &Self) { fn bar(&self, other: &Self) {
todo!() ${0:todo!()}
} }
}"#, }"#,
) )
@ -670,8 +678,8 @@ trait Foo<T1, T2 = Self> {
struct S<T>; struct S<T>;
impl Foo<T> for S<T> { impl Foo<T> for S<T> {
$0fn bar(&self, this: &T, that: &Self) { fn bar(&self, this: &T, that: &Self) {
todo!() ${0:todo!()}
} }
}"#, }"#,
) )

4
crates/ra_assists/src/tests/generated.rs
View file

@ -180,8 +180,8 @@ trait Trait<T> {
} }
impl Trait<u32> for () { impl Trait<u32> for () {
$0fn foo(&self) -> u32 { fn foo(&self) -> u32 {
todo!() ${0:todo!()}
} }
} }

4
docs/user/assists.md
View file

@ -175,8 +175,8 @@ trait Trait<T> {
} }
impl Trait<u32> for () { impl Trait<u32> for () {
$0fn foo(&self) -> u32 { fn foo(&self) -> u32 {
todo!() ${0:todo!()}
} }
} }