Capture pc_loc instead of pc_bar

Author: nojaf

analysis/src/Codemod.ml

@@ -19,7 +19,8 @@ let transform ~path ~pos ~debug ~typ ~hint =
       let cases =
         collectPatterns pattern
         |> List.map (fun (p : Parsetree.pattern) ->
-               Ast_helper.Exp.case p (TypeUtils.Codegen.mkFailWithExp ()))
+               Ast_helper.Exp.case p.ppat_loc p
+                 (TypeUtils.Codegen.mkFailWithExp ()))
       in
       let result = ref None in
       let mkIterator ~pos ~result =

analysis/src/TypeUtils.ml

@@ -1044,7 +1044,7 @@ module Codegen = struct
       Some
         (patterns
         |> List.map (fun (pat : Parsetree.pattern) ->
-               Ast_helper.Exp.case pat (mkFailWithExp ())))
+               Ast_helper.Exp.case pat.ppat_loc pat (mkFailWithExp ())))
 end
 
 let getModulePathRelativeToEnv ~debug ~(env : QueryEnv.t) ~envFromItem path =

analysis/src/Xform.ml

@@ -105,8 +105,13 @@ module IfThenElse = struct
           let mkMatch ~arg ~pat =
             let cases =
               [
-                Ast_helper.Exp.case pat e1;
-                Ast_helper.Exp.case (Ast_helper.Pat.any ()) e2;
+                Ast_helper.Exp.case
+                  {
+                    pat.Parsetree.ppat_loc with
+                    Location.loc_end = e1.pexp_loc.loc_end;
+                  }
+                  pat e1;
+                Ast_helper.Exp.case e2.pexp_loc (Ast_helper.Pat.any ()) e2;
               ]
             in
             Ast_helper.Exp.match_ ~loc:e.pexp_loc ~attrs:e.pexp_attributes arg

compiler/frontend/bs_ast_mapper.ml

@@ -539,9 +539,9 @@ let default_mapper =
           ~attrs:(this.attributes this pld_attributes));
     cases = (fun this l -> List.map (this.case this) l);
     case =
-      (fun this {pc_bar; pc_lhs; pc_guard; pc_rhs} ->
+      (fun this {pc_loc; pc_lhs; pc_guard; pc_rhs} ->
         {
-          pc_bar;
+          pc_loc = this.location this pc_loc;
           pc_lhs = this.pat this pc_lhs;
           pc_guard = map_opt (this.expr this) pc_guard;
           pc_rhs = this.expr this pc_rhs;

compiler/frontend/bs_builtin_ppx.ml

@@ -167,7 +167,15 @@ let expr_mapper ~async_context ~in_function_def (self : mapper)
           pexp_desc =
             Pexp_match
               ( pvb_expr,
-                [{pc_bar = None; pc_lhs = p; pc_guard = None; pc_rhs = body}] );
+                [
+                  {
+                    pc_loc =
+                      {p.ppat_loc with Location.loc_end = body.pexp_loc.loc_end};
+                    pc_lhs = p;
+                    pc_guard = None;
+                    pc_rhs = body;
+                  };
+                ] );
           pexp_attributes = e.pexp_attributes @ pvb_attributes;
         })
   (* let [@warning "a"] {a;b} = c in body

compiler/ml/ast_helper.ml

@@ -208,8 +208,8 @@ module Exp = struct
               jsx_container_element_closing_tag = e;
             }))
 
-  let case ?bar lhs ?guard rhs =
-    {pc_bar = bar; pc_lhs = lhs; pc_guard = guard; pc_rhs = rhs}
+  let case loc lhs ?guard rhs =
+    {pc_loc = loc; pc_lhs = lhs; pc_guard = guard; pc_rhs = rhs}
 
   let make_list_expression loc seq ext_opt =
     let rec handle_seq = function

compiler/ml/ast_helper.mli

@@ -231,8 +231,7 @@ module Exp : sig
     Parsetree.jsx_closing_container_tag option ->
     expression
 
-  val case :
-    ?bar:Lexing.position -> pattern -> ?guard:expression -> expression -> case
+  val case : Location.t -> pattern -> ?guard:expression -> expression -> case
   val await : ?loc:loc -> ?attrs:attrs -> expression -> expression
 
   val make_list_expression :

compiler/ml/ast_mapper.ml

@@ -488,9 +488,9 @@ let default_mapper =
           ~attrs:(this.attributes this pld_attributes));
     cases = (fun this l -> List.map (this.case this) l);
     case =
-      (fun this {pc_bar; pc_lhs; pc_guard; pc_rhs} ->
+      (fun this {pc_loc; pc_lhs; pc_guard; pc_rhs} ->
         {
-          pc_bar;
+          pc_loc = this.location this pc_loc;
           pc_lhs = this.pat this pc_lhs;
           pc_guard = map_opt (this.expr this) pc_guard;
           pc_rhs = this.expr this pc_rhs;

compiler/ml/ast_mapper_from0.ml

@@ -665,7 +665,9 @@ let default_mapper =
     case =
       (fun this {pc_lhs; pc_guard; pc_rhs} ->
         {
-          pc_bar = None;
+          pc_loc =
+            this.location this
+              {pc_lhs.ppat_loc with Location.loc_end = pc_rhs.pexp_loc.loc_end};
           pc_lhs = this.pat this pc_lhs;
           pc_guard = map_opt (this.expr this) pc_guard;
           pc_rhs = this.expr this pc_rhs;

compiler/ml/parsetree.ml

@@ -381,7 +381,7 @@ and jsx_closing_container_tag = {
 
 and case = {
   (* (P -> E) or (P when E0 -> E) *)
-  pc_bar: Lexing.position option;
+  pc_loc: Location.t;
   pc_lhs: pattern;
   pc_guard: expression option;
   pc_rhs: expression;