Fixed tests

3 files changed, 28 insertions, 10 deletions

diff --git a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
index a36587633..2b1951aff 100644
--- a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -18,9 +18,9 @@ use ra_db::FileId;
 use ra_fmt::leading_indent;
 use rustc_hash::FxHashSet;
 
-// Assist extract_struct_from_enum
+// Assist: extract_struct_from_enum_variant
 //
-// Extracts a struct from enum variant
+// Extracts a struct from enum variant.
 //
 // ```
 // enum A { <|>One(u32, u32) }
@@ -29,9 +29,12 @@ use rustc_hash::FxHashSet;
 // ```
 // struct One(pub u32, pub u32);
 //
-// enum A { One(One) }"
+// enum A { One(One) }
 // ```
-pub(crate) fn extract_struct_from_enum(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+pub(crate) fn extract_struct_from_enum_variant(
+    acc: &mut Assists,
+    ctx: &AssistContext,
+) -> Option<()> {
     let variant = ctx.find_node_at_offset::<ast::EnumVariant>()?;
     let field_list = match variant.kind() {
         ast::StructKind::Tuple(field_list) => field_list,
@@ -221,7 +224,7 @@ mod tests {
     #[test]
     fn test_extract_struct_several_fields() {
         check_assist(
-            extract_struct_from_enum,
+            extract_struct_from_enum_variant,
             "enum A { <|>One(u32, u32) }",
             r#"struct One(pub u32, pub u32);
 
@@ -232,7 +235,7 @@ enum A { One(One) }"#,
     #[test]
     fn test_extract_struct_one_field() {
         check_assist(
-            extract_struct_from_enum,
+            extract_struct_from_enum_variant,
             "enum A { <|>One(u32) }",
             r#"struct One(pub u32);
 
@@ -243,7 +246,7 @@ enum A { One(One) }"#,
     #[test]
     fn test_extract_struct_pub_visibility() {
         check_assist(
-            extract_struct_from_enum,
+            extract_struct_from_enum_variant,
             "pub enum A { <|>One(u32, u32) }",
             r#"pub struct One(pub u32, pub u32);
 
@@ -254,7 +257,7 @@ pub enum A { One(One) }"#,
     #[test]
     fn test_extract_struct_with_complex_imports() {
         check_assist(
-            extract_struct_from_enum,
+            extract_struct_from_enum_variant,
             r#"mod my_mod {
     fn another_fn() {
         let m = my_other_mod::MyEnum::MyField(1, 1);
@@ -305,7 +308,7 @@ fn another_fn() {
     fn check_not_applicable(ra_fixture: &str) {
         let fixture =
             format!("//- main.rs crate:main deps:core\n{}\n{}", ra_fixture, FamousDefs::FIXTURE);
-        check_assist_not_applicable(extract_struct_from_enum, &fixture)
+        check_assist_not_applicable(extract_struct_from_enum_variant, &fixture)
     }
 
     #[test]
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 88ce9b62e..185428bd5 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -156,7 +156,7 @@ mod handlers {
             change_return_type_to_result::change_return_type_to_result,
             change_visibility::change_visibility,
             early_return::convert_to_guarded_return,
-            extract_struct_from_enum_variant::extract_struct_from_enum,
+            extract_struct_from_enum_variant::extract_struct_from_enum_variant,
             fill_match_arms::fill_match_arms,
             fix_visibility::fix_visibility,
             flip_binexpr::flip_binexpr,
diff --git a/crates/ra_assists/src/tests/generated.rs b/crates/ra_assists/src/tests/generated.rs
index d17504529..40a223727 100644
--- a/crates/ra_assists/src/tests/generated.rs
+++ b/crates/ra_assists/src/tests/generated.rs
@@ -338,6 +338,21 @@ fn main() {
 }
 
 #[test]
+fn doctest_extract_struct_from_enum_variant() {
+    check_doc_test(
+        "extract_struct_from_enum_variant",
+        r#####"
+enum A { <|>One(u32, u32) }
+"#####,
+        r#####"
+struct One(pub u32, pub u32);
+
+enum A { One(One) }
+"#####,
+    )
+}
+
+#[test]
 fn doctest_fill_match_arms() {
     check_doc_test(
         "fill_match_arms",