More feedback from review

src/analysis/construct.ml

@@ -530,8 +530,8 @@ module Gen = struct
                 left_types (arg :: acc) env tyright
             | _ -> List.rev acc, ty, env
          in
-          let arguments, tyright, env = left_types [] env rtyp in
-          let exps = arrow_rhs env tyright in
+          let arguments, body_type, env = left_types [] env rtyp in
+          let exps = arrow_rhs env body_type in
           List.map exps ~f:(fun e ->
               Ast_helper.Exp.function_ arguments None (Pfunction_body e))
         | Ttuple types ->

src/analysis/locate.ml

@@ -460,9 +460,9 @@ module Utils = struct
            that some -H functionality doesn't work upstream; this might be one
            such case, or it might not. (We suspect this one is such a case.)
         *)
-        | ML  _ | MLI _  | MLL _ -> Mconfig.source_path config @ Mconfig.hidden_source_path config
-        | CMT _ | CMTI _         -> Mconfig.cmt_path config @ Mconfig.hidden_build_path config
-        | CMS _ | CMSI _         -> Mconfig.cmt_path config @ Mconfig.hidden_build_path config
+        | ML  _ | MLI _  | MLL _ -> Mconfig.source_path config
+        | CMT _ | CMTI _         -> Mconfig.cmt_path config
+        | CMS _ | CMSI _         -> Mconfig.cmt_path config
 end
 
 let move_to filename artifact =

src/dot-merlin/dot_merlin_reader.ml

@@ -76,8 +76,6 @@ module Cache = File_cache.Make (struct
             tell (`BH (String.drop 3 line))
           else if String.is_prefixed ~by:"S " line then
             tell (`S (String.drop 2 line))
-          else if String.is_prefixed ~by:"BH " line then
-            tell (`BH (String.drop 3 line))
           else if String.is_prefixed ~by:"SH " line then
             tell (`SH (String.drop 3 line))
           else if String.is_prefixed ~by:"SRC " line then
@@ -106,8 +104,6 @@ module Cache = File_cache.Make (struct
             tell (`UNIT_NAME (String.drop 10 line))
           else if String.is_prefixed ~by:"WRAPPING_PREFIX " line then
             tell (`WRAPPING_PREFIX (String.drop 16 line))
-          else if String.is_prefixed ~by:"SOURCE_ROOT " line then
-            tell (`SOURCE_ROOT (String.drop 12 line))
           else if String.is_prefixed ~by:"FINDLIB " line then
             tell (`FINDLIB (String.drop 8 line))
           else if String.is_prefixed ~by:"SUFFIX " line then

src/dot-protocol/merlin_dot_protocol.ml

@@ -46,7 +46,6 @@ module Directive = struct
     | `SOURCE_ROOT of string
     | `UNIT_NAME of string
     | `WRAPPING_PREFIX of string
-    | `SOURCE_ROOT of string
     | `SUFFIX of string
     | `READER of string list
     | `EXCLUDE_QUERY_DIR

src/frontend/query_commands.ml

@@ -852,7 +852,7 @@ let dispatch pipeline (type a) : a Query_protocol.t -> a =
            such case, or it might not.
         *)
         try
-          find_in_path_normalized (Mconfig.source_path config @ Mconfig.hidden_source_path config) x
+          find_in_path_normalized (Mconfig.source_path config) x
         with Not_found -> try
             find_in_path_normalized (Mconfig.build_path config @ Mconfig.hidden_build_path config) x
           with Not_found ->