Put type without locs inside module Noloc.

Author: cristianoc

analysis/reanalyze/src/Arnold.ml

@@ -582,7 +582,7 @@ module ExtendFunctionTable = struct
             Texp_apply {funct = {exp_desc = Texp_ident (path, {loc}, _)}; args};
         }
       when kindOpt <> None ->
-      let checkArg ((argLabel : Asttypes.arg_label), _argOpt) =
+      let checkArg ((argLabel : Asttypes.Noloc.arg_label), _argOpt) =
         match (argLabel, kindOpt) with
         | (Labelled l | Optional l), Some kind ->
           kind |> List.for_all (fun {Kind.label} -> label <> l)
@@ -624,7 +624,7 @@ module ExtendFunctionTable = struct
         when callee |> FunctionTable.isInFunctionInTable ~functionTable ->
         let functionName = Path.name callee in
         args
-        |> List.iter (fun ((argLabel : Asttypes.arg_label), argOpt) ->
+        |> List.iter (fun ((argLabel : Asttypes.Noloc.arg_label), argOpt) ->
                match (argLabel, argOpt |> extractLabelledArgument) with
                | Labelled label, Some (path, loc)
                  when path |> FunctionTable.isInFunctionInTable ~functionTable
@@ -672,7 +672,7 @@ module CheckExpressionWellFormed = struct
         ->
         let functionName = Path.name functionPath in
         args
-        |> List.iter (fun ((argLabel : Asttypes.arg_label), argOpt) ->
+        |> List.iter (fun ((argLabel : Asttypes.Noloc.arg_label), argOpt) ->
                match argOpt |> ExtendFunctionTable.extractLabelledArgument with
                | Some (path, loc) -> (
                  match argLabel with
@@ -761,7 +761,7 @@ module Compile = struct
           let argsFromKind =
             innerFunctionDefinition.kind
             |> List.map (fun (entry : Kind.entry) ->
-                   ( Asttypes.Labelled entry.label,
+                   ( Asttypes.Noloc.Labelled entry.label,
                      Some
                        {
                          expr with
@@ -785,7 +785,7 @@ module Compile = struct
             args
             |> List.find_opt (fun arg ->
                    match arg with
-                   | Asttypes.Labelled s, Some _ -> s = label
+                   | Asttypes.Noloc.Labelled s, Some _ -> s = label
                    | _ -> false)
           in
           let argOpt =

analysis/reanalyze/src/DeadValue.ml

@@ -104,7 +104,7 @@ let processOptionalArgs ~expType ~(locFrom : Location.t) ~locTo ~path args =
              | None -> Some false
            in
            match lbl with
-           | Asttypes.Optional s when not locFrom.loc_ghost ->
+           | Asttypes.Noloc.Optional s when not locFrom.loc_ghost ->
              if argIsSupplied <> Some false then supplied := s :: !supplied;
              if argIsSupplied = None then suppliedMaybe := s :: !suppliedMaybe
            | _ -> ());

analysis/src/CompletionBackEnd.ml

@@ -952,7 +952,8 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
           (* compute the application of the first label, then the next ones *)
           let args = processApply args [label] in
           processApply args nextLabels
-        | (Asttypes.Nolabel, _) :: nextArgs, [Asttypes.Nolabel] -> nextArgs
+        | (Asttypes.Noloc.Nolabel, _) :: nextArgs, [Asttypes.Noloc.Nolabel] ->
+          nextArgs
         | ((Labelled _, _) as arg) :: nextArgs, [Nolabel] ->
           arg :: processApply nextArgs labels
         | (Optional _, _) :: nextArgs, [Nolabel] -> processApply nextArgs labels
@@ -1007,9 +1008,9 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
             synthetic = true;
             contextPath =
               (match cp with
-              | CPApply (c, args) -> CPApply (c, args @ [Asttypes.Nolabel])
+              | CPApply (c, args) -> CPApply (c, args @ [Asttypes.Noloc.Nolabel])
               | CPId _ when TypeUtils.isFunctionType ~env ~package typ ->
-                CPApply (cp, [Asttypes.Nolabel])
+                CPApply (cp, [Asttypes.Noloc.Nolabel])
               | _ -> cp);
             id = fieldName;
             inJsx = false;

analysis/src/CompletionFrontEnd.ml

@@ -299,8 +299,7 @@ let rec exprToContextPathInner (e : Parsetree.expression) =
     | None -> None
     | Some contexPath ->
       Some
-        (CPApply
-           (contexPath, args |> List.map fst |> List.map Asttypes.to_arg_label))
+        (CPApply (contexPath, args |> List.map fst |> List.map Asttypes.to_noloc))
     )
   | Pexp_tuple exprs ->
     let exprsAsContextPaths = exprs |> List.filter_map exprToContextPath in

analysis/src/CreateInterface.ml

@@ -170,7 +170,7 @@ let printSignature ~extractor ~signature =
             in
             let lblName = labelDecl.ld_id |> Ident.name in
             let lbl =
-              if labelDecl.ld_optional then Asttypes.Optional lblName
+              if labelDecl.ld_optional then Asttypes.Noloc.Optional lblName
               else Labelled lblName
             in
             {

analysis/src/SharedTypes.ml

@@ -4,7 +4,7 @@ let ident l = l |> List.map str |> String.concat "."
 
 type path = string list
 
-type typedFnArg = Asttypes.arg_label * Types.type_expr
+type typedFnArg = Asttypes.Noloc.arg_label * Types.type_expr
 
 let pathToString (path : path) = path |> String.concat "."
 
@@ -605,7 +605,7 @@ module Completable = struct
     | CPFloat
     | CPBool
     | CPOption of contextPath
-    | CPApply of contextPath * Asttypes.arg_label list
+    | CPApply of contextPath * Asttypes.Noloc.arg_label list
     | CPId of {
         path: string list;
         completionContext: completionContext;
@@ -692,7 +692,7 @@ module Completable = struct
       contextPathToString cp ^ "("
       ^ (labels
         |> List.map (function
-             | Asttypes.Nolabel -> "Nolabel"
+             | Asttypes.Noloc.Nolabel -> "Nolabel"
              | Labelled s -> "~" ^ s
              | Optional s -> "?" ^ s)
         |> String.concat ", ")

analysis/src/SignatureHelp.ml

@@ -154,14 +154,14 @@ let findActiveParameter ~argAtCursor ~args =
     (* If a function only has one, unlabelled argument, we can safely assume that's active whenever we're in the signature help for that function,
        even if we technically didn't find anything at the cursor (which we don't for empty expressions). *)
     match args with
-    | [(Asttypes.Nolabel, _)] -> Some 0
+    | [(Asttypes.Noloc.Nolabel, _)] -> Some 0
     | _ -> None)
   | Some (Unlabelled unlabelledArgumentIndex) ->
     let index = ref 0 in
     args
     |> List.find_map (fun (label, _) ->
            match label with
-           | Asttypes.Nolabel when !index = unlabelledArgumentIndex ->
+           | Asttypes.Noloc.Nolabel when !index = unlabelledArgumentIndex ->
              Some !index
            | _ ->
              index := !index + 1;
@@ -171,7 +171,7 @@ let findActiveParameter ~argAtCursor ~args =
     args
     |> List.find_map (fun (label, _) ->
            match label with
-           | (Asttypes.Labelled labelName | Optional labelName)
+           | (Asttypes.Noloc.Labelled labelName | Optional labelName)
              when labelName = name ->
              Some !index
            | _ ->
@@ -474,7 +474,7 @@ let signatureHelp ~path ~pos ~currentFile ~debug ~allowForConstructorPayloads =
                     parameters =
                       parameters
                       |> List.map (fun (argLabel, start, end_) ->
-                             let argLabel = Asttypes.to_arg_label argLabel in
+                             let argLabel = Asttypes.to_noloc argLabel in
                              let paramArgCount = !paramUnlabelledArgCount in
                              paramUnlabelledArgCount := paramArgCount + 1;
                              let unlabelledArgCount = ref 0 in
@@ -487,8 +487,8 @@ let signatureHelp ~path ~pos ~currentFile ~debug ~allowForConstructorPayloads =
                                            let argCount = !unlabelledArgCount in
                                            unlabelledArgCount := argCount + 1;
                                            match (lbl, argLabel) with
-                                           | ( Asttypes.Optional l1,
-                                               Asttypes.Optional l2 )
+                                           | ( Asttypes.Noloc.Optional l1,
+                                               Asttypes.Noloc.Optional l2 )
                                              when l1 = l2 ->
                                              true
                                            | Labelled l1, Labelled l2

analysis/src/TypeUtils.ml

@@ -1123,7 +1123,7 @@ let getFirstFnUnlabelledArgType ~env ~full t =
   in
   let rec findFirstUnlabelledArgType labels =
     match labels with
-    | (Asttypes.Nolabel, t) :: _ -> Some t
+    | (Asttypes.Noloc.Nolabel, t) :: _ -> Some t
     | _ :: rest -> findFirstUnlabelledArgType rest
     | [] -> None
   in

compiler/frontend/ast_compatible.ml

@@ -160,4 +160,4 @@ type object_field = Parsetree.object_field
 
 let object_field l attrs ty = Parsetree.Otag (l, attrs, ty)
 
-type args = (Asttypes.arg_label_loc * Parsetree.expression) list
+type args = (Asttypes.arg_label * Parsetree.expression) list

compiler/frontend/ast_compatible.mli

@@ -137,4 +137,4 @@ type object_field = Parsetree.object_field
 val object_field :
   Asttypes.label Asttypes.loc -> attributes -> core_type -> object_field
 
-type args = (Asttypes.arg_label_loc * Parsetree.expression) list
+type args = (Asttypes.arg_label * Parsetree.expression) list

compiler/frontend/ast_core_type.ml

@@ -131,7 +131,7 @@ let get_curry_arity (ty : t) =
 let is_arity_one ty = get_curry_arity ty = 1
 
 type param_type = {
-  label: Asttypes.arg_label_loc;
+  label: Asttypes.arg_label;
   ty: Parsetree.core_type;
   attr: Parsetree.attributes;
   loc: loc;

compiler/frontend/ast_core_type.mli

@@ -48,7 +48,7 @@ val get_uncurry_arity : t -> int option
 *)
 
 type param_type = {
-  label: Asttypes.arg_label_loc;
+  label: Asttypes.arg_label;
   ty: t;
   attr: Parsetree.attributes;
   loc: Location.t;

compiler/frontend/ast_pat.mli

@@ -30,6 +30,6 @@ val arity_of_fun : t -> Parsetree.expression -> int
 (** [arity_of_fun pat e] tells the arity of 
     expression [fun pat -> e]*)
 
-val labels_of_fun : Parsetree.expression -> Asttypes.arg_label_loc list
+val labels_of_fun : Parsetree.expression -> Asttypes.arg_label list
 
 val is_single_variable_pattern_conservative : t -> string option

compiler/frontend/ast_typ_uncurry.ml

@@ -24,12 +24,12 @@
 
 type typ = Parsetree.core_type
 type 'a cxt = Ast_helper.loc -> Bs_ast_mapper.mapper -> 'a
-type uncurry_type_gen = (Asttypes.arg_label_loc -> typ -> typ -> typ) cxt
+type uncurry_type_gen = (Asttypes.arg_label -> typ -> typ -> typ) cxt
 
 module Typ = Ast_helper.Typ
 
 let to_method_callback_type loc (mapper : Bs_ast_mapper.mapper)
-    (label : Asttypes.arg_label_loc) (first_arg : Parsetree.core_type)
+    (label : Asttypes.arg_label) (first_arg : Parsetree.core_type)
     (typ : Parsetree.core_type) =
   let first_arg = mapper.typ mapper first_arg in
   let typ = mapper.typ mapper typ in
@@ -46,7 +46,7 @@ let to_method_callback_type loc (mapper : Bs_ast_mapper.mapper)
   | None -> assert false
 
 let to_uncurry_type loc (mapper : Bs_ast_mapper.mapper)
-    (label : Asttypes.arg_label_loc) (first_arg : Parsetree.core_type)
+    (label : Asttypes.arg_label) (first_arg : Parsetree.core_type)
     (typ : Parsetree.core_type) =
   (* no need to error for optional here,
      since we can not make it

compiler/frontend/ast_typ_uncurry.mli

@@ -40,7 +40,7 @@ type typ = Parsetree.core_type
 type 'a cxt = Ast_helper.loc -> Bs_ast_mapper.mapper -> 'a
 
 type uncurry_type_gen =
-  (Asttypes.arg_label_loc ->
+  (Asttypes.arg_label ->
   (* label for error checking *)
   typ ->
   (* First arg *)

compiler/frontend/ast_uncurry_gen.mli

@@ -25,7 +25,7 @@
 val to_method_callback :
   Location.t ->
   Bs_ast_mapper.mapper ->
-  Asttypes.arg_label_loc ->
+  Asttypes.arg_label ->
   Parsetree.pattern ->
   Parsetree.expression ->
   Parsetree.expression_desc

compiler/frontend/bs_syntaxerr.ml

@@ -104,10 +104,10 @@ let () =
 
 let err loc error = raise (Error (loc, error))
 
-let optional_err loc (lbl : Asttypes.arg_label_loc) =
+let optional_err loc (lbl : Asttypes.arg_label) =
   match lbl with
   | Opt _ -> raise (Error (loc, Optional_in_uncurried_bs_attribute))
   | _ -> ()
 
-let err_if_label loc (lbl : Asttypes.arg_label_loc) =
+let err_if_label loc (lbl : Asttypes.arg_label) =
   if lbl <> Nolbl then raise (Error (loc, Misplaced_label_syntax))

compiler/frontend/bs_syntaxerr.mli

@@ -54,6 +54,6 @@ type error =
 
 val err : Location.t -> error -> 'a
 
-val optional_err : Location.t -> Asttypes.arg_label_loc -> unit
+val optional_err : Location.t -> Asttypes.arg_label -> unit
 
-val err_if_label : Location.t -> Asttypes.arg_label_loc -> unit
+val err_if_label : Location.t -> Asttypes.arg_label -> unit

compiler/gentype/TranslateCoreType.ml

@@ -1,7 +1,7 @@
 open GenTypeCommon
 open! TranslateTypeExprFromTypes
 
-let remove_option ~(label : Asttypes.arg_label)
+let remove_option ~(label : Asttypes.Noloc.arg_label)
     (core_type : Typedtree.core_type) =
   match (core_type.ctyp_desc, label) with
   | Ttyp_constr (Path.Pident id, _, [t]), Optional lbl

compiler/gentype/TranslateTypeExprFromTypes.ml

@@ -2,7 +2,7 @@ open GenTypeCommon
 
 type translation = {dependencies: dep list; type_: type_}
 
-let rec remove_option ~(label : Asttypes.arg_label)
+let rec remove_option ~(label : Asttypes.Noloc.arg_label)
     (type_expr : Types.type_expr) =
   match (type_expr.desc, label) with
   | Tconstr (Path.Pident id, [t], _), Optional lbl when Ident.name id = "option"

compiler/ml/ast_helper.mli

@@ -58,7 +58,7 @@ module Typ : sig
     ?loc:loc ->
     ?attrs:attrs ->
     arity:arity ->
-    arg_label_loc ->
+    arg_label ->
     core_type ->
     core_type ->
     core_type
@@ -140,7 +140,7 @@ module Exp : sig
     ?attrs:attrs ->
     ?async:bool ->
     arity:int option ->
-    arg_label_loc ->
+    arg_label ->
     expression option ->
     pattern ->
     expression ->
@@ -150,7 +150,7 @@ module Exp : sig
     ?attrs:attrs ->
     ?partial:bool ->
     expression ->
-    (arg_label_loc * expression) list ->
+    (arg_label * expression) list ->
     expression
   val match_ : ?loc:loc -> ?attrs:attrs -> expression -> case list -> expression
   val try_ : ?loc:loc -> ?attrs:attrs -> expression -> case list -> expression

compiler/ml/ast_mapper_from0.ml

@@ -99,7 +99,7 @@ module T = struct
     | Ptyp_any -> any ~loc ~attrs ()
     | Ptyp_var s -> var ~loc ~attrs s
     | Ptyp_arrow (lab, t1, t2) ->
-      let lab = Asttypes.to_arg_label_loc lab in
+      let lab = Asttypes.to_arg_label lab in
       arrow ~loc ~attrs ~arity:None lab (sub.typ sub t1) (sub.typ sub t2)
     | Ptyp_tuple tyl -> tuple ~loc ~attrs (List.map (sub.typ sub) tyl)
     | Ptyp_constr (lid, tl) -> (
@@ -305,7 +305,7 @@ module E = struct
     | Pexp_let (r, vbs, e) ->
       let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs) (sub.expr sub e)
     | Pexp_fun (lab, def, p, e) ->
-      let lab = Asttypes.to_arg_label_loc lab in
+      let lab = Asttypes.to_arg_label lab in
       let async = Ext_list.exists attrs (fun ({txt}, _) -> txt = "res.async") in
       fun_ ~loc ~attrs ~async ~arity:None lab
         (map_opt (sub.expr sub) def)
@@ -352,7 +352,7 @@ module E = struct
       let partial, attrs = process_partial_app_attribute attrs in
       apply ~loc ~attrs ~partial (sub.expr sub e)
         (List.map
-           (fun (lbl, e) -> (Asttypes.to_arg_label_loc lbl, sub.expr sub e))
+           (fun (lbl, e) -> (Asttypes.to_arg_label lbl, sub.expr sub e))
            l)
     | Pexp_match (e, pel) ->
       match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)

compiler/ml/ast_mapper_to0.ml

@@ -99,7 +99,7 @@ module T = struct
     | Ptyp_any -> any ~loc ~attrs ()
     | Ptyp_var s -> var ~loc ~attrs s
     | Ptyp_arrow {lbl; arg; ret; arity} -> (
-      let lbl = Asttypes.to_arg_label lbl in
+      let lbl = Asttypes.to_noloc lbl in
       let typ0 = arrow ~loc ~attrs lbl (sub.typ sub arg) (sub.typ sub ret) in
       match arity with
       | None -> typ0
@@ -294,7 +294,7 @@ module E = struct
       let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs) (sub.expr sub e)
     | Pexp_fun {arg_label = lab; default = def; lhs = p; rhs = e; arity; async}
       -> (
-      let lab = Asttypes.to_arg_label lab in
+      let lab = Asttypes.to_noloc lab in
       let attrs =
         if async then
           ({txt = "res.async"; loc = Location.none}, Pt.PStr []) :: attrs
@@ -352,7 +352,7 @@ module E = struct
       in
       apply ~loc ~attrs (sub.expr sub e)
         (List.map
-           (fun (lbl, e) -> (Asttypes.to_arg_label lbl, sub.expr sub e))
+           (fun (lbl, e) -> (Asttypes.to_noloc lbl, sub.expr sub e))
            args)
     | Pexp_match (e, pel) ->
       match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)