Refactor env.

Author: cristianoc

analysis/src/ProcessCmt.ml

@@ -21,7 +21,8 @@ let impItemsExtent items =
 let sigItemsExtent items =
   items |> List.map (fun item -> item.Typedtree.sig_loc) |> locsExtent
 
-let addItem ~name ~extent ~stamp ~env ~item attributes exported stamps =
+let addItem ~name ~extent ~stamp ~(env : Env.t) ~item attributes exported stamps
+    =
   let declared =
     ProcessAttributes.newDeclared ~item
       ~scope:
@@ -490,7 +491,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
     in
     let env =
       {
-        scope = extent;
+        Env.scope = extent;
         stamps = Stamps.init ();
         modulePath = File (uri, moduleName);
       }
@@ -509,7 +510,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
     in
     let env =
       {
-        scope = sigItemsExtent items;
+        Env.scope = sigItemsExtent items;
         stamps = Stamps.init ();
         modulePath = File (uri, moduleName);
       }
@@ -519,7 +520,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
   | Implementation structure ->
     let env =
       {
-        scope = impItemsExtent structure.str_items;
+        Env.scope = impItemsExtent structure.str_items;
         stamps = Stamps.init ();
         modulePath = File (uri, moduleName);
       }
@@ -529,7 +530,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
   | Interface signature ->
     let env =
       {
-        scope = sigItemsExtent signature.sig_items;
+        Env.scope = sigItemsExtent signature.sig_items;
         stamps = Stamps.init ();
         modulePath = File (uri, moduleName);
       }

analysis/src/SharedTypes.ml

@@ -1,8 +1,8 @@
-type visibilityPath =
+type modulePath =
   | File of Uri2.t * string
   | NotVisible
-  | IncludedModule of Path.t * visibilityPath
-  | ExportedModule of string * visibilityPath
+  | IncludedModule of Path.t * modulePath
+  | ExportedModule of string * modulePath
 
 type field = {stamp : int; fname : string Location.loc; typ : Types.type_expr}
 
@@ -48,7 +48,7 @@ type 't declared = {
   extentLoc : Location.t;
   scopeLoc : Location.t;
   stamp : int;
-  modulePath : visibilityPath;
+  modulePath : modulePath;
   isExported : bool;
   deprecated : string option;
   docstring : string list;
@@ -108,7 +108,9 @@ module Stamps = struct
     }
 end
 
-type env = {stamps : Stamps.t; modulePath : visibilityPath; scope : Location.t}
+module Env = struct
+  type t = {stamps : Stamps.t; modulePath : modulePath; scope : Location.t}
+end
 
 module File = struct
   type t = {