Include location with object type join operator

Reviewed By: samwgoldman

Differential Revision: D10223242

fbshipit-source-id: 134d0c50e8a59b5ad52f76af19f602841f7f0433

Author: nmote

src/typing/debug_js.ml

@@ -1947,7 +1947,7 @@ and dump_use_t_ (depth, tvars) cx t =
 
   let object_kit =
     let open Object in
-    let join = function And -> "And" | Or -> "Or" in
+    let join (_loc, op) = match op with And -> "And" | Or -> "Or" in
     let resolved xs =
       spf "[%s]" (String.concat "; " (List.map slice (Nel.to_list xs)))
     in

src/typing/flow_js.ml

@@ -11759,8 +11759,8 @@ and object_kit =
       match todo with
       | [] ->
         let x = match join with
-        | Or -> Nel.cons x done_rev |> Nel.concat
-        | And -> merge (intersect2_with_reason reason) x done_rev
+        | _, Or -> Nel.cons x done_rev |> Nel.concat
+        | _, And -> merge (intersect2_with_reason reason) x done_rev
         in
         next tool cx trace use_op reason tout x
       | t::todo ->
@@ -11816,14 +11816,16 @@ and object_kit =
       rec_flow cx trace (i, GetStaticsT (r, t));
       rec_flow cx trace (t, ObjKitT (use_op, reason, Resolve resolve_tool, tool, tout))
     (* Resolve each member of a union. *)
-    | DefT (_, UnionT rep) ->
+    | DefT (union_reason, UnionT rep) ->
+      let union_loc = aloc_of_reason union_reason in
       let t, todo = UnionRep.members_nel rep in
-      let resolve_tool = Resolve (List0 (todo, Or)) in
+      let resolve_tool = Resolve (List0 (todo, (union_loc, Or))) in
       rec_flow cx trace (t, ObjKitT (use_op, reason, resolve_tool, tool, tout))
     (* Resolve each member of an intersection. *)
-    | DefT (_, IntersectionT rep) ->
+    | DefT (intersection_reason, IntersectionT rep) ->
+      let intersection_loc = aloc_of_reason intersection_reason in
       let t, todo = InterRep.members_nel rep in
-      let resolve_tool = Resolve (List0 (todo, And)) in
+      let resolve_tool = Resolve (List0 (todo, (intersection_loc, And))) in
       rec_flow cx trace (t, ObjKitT (use_op, reason, resolve_tool, tool, tout))
     (* Mirroring Object.assign() and {...null} semantics, treat null/void as
      * empty objects. *)

src/typing/type.ml

@@ -1919,7 +1919,9 @@ and Object : sig
     | List0 of TypeTerm.t Nel.t * join
     | List of TypeTerm.t list * resolved Nel.t * join
 
-  and join = And | Or
+  and join' = And | Or
+  (* This location is that of the entire intersection/union, not just the location of the &/| symbol *)
+  and join = ALoc.t * join'
 
   (* A union type resolves to a resolved spread with more than one element *)
   and resolved = slice Nel.t