Refactor constructor.

Author: cristianoc

analysis/src/NewCompletions.ml

@@ -444,7 +444,7 @@ let domLabels =
     ("suppressContentEditableWarning", "bool");
   ]
 
-let showConstructor {cname = {txt}; args; res} =
+let showConstructor {Constructor.cname = {txt}; args; res} =
   txt
   ^ (match args with
     | [] -> ""
@@ -552,13 +552,17 @@ let completionForConstructors ~(env : QueryEnv.t) ~suffix =
       match t.item.kind with
       | SharedTypes.Type.Variant constructors ->
         (constructors
-        |> List.filter (fun c -> Utils.startsWith c.cname.txt suffix)
+        |> List.filter (fun c ->
+               Utils.startsWith c.Constructor.cname.txt suffix)
         |> List.map (fun c -> (c, t)))
         @ results
       | _ -> results)
     env.exported.types []
   |> List.map (fun (c, t) ->
-         {(emptyDeclared c.cname.txt) with item = Kind.Constructor (c, t)})
+         {
+           (emptyDeclared c.Constructor.cname.txt) with
+           item = Kind.Constructor (c, t);
+         })
 
 let completionForFields ~(env : QueryEnv.t) ~suffix =
   Hashtbl.fold

analysis/src/ProcessCmt.ml

@@ -81,7 +81,7 @@ let rec forTypeSignatureItem ~env ~(exported : SharedTypes.Exported.t)
                          let stamp = Ident.binding_time cd_id in
                          let item =
                            {
-                             stamp;
+                             Constructor.stamp;
                              cname = Location.mknoloc name;
                              args =
                                (match cd_args with
@@ -189,7 +189,7 @@ let forTypeDeclaration ~env ~(exported : Exported.t)
                 |> List.map (fun {cd_id; cd_name = cname; cd_args; cd_res} ->
                        let stamp = Ident.binding_time cd_id in
                        {
-                         stamp;
+                         Constructor.stamp;
                          cname;
                          args =
                            (match cd_args with
@@ -579,9 +579,9 @@ let extraForFile ~(file : File.t) =
                   addLocItem extra fname.loc
                     (Typed
                        (d.name.txt, typ, Definition (d.stamp, Field fname.txt))))
-         | Variant constructos ->
-           constructos
-           |> List.iter (fun {stamp; cname} ->
+         | Variant constructors ->
+           constructors
+           |> List.iter (fun {Constructor.stamp; cname} ->
                   addReference stamp cname.loc;
                   let t =
                     {
@@ -825,7 +825,8 @@ struct
         match t with
         | `Local {stamp; item = {kind = Variant constructors}} -> (
           match
-            constructors |> List.find_opt (fun c -> c.cname.txt = cstr_name)
+            constructors
+            |> List.find_opt (fun c -> c.Constructor.cname.txt = cstr_name)
           with
           | Some {stamp = cstamp} ->
             addReference cstamp nameLoc;

analysis/src/References.ml

@@ -115,7 +115,8 @@ let getConstructor (file : File.t) stamp name =
     match kind with
     | Variant constructors -> (
       match
-        constructors |> List.find_opt (fun const -> const.cname.txt = name)
+        constructors
+        |> List.find_opt (fun const -> const.Constructor.cname.txt = name)
       with
       | None -> None
       | Some const -> Some const)

analysis/src/SharedTypes.ml

@@ -6,20 +6,22 @@ type visibilityPath =
 
 type field = {stamp : int; fname : string Location.loc; typ : Types.type_expr}
 
-type constructor = {
-  stamp : int;
-  cname : string Location.loc;
-  args : (Types.type_expr * Location.t) list;
-  res : Types.type_expr option;
-}
+module Constructor = struct
+  type t = {
+    stamp : int;
+    cname : string Location.loc;
+    args : (Types.type_expr * Location.t) list;
+    res : Types.type_expr option;
+  }
+end
 
 module Type = struct
   type kind =
     | Abstract of (Path.t * Types.type_expr list) option
     | Open
     | Tuple of Types.type_expr list
     | Record of field list
-    | Variant of constructor list
+    | Variant of Constructor.t list
 
   type t = {kind : kind; decl : Types.type_declaration}
 end
@@ -75,7 +77,7 @@ module Kind = struct
     | Module of ModuleKind.t
     | Value of Types.type_expr
     | Type of Type.t
-    | Constructor of constructor * Type.t declared
+    | Constructor of Constructor.t * Type.t declared
     | Field of field * Type.t declared
     | FileModule of string
 
@@ -94,7 +96,7 @@ module Stamps = struct
     types : Type.t declared stampMap;
     values : Types.type_expr declared stampMap;
     modules : ModuleKind.t declared stampMap;
-    constructors : constructor declared stampMap;
+    constructors : Constructor.t declared stampMap;
   }
 
   let init () =