Trigger on the body of if-then-else.

Author: cristianoc

analysis/src/Actions.ml

@@ -40,59 +40,51 @@ let rec expToPat (exp : Parsetree.expression) =
   | _ -> None
 
 let mkMapper ~pos ~changed =
-  let value_binding (mapper : Ast_mapper.mapper) (vb : Parsetree.value_binding)
-      =
+  let expr (mapper : Ast_mapper.mapper) (e : Parsetree.expression) =
     let newExp =
-      match vb.pvb_pat.ppat_desc with
-      | Ppat_var {txt; loc} when posInLoc ~pos ~loc -> (
-        match vb.pvb_expr.pexp_desc with
-        | Pexp_ifthenelse
-            ( {
-                pexp_desc =
-                  Pexp_apply
-                    ( {
-                        pexp_desc =
-                          Pexp_ident {txt = Lident (("=" | "<>") as op)};
-                      },
-                      [(Nolabel, arg1); (Nolabel, arg2)] );
-              },
-              e1,
-              Some e2 ) -> (
-          let e1, e2 = if op = "=" then (e1, e2) else (e2, e1) in
-          let mkMatch ~arg ~pat =
-            let cases =
-              [
-                Ast_helper.Exp.case pat e1;
-                Ast_helper.Exp.case (Ast_helper.Pat.any ()) e2;
-              ]
-            in
-            Ast_helper.Exp.match_ ~loc:vb.pvb_expr.pexp_loc
-              ~attrs:vb.pvb_expr.pexp_attributes arg cases
+      match e.pexp_desc with
+      | Pexp_ifthenelse
+          ( {
+              pexp_desc =
+                Pexp_apply
+                  ( {pexp_desc = Pexp_ident {txt = Lident (("=" | "<>") as op)}},
+                    [(Nolabel, arg1); (Nolabel, arg2)] );
+            },
+            e1,
+            Some e2 )
+        when posInLoc ~pos ~loc:e.pexp_loc -> (
+        let e1, e2 = if op = "=" then (e1, e2) else (e2, e1) in
+        let mkMatch ~arg ~pat =
+          let cases =
+            [
+              Ast_helper.Exp.case pat e1;
+              Ast_helper.Exp.case (Ast_helper.Pat.any ()) e2;
+            ]
           in
+          Ast_helper.Exp.match_ ~loc:e.pexp_loc ~attrs:e.pexp_attributes arg
+            cases
+        in
 
-          match expToPat arg2 with
-          | None -> (
-            match expToPat arg1 with
-            | None -> None
-            | Some pat1 ->
-              let newExp = mkMatch ~arg:arg2 ~pat:pat1 in
-              Printf.printf "Hit %s\n" txt;
-              Some newExp)
-          | Some pat2 ->
-            let newExp = mkMatch ~arg:arg1 ~pat:pat2 in
-            Printf.printf "Hit %s\n" txt;
+        match expToPat arg2 with
+        | None -> (
+          match expToPat arg1 with
+          | None -> None
+          | Some pat1 ->
+            let newExp = mkMatch ~arg:arg2 ~pat:pat1 in
             Some newExp)
-        | _ -> None)
+        | Some pat2 ->
+          let newExp = mkMatch ~arg:arg1 ~pat:pat2 in
+          Some newExp)
       | _ -> None
     in
     match newExp with
     | Some newExp ->
       changed := true;
-      {vb with pvb_expr = newExp}
-    | None -> Ast_mapper.default_mapper.value_binding mapper vb
+      newExp
+    | None -> Ast_mapper.default_mapper.expr mapper e
   in
 
-  {Ast_mapper.default_mapper with value_binding}
+  {Ast_mapper.default_mapper with expr}
 
 let command ~path ~pos =
   if Filename.check_suffix path ".res" then

analysis/tests/src/Actions.res

@@ -3,12 +3,12 @@ type r = {name: string, age: int}
 
 let _ = (kind, kindStr) => {
   let _ifThenElse = if kind == First {
-    //    ^act
+    //              ^act
     "First"
   } else {
     "Not First"
   }
 
   let _ternary = #kind("First", {name: "abc", age: 3}) != kindStr ? "Not First" : "First"
-  //     ^act
+  //             ^act
 }

analysis/tests/src/expected/Actions.res.txt

@@ -1,29 +1,27 @@
-Actions tests/src/Actions.res 4:10
-Hit _ifThenElse
+Actions tests/src/Actions.res 4:20
 Formatted:
 type kind = First | Second | Third
 type r = {name: string, age: int}
 
 let _ = (kind, kindStr) => {
   let _ifThenElse = switch kind {
-  | First => //    ^act
+  | First => //              ^act
     "First"
   | _ => "Not First"
   }
 
   let _ternary = #kind("First", {name: "abc", age: 3}) != kindStr ? "Not First" : "First"
-  //     ^act
+  //             ^act
 }
 
-Actions tests/src/Actions.res 11:9
-Hit _ternary
+Actions tests/src/Actions.res 11:17
 Formatted:
 type kind = First | Second | Third
 type r = {name: string, age: int}
 
 let _ = (kind, kindStr) => {
   let _ifThenElse = if kind == First {
-    //    ^act
+    //              ^act
     "First"
   } else {
     "Not First"
@@ -33,6 +31,6 @@ let _ = (kind, kindStr) => {
   | #kind("First", {name: "abc", age: 3}) => "First"
   | _ => "Not First"
   }
-  //     ^act
+  //             ^act
 }