Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #4392

Browse source 
4392: Add From should not move the cursor r=matklad a=matklad



bors r+
🤖

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

25
crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
View file

@ -1,8 +1,5 @@
use ra_ide_db::RootDatabase;
use ra_syntax::{
ast::{self, AstNode, NameOwner},
TextSize,
};
use ra_syntax::ast::{self, AstNode, NameOwner};
use stdx::format_to;
use test_utils::tested_by;
@ -69,7 +66,6 @@ impl From<{0}> for {1} {{
variant_name
);
edit.insert(start_offset, buf);
edit.set_cursor(start_offset + TextSize::of("\n\n"));
},
)
}
@ -97,19 +93,20 @@ fn existing_from_impl(
#[cfg(test)]
mod tests {
use super::*;
use test_utils::covers;
use crate::tests::{check_assist, check_assist_not_applicable};
use test_utils::covers;
use super::*;
#[test]
fn test_add_from_impl_for_enum() {
check_assist(
add_from_impl_for_enum,
"enum A { <|>One(u32) }",
r#"enum A { One(u32) }
r#"enum A { <|>One(u32) }
<|>impl From<u32> for A {
impl From<u32> for A {
fn from(v: u32) -> Self {
A::One(v)
}
@ -121,10 +118,10 @@ mod tests {
fn test_add_from_impl_for_enum_complicated_path() {
check_assist(
add_from_impl_for_enum,
"enum A { <|>One(foo::bar::baz::Boo) }",
r#"enum A { One(foo::bar::baz::Boo) }
r#"enum A { <|>One(foo::bar::baz::Boo) }"#,
r#"enum A { <|>One(foo::bar::baz::Boo) }
<|>impl From<foo::bar::baz::Boo> for A {
impl From<foo::bar::baz::Boo> for A {
fn from(v: foo::bar::baz::Boo) -> Self {
A::One(v)
}
@ -184,9 +181,9 @@ impl From<String> for A {
pub trait From<T> {
fn from(T) -> Self;
}"#,
r#"enum A { One(u32), Two(String), }
r#"enum A { <|>One(u32), Two(String), }
<|>impl From<u32> for A {
impl From<u32> for A {
fn from(v: u32) -> Self {
A::One(v)
}