LS: include type name in generate variant code action title

Author: 0xda157

CHANGELOG.md

@@ -403,6 +403,10 @@
 
   ([Daniel Venable](https://github.com/DanielVenable))
 
+- The "Generate Variant" code action now includes the name of the type to be
+  generated in its title.
+  ([0xda157](https://github.com/0xda157))
+
 ### Formatter
 
 - Performance of the formatter has been improved.

language-server/src/code_action.rs

@@ -6919,6 +6919,7 @@ pub struct GenerateVariant<'a, IO> {
     params: &'a CodeActionParams,
     line_numbers: &'a LineNumbers,
     variant_to_generate: Option<VariantToGenerate<'a>>,
+    printer: Printer<'a>,
 }
 
 struct VariantToGenerate<'a> {
@@ -6964,6 +6965,9 @@ struct VariantToGenerate<'a> {
     ///
     module_name: EcoString,
 
+    /// The type to add this variant to.
+    type_: Arc<Type>,
+
     /// The arguments actually supplied as input to the variant, if any.
     /// A variant to generate might as well be just a name passed as an argument
     /// `list.map([1, 2, 3], ToGenerate)` so it's not guaranteed to actually
@@ -7060,6 +7064,7 @@ impl<'a, IO> GenerateVariant<'a, IO> {
             compiler,
             line_numbers,
             variant_to_generate: None,
+            printer: Printer::new(&module.ast.names),
         }
     }
 
@@ -7068,6 +7073,7 @@ impl<'a, IO> GenerateVariant<'a, IO> {
 
         let Some(VariantToGenerate {
             name,
+            type_,
             constructors,
             arguments_types,
             given_arguments,
@@ -7126,9 +7132,12 @@ impl<'a, IO> GenerateVariant<'a, IO> {
             );
         }
 
-        let mut builder = CodeActionBuilder::new("Generate variant")
-            .kind(CodeActionKind::QuickFix)
-            .preferred(true);
+        let mut builder = CodeActionBuilder::new(&format!(
+            "Generate `{}` variant",
+            self.printer.print_type(&type_)
+        ))
+        .kind(CodeActionKind::QuickFix)
+        .preferred(true);
 
         match edits {
             GenerateVariantEdits::GenerateInCurrentModule {
@@ -7289,6 +7298,7 @@ impl<'a, IO> GenerateVariant<'a, IO> {
             arguments_types,
             given_arguments,
             module_name,
+            type_: custom_type,
             end_position,
             type_braces,
             variant_start: function_name_location.start,

language-server/src/tests/action.rs

@@ -193,7 +193,6 @@ const INTERPOLATE_STRING: &str = "Interpolate string";
 const FILL_UNUSED_FIELDS: &str = "Fill unused fields";
 const REMOVE_ALL_ECHOS_FROM_THIS_MODULE: &str = "Remove all `echo`s from this module";
 const WRAP_IN_BLOCK: &str = "Wrap in block";
-const GENERATE_VARIANT: &str = "Generate variant";
 const REMOVE_BLOCK: &str = "Remove block";
 const REMOVE_OPAQUE_FROM_PRIVATE_TYPE: &str = "Remove opaque from private type";
 const COLLAPSE_NESTED_CASE: &str = "Collapse nested case";
@@ -211,6 +210,10 @@ const ADD_EXTRA_PARENTHESES: &str = "Add extra parentheses";
 const CONVERT_TO_DOCUMENTATION_COMMENT: &str = "Convert to documentation comment";
 const CONVERT_TO_REGULAR_COMMENT: &str = "Convert to regular comment";
 
+fn generate_variant_message(type_name: &str) -> String {
+    format!("Generate `{type_name}` variant")
+}
+
 macro_rules! assert_code_action {
     ($title:expr, $code:literal, $range_selector:expr $(,)?) => {
         let project = TestProject::for_source($code);
@@ -291,6 +294,23 @@ macro_rules! assert_no_code_actions {
         );
         assert_eq!(expected, result);
     };
+
+    ($title:expr, $code:literal, $range_selector:expr $(,)?) => {
+        let project = TestProject::for_source($code);
+        assert_no_code_actions!($title, project, $range_selector);
+    };
+
+    ($title:expr, $project:expr, $range_selector:expr $(,)?) => {
+        let expected: Vec<lsp_types::CodeAction> = vec![];
+        let result = actions_with_title(
+            vec![$title],
+            &$project,
+            Origin::Src,
+            LSP_TEST_ROOT_PACKAGE_NAME,
+            $range_selector
+        );
+        assert_eq!(expected, result);
+    };
 }
 
 #[test]
@@ -322,7 +342,7 @@ pub fn main() {
 #[test]
 fn generate_variant_with_fields_in_same_module() {
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("Wibble"),
         r#"
 pub type Wibble {
   Wibble
@@ -338,7 +358,7 @@ pub fn main() -> Wibble {
 #[test]
 fn generate_variant_with_no_fields_in_same_module() {
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("Wibble"),
         r#"
 pub type Wibble {
   Wibble
@@ -354,7 +374,7 @@ pub fn main() -> Wibble {
 #[test]
 fn generate_variant_with_labels_in_same_module() {
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("Wibble"),
         r#"
 pub type Wibble {
   Wibble
@@ -370,7 +390,7 @@ pub fn main() -> Wibble {
 #[test]
 fn generate_variant_from_pattern_with_fields() {
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("Wibble"),
         r#"
 pub type Wibble {
   Wibble
@@ -390,7 +410,7 @@ pub fn main() -> Wibble {
 #[test]
 fn generate_variant_from_pattern_with_labelled_fields() {
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("Wibble"),
         r#"
 pub type Wibble {
   Wibble
@@ -410,7 +430,7 @@ pub fn main() -> Wibble {
 #[test]
 fn generate_variant_from_pattern_with_no_fields() {
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("Wibble"),
         r#"
 pub type Wibble {
   Wibble
@@ -440,7 +460,7 @@ pub fn new() -> other.Wibble { todo }
 "#;
 
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("other.Wibble"),
         TestProject::for_source(src).add_module("other", "pub type Wibble"),
         find_position_of("Wobble").to_selection()
     );
@@ -460,7 +480,7 @@ pub fn new() -> other.Wibble { todo }
 "#;
 
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("other.Wibble"),
         TestProject::for_source(src).add_module(
             "other",
             "pub type Wibble {
@@ -485,7 +505,7 @@ pub fn new() -> other.Wibble { todo }
 "#;
 
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("other.Wibble"),
         TestProject::for_source(src).add_module(
             "other",
             "pub type Wibble {
@@ -508,7 +528,7 @@ pub fn main() -> other.Wibble {
 pub fn new() -> other.Wibble { todo }
 "#;
     assert_code_action!(
-        GENERATE_VARIANT,
+        &generate_variant_message("other.Wibble"),
         TestProject::for_source(src).add_module("other", "pub type Wibble"),
         find_position_of("Wobble").to_selection()
     );
@@ -517,7 +537,7 @@ pub fn new() -> other.Wibble { todo }
 #[test]
 fn do_not_generate_variant_if_one_with_the_same_name_exists() {
     assert_no_code_actions!(
-        GENERATE_VARIANT,
+        &generate_variant_message("Wibble"),
         r#"
 pub fn main() -> Wibble {
   let assert Wobble = new()
@@ -545,7 +565,7 @@ pub fn main() -> Wibble {
 pub fn new() -> Wibble { todo }
 "#;
     assert_no_code_actions!(
-        GENERATE_VARIANT,
+        &generate_variant_message("Wibble"),
         TestProject::for_source(src).add_module("other", "pub type Wibble { Wobble(String) }"),
         find_position_of("Wobble").to_selection()
     );
@@ -563,7 +583,7 @@ pub fn main() -> Wibble {
 pub fn new() -> Wibble { todo }
 "#;
     assert_no_code_actions!(
-        GENERATE_VARIANT,
+        &generate_variant_message("Wibble"),
         TestProject::for_source(src).add_module("other", "pub type Wibble { Wobble(String) }"),
         find_position_of("Wobble").to_selection()
     );