More tests.

Author: Tim-ats-d

tests/test-dirs/refactor-extract-region/func-extraction.t/func.ml

@@ -67,3 +67,22 @@ let my_mutable_state =
   let var = ref 0 in
   var := 10 * 50;
   !var
+
+let func () =
+  let x = [] in
+  Fun.protect
+    (fun () ->
+      let fun_name2 = ( / ) in
+      let y = [ ( + ); ( - ); fun_name2 ] @ x in
+      List.map2 (fun op (a, b) -> op a b) y [ (1, 1); (3, 2); (8, 2) ])
+    ~finally:(Fun.const ())
+
+let rec f = List.map Fun.id
+
+and y = [ 10; 20; 30 ]
+
+and z x =
+  object
+    method x = x
+    method y = y
+  end

tests/test-dirs/refactor-extract-region/func-extraction.t/run.t

@@ -263,3 +263,110 @@
     },
     "notifications": []
   }
+
+  $ $MERLIN single refactoring-extract-region -start 76:14 -end 76:45 < func.ml
+  {
+    "class": "return",
+    "value": {
+      "start": {
+        "line": 71,
+        "col": 0
+      },
+      "end": {
+        "line": 78,
+        "col": 27
+      },
+      "content": "let fun_name3 (x) (fun_name2) = [(+); (-); fun_name2] @ x
+  let func () =
+    let x = [] in
+    Fun.protect
+      (fun () ->
+        let fun_name2 = ( / ) in
+        let y = fun_name3 x fun_name2 in
+        List.map2 (fun op (a, b) -> op a b) y [ (1, 1); (3, 2); (8, 2) ])
+      ~finally:(Fun.const ())",
+      "selection-range": {
+        "start": {
+          "line": 71,
+          "col": 4
+        },
+        "end": {
+          "line": 71,
+          "col": 13
+        }
+      }
+    },
+    "notifications": []
+  }
+
+  $ $MERLIN single refactoring-extract-region -start 82:8 -end 82:22 < func.ml
+  {
+    "class": "return",
+    "value": {
+      "start": {
+        "line": 80,
+        "col": 0
+      },
+      "end": {
+        "line": 88,
+        "col": 5
+      },
+      "content": "let fun_name2 () = [10; 20; 30]
+  let rec f = List.map Fun.id
+  
+  and y = fun_name2 ()
+  
+  and z x =
+    object
+      method x = x
+      method y = y
+    end",
+      "selection-range": {
+        "start": {
+          "line": 80,
+          "col": 8
+        },
+        "end": {
+          "line": 80,
+          "col": 17
+        }
+      }
+    },
+    "notifications": []
+  }
+
+  $ $MERLIN single refactoring-extract-region -start 86:15 -end 86:16 < func.ml
+  {
+    "class": "return",
+    "value": {
+      "start": {
+        "line": 80,
+        "col": 0
+      },
+      "end": {
+        "line": 88,
+        "col": 5
+      },
+      "content": "let rec f = List.map Fun.id
+  
+  and y = [ 10; 20; 30 ]
+  
+  and z x =
+    object
+      method x = fun_name2 x
+      method y = y
+    end
+  and fun_name2 (x) = x",
+      "selection-range": {
+        "start": {
+          "line": 89,
+          "col": 4
+        },
+        "end": {
+          "line": 89,
+          "col": 13
+        }
+      }
+    },
+    "notifications": []
+  }