3 files changed, 96 insertions, 72 deletions

diff --git a/crates/ide_assists/src/handlers/generate_enum_projection_method.rs b/crates/ide_assists/src/handlers/generate_enum_projection_method.rs
index 71447f310..871bcab50 100644
--- a/crates/ide_assists/src/handlers/generate_enum_projection_method.rs
+++ b/crates/ide_assists/src/handlers/generate_enum_projection_method.rs
@@ -8,9 +8,9 @@ use crate::{
     AssistContext, AssistId, AssistKind, Assists,
 };
 
-// Assist: generate_enum_into_method
+// Assist: generate_enum_try_into_method
 //
-// Generate an `into_` method for an enum variant.
+// Generate an `try_into_` method for an enum variant.
 //
 // ```
 // enum Value {
@@ -26,23 +26,29 @@ use crate::{
 // }
 //
 // impl Value {
-//     fn into_text(self) -> Option<String> {
+//     fn try_into_text(self) -> Result<String, Self> {
 //         if let Self::Text(v) = self {
-//             Some(v)
+//             Ok(v)
 //         } else {
-//             None
+//             Err(self)
 //         }
 //     }
 // }
 // ```
-pub(crate) fn generate_enum_into_method(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+pub(crate) fn generate_enum_try_into_method(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     generate_enum_projection_method(
         acc,
         ctx,
-        "generate_enum_into_method",
-        "Generate an `into_` method for an enum variant",
-        "into",
-        "",
+        "generate_enum_try_into_method",
+        "Generate an `try_into_` method for an enum variant",
+        ProjectionProps {
+            fn_name_prefix: "try_into",
+            self_param: "self",
+            return_prefix: "Result<",
+            return_suffix: ", Self>",
+            happy_case: "Ok",
+            sad_case: "Err(self)",
+        },
     )
 }
 
@@ -79,18 +85,32 @@ pub(crate) fn generate_enum_as_method(acc: &mut Assists, ctx: &AssistContext) ->
         ctx,
         "generate_enum_as_method",
         "Generate an `as_` method for an enum variant",
-        "as",
-        "&",
+        ProjectionProps {
+            fn_name_prefix: "as",
+            self_param: "&self",
+            return_prefix: "Option<&",
+            return_suffix: ">",
+            happy_case: "Some",
+            sad_case: "None",
+        },
     )
 }
 
-pub(crate) fn generate_enum_projection_method(
+struct ProjectionProps {
+    fn_name_prefix: &'static str,
+    self_param: &'static str,
+    return_prefix: &'static str,
+    return_suffix: &'static str,
+    happy_case: &'static str,
+    sad_case: &'static str,
+}
+
+fn generate_enum_projection_method(
     acc: &mut Assists,
     ctx: &AssistContext,
     assist_id: &'static str,
     assist_description: &str,
-    fn_name_prefix: &str,
-    ref_prefix: &str,
+    props: ProjectionProps,
 ) -> Option<()> {
     let variant = ctx.find_node_at_offset::<ast::Variant>()?;
     let variant_name = variant.name()?;
@@ -112,7 +132,7 @@ pub(crate) fn generate_enum_projection_method(
         ast::StructKind::Unit => return None,
     };
 
-    let fn_name = format!("{}_{}", fn_name_prefix, &to_lower_snake_case(variant_name.text()));
+    let fn_name = format!("{}_{}", props.fn_name_prefix, &to_lower_snake_case(variant_name.text()));
 
     // Return early if we've found an existing new fn
     let impl_def = find_struct_impl(&ctx, &parent_enum, &fn_name)?;
@@ -121,20 +141,24 @@ pub(crate) fn generate_enum_projection_method(
     acc.add(AssistId(assist_id, AssistKind::Generate), assist_description, target, |builder| {
         let vis = parent_enum.visibility().map_or(String::new(), |v| format!("{} ", v));
         let method = format!(
-            "    {0}fn {1}({2}self) -> Option<{2}{3}> {{
-        if let Self::{4}{5} = self {{
-            Some({6})
+            "    {0}fn {1}({2}) -> {3}{4}{5} {{
+        if let Self::{6}{7} = self {{
+            {8}({9})
         }} else {{
-            None
+            {10}
         }}
     }}",
             vis,
             fn_name,
-            ref_prefix,
+            props.self_param,
+            props.return_prefix,
             field_type.syntax(),
+            props.return_suffix,
             variant_name,
             pattern_suffix,
+            props.happy_case,
             bound_name,
+            props.sad_case,
         );
 
         add_method_to_adt(builder, &parent_enum, impl_def, &method);
@@ -148,9 +172,9 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_generate_enum_into_tuple_variant() {
+    fn test_generate_enum_try_into_tuple_variant() {
         check_assist(
-            generate_enum_into_method,
+            generate_enum_try_into_method,
             r#"
 enum Value {
     Number(i32),
@@ -162,11 +186,11 @@ enum Value {
 }
 
 impl Value {
-    fn into_text(self) -> Option<String> {
+    fn try_into_text(self) -> Result<String, Self> {
         if let Self::Text(v) = self {
-            Some(v)
+            Ok(v)
         } else {
-            None
+            Err(self)
         }
     }
 }"#,
@@ -174,20 +198,20 @@ impl Value {
     }
 
     #[test]
-    fn test_generate_enum_into_already_implemented() {
+    fn test_generate_enum_try_into_already_implemented() {
         check_assist_not_applicable(
-            generate_enum_into_method,
+            generate_enum_try_into_method,
             r#"enum Value {
     Number(i32),
     Text(String)$0,
 }
 
 impl Value {
-    fn into_text(self) -> Option<String> {
+    fn try_into_text(self) -> Result<String, Self> {
         if let Self::Text(v) = self {
-            Some(v)
+            Ok(v)
         } else {
-            None
+            Err(self)
         }
     }
 }"#,
@@ -195,9 +219,9 @@ impl Value {
     }
 
     #[test]
-    fn test_generate_enum_into_unit_variant() {
+    fn test_generate_enum_try_into_unit_variant() {
         check_assist_not_applicable(
-            generate_enum_into_method,
+            generate_enum_try_into_method,
             r#"enum Value {
     Number(i32),
     Text(String),
@@ -207,9 +231,9 @@ impl Value {
     }
 
     #[test]
-    fn test_generate_enum_into_record_with_multiple_fields() {
+    fn test_generate_enum_try_into_record_with_multiple_fields() {
         check_assist_not_applicable(
-            generate_enum_into_method,
+            generate_enum_try_into_method,
             r#"enum Value {
     Number(i32),
     Text(String),
@@ -219,9 +243,9 @@ impl Value {
     }
 
     #[test]
-    fn test_generate_enum_into_tuple_with_multiple_fields() {
+    fn test_generate_enum_try_into_tuple_with_multiple_fields() {
         check_assist_not_applicable(
-            generate_enum_into_method,
+            generate_enum_try_into_method,
             r#"enum Value {
     Number(i32),
     Text(String, String)$0,
@@ -230,9 +254,9 @@ impl Value {
     }
 
     #[test]
-    fn test_generate_enum_into_record_variant() {
+    fn test_generate_enum_try_into_record_variant() {
         check_assist(
-            generate_enum_into_method,
+            generate_enum_try_into_method,
             r#"enum Value {
     Number(i32),
     Text { text: String }$0,
@@ -243,11 +267,11 @@ impl Value {
 }
 
 impl Value {
-    fn into_text(self) -> Option<String> {
+    fn try_into_text(self) -> Result<String, Self> {
         if let Self::Text { text } = self {
-            Some(text)
+            Ok(text)
         } else {
-            None
+            Err(self)
         }
     }
 }"#,
diff --git a/crates/ide_assists/src/lib.rs b/crates/ide_assists/src/lib.rs
index c5137df96..4c067d451 100644
--- a/crates/ide_assists/src/lib.rs
+++ b/crates/ide_assists/src/lib.rs
@@ -191,7 +191,7 @@ mod handlers {
             generate_default_from_enum_variant::generate_default_from_enum_variant,
             generate_derive::generate_derive,
             generate_enum_is_method::generate_enum_is_method,
-            generate_enum_projection_method::generate_enum_into_method,
+            generate_enum_projection_method::generate_enum_try_into_method,
             generate_enum_projection_method::generate_enum_as_method,
             generate_from_impl_for_enum::generate_from_impl_for_enum,
             generate_function::generate_function,
diff --git a/crates/ide_assists/src/tests/generated.rs b/crates/ide_assists/src/tests/generated.rs
index 14b372c62..7f6dbbccf 100644
--- a/crates/ide_assists/src/tests/generated.rs
+++ b/crates/ide_assists/src/tests/generated.rs
@@ -512,35 +512,6 @@ impl Value {
 }
 
 #[test]
-fn doctest_generate_enum_into_method() {
-    check_doc_test(
-        "generate_enum_into_method",
-        r#####"
-enum Value {
- Number(i32),
- Text(String)$0,
-}
-"#####,
-        r#####"
-enum Value {
- Number(i32),
- Text(String),
-}
-
-impl Value {
-    fn into_text(self) -> Option<String> {
-        if let Self::Text(v) = self {
-            Some(v)
-        } else {
-            None
-        }
-    }
-}
-"#####,
-    )
-}
-
-#[test]
 fn doctest_generate_enum_is_method() {
     check_doc_test(
         "generate_enum_is_method",
@@ -569,6 +540,35 @@ impl Version {
 }
 
 #[test]
+fn doctest_generate_enum_try_into_method() {
+    check_doc_test(
+        "generate_enum_try_into_method",
+        r#####"
+enum Value {
+ Number(i32),
+ Text(String)$0,
+}
+"#####,
+        r#####"
+enum Value {
+ Number(i32),
+ Text(String),
+}
+
+impl Value {
+    fn try_into_text(self) -> Result<String, Self> {
+        if let Self::Text(v) = self {
+            Ok(v)
+        } else {
+            Err(self)
+        }
+    }
+}
+"#####,
+    )
+}
+
+#[test]
 fn doctest_generate_from_impl_for_enum() {
     check_doc_test(
         "generate_from_impl_for_enum",