exclude functions with capture holes

The existing Expand Function Capture refactor does this.

Author: treuherz

compiler-core/src/language_server/code_action.rs

@@ -10039,9 +10039,10 @@ impl<'ast> ast::visit::Visit<'ast> for WrapInAnonymousFunction<'ast> {
             return;
         }
 
-        let is_excluded = match expression {
-            TypedExpr::Fn { kind, .. } if kind.is_anonymous() => true,
-            _ => false,
+        let is_excluded = if let TypedExpr::Fn { kind, .. } = expression {
+            kind.is_anonymous() || kind.is_capture()
+        } else {
+            false
         };
 
         if let Type::Fn { arguments, .. } = &*expression.type_()
@@ -10204,7 +10205,7 @@ impl<'a> UnwrapAnonymousFunction<'a> {
             TypedStatement::Expression(TypedExpr::Call {
                 location: call_location,
                 arguments: call_arguments,
-                arguments_start: Some(arguments_start),
+                fun: &fun,
                 ..
             }),
         ] = body.as_slice()

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

@@ -7035,6 +7035,28 @@ pub fn add(n, m) { n + m }
     );
 }
 
+#[test]
+fn expand_function_capture_in_pipeline() {
+    assert_code_action!(
+        EXPAND_FUNCTION_CAPTURE,
+        "pub fn main() {
+  1 |> wibble(2, _) |> wobble
+}
+
+fn wibble(a, b) {
+  todo
+}
+
+fn wobble(i) {
+  todo
+}
+
+",
+        find_position_of("wibble").to_selection()
+    );
+}
+
+
 #[test]
 fn generate_dynamic_decoder() {
     assert_code_action!(
@@ -11715,48 +11737,6 @@ fn wobble(i) {
     );
 }
 
-#[test]
-fn wrap_multiargument_pipeline_step_in_anonymous_function() {
-    assert_code_action!(
-        WRAP_IN_ANONYMOUS_FUNCTION,
-        "pub fn main() {
-  1 |> wibble(2) |> wobble
-}
-
-fn wibble(a, b) {
-  todo
-}
-
-fn wobble(i) {
-  todo
-}
-
-",
-        find_position_of("wibble").to_selection()
-    );
-}
-
-#[test]
-fn wrap_capturing_pipeline_step_in_anonymous_function() {
-    assert_code_action!(
-        WRAP_IN_ANONYMOUS_FUNCTION,
-        "pub fn main() {
-  1 |> wibble(2, _) |> wobble
-}
-
-fn wibble(a, b) {
-  todo
-}
-
-fn wobble(i) {
-  todo
-}
-
-",
-        find_position_of("wibble").to_selection()
-    );
-}
-
 #[test]
 fn wrap_final_pipeline_step_in_anonymous_function() {
     assert_code_action!(

…pipeline_step_in_anonymous_function.snap …expand_function_capture_in_pipeline.snapcompiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__wrap_capturing_pipeline_step_in_anonymous_function.snap renamed to compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__expand_function_capture_in_pipeline.snap compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__wrap_capturing_pipeline_step_in_anonymous_function.snap renamed to compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__expand_function_capture_in_pipeline.snap

@@ -20,7 +20,7 @@ fn wobble(i) {
 
 ----- AFTER ACTION
 pub fn main() {
-  1 |> fn(int) { wibble(2, _)(int) } |> wobble
+  1 |> fn(int) { wibble(2, int) } |> wobble
 }
 
 fn wibble(a, b) {