Remove function$ entirely.

Author: cristianoc

analysis/src/CompletionBackEnd.ml

@@ -1358,7 +1358,7 @@ let rec completeTypedValue ?(typeArgContext : typeArgContext option) ~rawOpens
  in
  (* Find all functions in the module that returns type t *)
  let rec fnReturnsTypeT t =
- match (Ast_uncurried.remove_function_dollar t).desc with
+ match t.Types.desc with
  | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> fnReturnsTypeT t1
  | Tarrow _ -> (
  match TypeUtils.extractFunctionType ~env ~package:full.package t with

analysis/src/CompletionJsx.ml

@@ -234,7 +234,7 @@ let getJsxLabels ~componentPath ~findTypeOfValue ~package =
  | _ -> []
  in
  let rec getLabels (t : Types.type_expr) =
- match (Ast_uncurried.remove_function_dollar t).desc with
+ match t.desc with
  | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> getLabels t1
  | Tconstr (p, [propsType], _) when Path.name p = "React.component" -> (
  let rec getPropsType (t : Types.type_expr) =

analysis/src/CreateInterface.ml

@@ -122,7 +122,7 @@ let printSignature ~extractor ~signature =
  let reactElement =
  Ctype.newconstr (Pdot (Pident (Ident.create "React"), "element", 0)) []
  in
- match (Ast_uncurried.remove_function_dollar typ).desc with
+ match typ.desc with
  | Tarrow
  (_, {desc = Tconstr (Path.Pident propsId, typeArgs, _)}, retType, _, _)
  when Ident.name propsId = "props" ->

analysis/src/SignatureHelp.ml

@@ -105,12 +105,9 @@ let findFunctionType ~currentFile ~debug ~path ~pos =
 let extractParameters ~signature ~typeStrForParser ~labelPrefixLen =
  match signature with
  | [{Parsetree.psig_desc = Psig_value {pval_type = expr}}]
- when match
- (Ast_uncurried.core_type_remove_function_dollar expr).ptyp_desc
- with
+ when match expr.ptyp_desc with
  | Ptyp_arrow _ -> true
  | _ -> false ->
- let expr = Ast_uncurried.core_type_remove_function_dollar expr in
  let rec extractParams expr params =
  match expr with
  | {

analysis/src/TypeUtils.ml

@@ -35,7 +35,7 @@ let findTypeViaLoc ~full ~debug (loc : Location.t) =
  | _ -> None
 
 let pathFromTypeExpr (t : Types.type_expr) =
- match (Ast_uncurried.remove_function_dollar t).desc with
+ match t.desc with
  | Tconstr (path, _typeArgs, _)
  | Tlink {desc = Tconstr (path, _typeArgs, _)}
  | Tsubst {desc = Tconstr (path, _typeArgs, _)}
@@ -239,7 +239,7 @@ let rec extractObjectType ~env ~package (t : Types.type_expr) =
 
 let extractFunctionType ~env ~package typ =
  let rec loop ~env acc (t : Types.type_expr) =
- match (Ast_uncurried.remove_function_dollar t).desc with
+ match t.desc with
  | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> loop ~env acc t1
  | Tarrow (label, tArg, tRet, _, _) -> loop ~env ((label, tArg) :: acc) tRet
  | Tconstr (path, typeArgs, _) -> (
@@ -276,7 +276,7 @@ let maybeSetTypeArgCtx ?typeArgContextFromTypeManifest ~typeParams ~typeArgs env
 (* TODO(env-stuff) Maybe this could be removed entirely if we can guarantee that we don't have to look up functions from in here. *)
 let extractFunctionType2 ?typeArgContext ~env ~package typ =
  let rec loop ?typeArgContext ~env acc (t : Types.type_expr) =
- match (Ast_uncurried.remove_function_dollar t).desc with
+ match t.desc with
  | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> loop ?typeArgContext ~env acc t1
  | Tarrow (label, tArg, tRet, _, _) ->
  loop ?typeArgContext ~env ((label, tArg) :: acc) tRet
@@ -312,7 +312,7 @@ let rec extractType ?(printOpeningDebug = true)
  Printf.printf "[extract_type]--> %s"
  (debugLogTypeArgContext typeArgContext));
  let instantiateType = instantiateType2 in
- match (Ast_uncurried.remove_function_dollar t).desc with
+ match t.desc with
  | Tlink t1 | Tsubst t1 | Tpoly (t1, []) ->
  extractType ?typeArgContext ~printOpeningDebug:false ~env ~package t1
  | Tconstr (Path.Pident {name = "option"}, [payloadTypeExpr], _) ->
@@ -894,7 +894,7 @@ let rec resolveNestedPatternPath (typ : innerType) ~env ~full ~nested =
 let getArgs ~env (t : Types.type_expr) ~full =
  let rec getArgsLoop ~env (t : Types.type_expr) ~full ~currentArgumentPosition
  =
- match (Ast_uncurried.remove_function_dollar t).desc with
+ match t.desc with
  | Tlink t1 | Tsubst t1 | Tpoly (t1, []) ->
  getArgsLoop ~full ~env ~currentArgumentPosition t1
  | Tarrow (Labelled l, tArg, tRet, _, _) ->

compiler/frontend/ast_core_type.ml

@@ -124,8 +124,8 @@ let get_uncurry_arity (ty : t) =
  | _ -> None
 
 let get_curry_arity (ty : t) =
- match Ast_uncurried.core_type_remove_function_dollar ty with
- | {ptyp_desc = Ptyp_arrow (_, _, _, Some arity)} -> arity
+ match ty.ptyp_desc with
+ | Ptyp_arrow (_, _, _, Some arity) -> arity
  | _ -> get_uncurry_arity_aux ty 0
 
 let is_arity_one ty = get_curry_arity ty = 1
@@ -156,7 +156,7 @@ let mk_fn_type (new_arg_types_ty : param_type list) (result : t) : t =
 let list_of_arrow (ty : t) : t * param_type list =
  let rec aux (ty : t) acc =
  match ty.ptyp_desc with
- | Ptyp_arrow (label, t1, t2, _) ->
+ | Ptyp_arrow (label, t1, t2, arity) when arity = None || acc = [] ->
  aux t2
  (({label; ty = t1; attr = ty.ptyp_attributes; loc = ty.ptyp_loc}
  : param_type)

compiler/frontend/ast_core_type_class_type.ml

@@ -66,7 +66,7 @@ let default_typ_mapper = Bs_ast_mapper.default_mapper.typ
 
 let typ_mapper (self : Bs_ast_mapper.mapper) (ty : Parsetree.core_type) =
  let loc = ty.ptyp_loc in
- match (Ast_uncurried.core_type_remove_function_dollar ty).ptyp_desc with
+ match ty.ptyp_desc with
  | Ptyp_arrow (label, args, body, _)
  (* let it go without regard label names,
  it will report error later when the label is not empty

compiler/frontend/ast_derive_js_mapper.ml

@@ -130,7 +130,7 @@ let app1 = Ast_compatible.app1
 let app2 = Ast_compatible.app2
 
 let ( ->~ ) a b =
- Ast_uncurried.uncurried_type ~loc:Location.none ~arity:1
+ Ast_uncurried.uncurried_type ~arity:1
  (Ast_compatible.arrow ~arity:(Some 1) a b)
 
 let raise_when_not_found_ident =
@@ -295,7 +295,7 @@ let init () =
  let pat_from_js = {Asttypes.loc; txt = from_js} in
  let to_js_type result =
  Ast_comb.single_non_rec_val pat_to_js
- (Ast_uncurried.uncurried_type ~loc:Location.none ~arity:1
+ (Ast_uncurried.uncurried_type ~arity:1
  (Ast_compatible.arrow ~arity:(Some 1) core_type result))
  in
  let new_type, new_tdcl =

compiler/frontend/ast_derive_projector.ml

@@ -120,9 +120,8 @@ let init () =
  Ext_list.flat_map tdcls handle_tdcl);
  signature_gen =
  (fun (tdcls : Parsetree.type_declaration list) _explict_nonrec ->
- let handle_uncurried_type_tranform ~loc ~arity t =
- if arity > 0 then Ast_uncurried.uncurried_type ~loc ~arity t
- else t
+ let handle_uncurried_type_tranform ~arity t =
+ if arity > 0 then Ast_uncurried.uncurried_type ~arity t else t
  in
  let handle_tdcl tdcl =
  let core_type =
@@ -142,8 +141,7 @@ let init () =
  Ast_comb.single_non_rec_val ?attrs:gentype_attrs pld_name
  (Ast_compatible.arrow ~arity:None core_type pld_type
  (*arity will alwys be 1 since these are single param functions*)
- |> handle_uncurried_type_tranform ~arity:1
- ~loc:pld_name.loc))
+ |> handle_uncurried_type_tranform ~arity:1))
  | Ptype_variant constructor_declarations ->
  Ext_list.map constructor_declarations
  (fun
@@ -170,7 +168,7 @@ let init () =
  {loc; txt = Ext_string.uncapitalize_ascii con_name}
  (Ext_list.fold_right pcd_args annotate_type (fun x acc ->
  Ast_compatible.arrow ~arity:None x acc)
- |> handle_uncurried_type_tranform ~arity ~loc))
+ |> handle_uncurried_type_tranform ~arity))
  | Ptype_open | Ptype_abstract ->
  Ast_derive_util.not_applicable tdcl.ptype_loc deriving_name;
  []

compiler/frontend/ast_exp_handle_external.ml

@@ -133,7 +133,7 @@ let handle_ffi ~loc ~payload =
  match !is_function with
  | Some arity ->
  let type_ =
- Ast_uncurried.uncurried_type ~loc
+ Ast_uncurried.uncurried_type
  ~arity:(if arity = 0 then 1 else arity)
  (arrow ~arity)
  in