allow "add omitted labels" in function calls with some labels

Author: giacomocavalieri

compiler-core/src/language_server/code_action.rs

@@ -8562,10 +8562,18 @@ impl<'ast> ast::visit::Visit<'ast> for AddOmittedLabels<'ast> {
 
         let mut omitted_labels = Vec::with_capacity(arguments.len());
         for (index, argument) in arguments.iter().enumerate() {
-            // We can't apply this code action to calls where any of the
-            // arguments have a label explicitly provided.
-            if argument.label.is_some() {
-                return;
+            // If the argument already has a label we don't want to add a label
+            // for it, so we skip it.
+            if let Some(label) = &argument.label {
+                // Though, before skipping, we want to make sure that the label
+                // is actually right for the function call. If it's not then we
+                // give up on adding labels because there wouldn't be no way of
+                // knowing which label to add.
+                if !field_map.fields.contains_key(label) {
+                    return;
+                } else {
+                    continue;
+                }
             }
 
             let label = argument_index_to_label

compiler-core/src/language_server/tests/action.rs

@@ -10321,8 +10321,23 @@ pub type Labelled {
 }
 
 #[test]
-fn add_omitted_labels_does_not_pop_up_if_function_already_has_labels() {
-    assert_no_code_actions!(
+fn add_omitted_labels_works_with_constructors_calls_with_some_labels_1() {
+    assert_code_action!(
+        ADD_OMITTED_LABELS,
+        "
+pub fn main() {
+  labelled(3, 1, b: 2)
+}
+
+pub fn labelled(a a, b b, c c) { todo }
+    ",
+        find_position_of("labelled").to_selection(),
+    );
+}
+
+#[test]
+fn add_omitted_labels_works_with_constructors_calls_with_some_labels() {
+    assert_code_action!(
         ADD_OMITTED_LABELS,
         "
 pub fn main() {
@@ -10336,6 +10351,36 @@ pub fn labelled(a a, b b) { todo }
     );
 }
 
+#[test]
+fn add_omitted_labels_works_on_call_with_wrongly_placed_labels() {
+    assert_code_action!(
+        ADD_OMITTED_LABELS,
+        "
+pub fn main() {
+  labelled(3, b: 2, 1)
+}
+
+pub fn labelled(a a, b b, c c) { todo }
+    ",
+        find_position_of("labelled").to_selection(),
+    );
+}
+
+#[test]
+fn add_omitted_labels_does_not_work_on_call_with_wrong_labels_2() {
+    assert_no_code_actions!(
+        ADD_OMITTED_LABELS,
+        "
+pub fn main() {
+  labelled(3, 1, d: 2)
+}
+
+pub fn labelled(a a, b b, c c) { todo }
+    ",
+        find_position_of("labelled").to_selection(),
+    );
+}
+
 #[test]
 fn add_omitted_labels_does_not_pop_up_if_called_function_has_no_labels() {
     assert_no_code_actions!(

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__add_omitted_labels_works_on_call_with_wrongly_placed_labels.snap

@@ -0,0 +1,22 @@
+---
+source: compiler-core/src/language_server/tests/action.rs
+expression: "\npub fn main() {\n  labelled(3, b: 2, 1)\n}\n\npub fn labelled(a a, b b, c c) { todo }\n    "
+---
+----- BEFORE ACTION
+
+pub fn main() {
+  labelled(3, b: 2, 1)
+  ↑                   
+}
+
+pub fn labelled(a a, b b, c c) { todo }
+    
+
+
+----- AFTER ACTION
+
+pub fn main() {
+  labelled(a: 3, b: 2, c: 1)
+}
+
+pub fn labelled(a a, b b, c c) { todo }

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__add_omitted_labels_works_with_constructors_calls_with_some_labels.snap

@@ -0,0 +1,24 @@
+---
+source: compiler-core/src/language_server/tests/action.rs
+expression: "\npub fn main() {\n  let a = 1\n  labelled(a, b: 2)\n}\n\npub fn labelled(a a, b b) { todo }\n    "
+---
+----- BEFORE ACTION
+
+pub fn main() {
+  let a = 1
+  labelled(a, b: 2)
+  ↑                
+}
+
+pub fn labelled(a a, b b) { todo }
+    
+
+
+----- AFTER ACTION
+
+pub fn main() {
+  let a = 1
+  labelled(a:, b: 2)
+}
+
+pub fn labelled(a a, b b) { todo }

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__add_omitted_labels_works_with_constructors_calls_with_some_labels_1.snap

@@ -0,0 +1,22 @@
+---
+source: compiler-core/src/language_server/tests/action.rs
+expression: "\npub fn main() {\n  labelled(3, 1, b: 2)\n}\n\npub fn labelled(a a, b b, c c) { todo }\n    "
+---
+----- BEFORE ACTION
+
+pub fn main() {
+  labelled(3, 1, b: 2)
+  ↑                   
+}
+
+pub fn labelled(a a, b b, c c) { todo }
+    
+
+
+----- AFTER ACTION
+
+pub fn main() {
+  labelled(a: 3, c: 1, b: 2)
+}
+
+pub fn labelled(a a, b b, c c) { todo }