Refactor type file.

Author: cristianoc

analysis/src/Hover.ml

@@ -39,7 +39,7 @@ let showModuleTopLevel ~docstring ~name
   in
   Some (doc ^ full)
 
-let rec showModule ~docstring ~(file : SharedTypes.file) ~name
+let rec showModule ~docstring ~(file : SharedTypes.File.t) ~name
     (declared : SharedTypes.moduleKind SharedTypes.declared option) =
   match declared with
   | None -> showModuleTopLevel ~docstring ~name file.contents.topLevel

analysis/src/ProcessCmt.ml

@@ -489,7 +489,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
       }
     in
     let contents = forStructure ~env items in
-    {uri; moduleName = cmt_modname; stamps = env.stamps; contents}
+    {File.uri; moduleName = cmt_modname; stamps = env.stamps; contents}
   | Partial_interface parts ->
     let items =
       parts |> Array.to_list
@@ -529,7 +529,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
     in
     let contents = forSignature ~env signature.sig_items in
     {uri; moduleName = cmt_modname; stamps = env.stamps; contents}
-  | _ -> SharedTypes.emptyFile moduleName uri
+  | _ -> File.create moduleName uri
 
 let fileForCmt ~moduleName ~uri cmt =
   match Shared.tryReadCmt cmt with
@@ -540,7 +540,7 @@ let addLocItem extra loc locType =
   if not loc.Warnings.loc_ghost then
     extra.locItems <- {loc; locType} :: extra.locItems
 
-let extraForFile ~(file : SharedTypes.file) =
+let extraForFile ~(file : File.t) =
   let extra = initExtra () in
   let addReference stamp loc =
     Hashtbl.replace extra.internalReferences stamp
@@ -672,7 +672,7 @@ let fromCompilerPath ~(env : QueryEnv.t) path =
 module F (Collector : sig
   val extra : extra
 
-  val file : file
+  val file : File.t
 
   val scopeExtent : Location.t list ref
 end) =
@@ -1071,7 +1071,7 @@ struct
     | _ -> ()
 end
 
-let forItems ~(file : SharedTypes.file) items parts =
+let forItems ~(file : File.t) items parts =
   let extra = extraForFile ~file in
   let extent = itemsExtent items in
   let extent =

analysis/src/References.ml

@@ -73,15 +73,15 @@ let declaredForTip ~stamps stamp tip =
   | Module ->
     Hashtbl.find_opt stamps.modules stamp |?>> fun x -> {x with item = ()}
 
-let getField file stamp name =
+let getField (file : File.t) stamp name =
   match Hashtbl.find_opt file.stamps.types stamp with
   | None -> None
   | Some {item = {kind}} -> (
     match kind with
     | Record fields -> fields |> List.find_opt (fun f -> f.fname.txt = name)
     | _ -> None)
 
-let getConstructor file stamp name =
+let getConstructor (file : File.t) stamp name =
   match Hashtbl.find_opt file.stamps.types stamp with
   | None -> None
   | Some {item = {kind}} -> (
@@ -158,7 +158,7 @@ let declaredForExportedTip ~(stamps : stamps) ~(exported : exported) name tip =
     Hashtbl.find_opt exported.modules name |?> fun stamp ->
     Hashtbl.find_opt stamps.modules stamp |?>> fun x -> {x with item = ()}
 
-let alternateDeclared ~file ~package declared tip =
+let alternateDeclared ~(file : File.t) ~package declared tip =
   match Hashtbl.find_opt package.pathsForModule file.moduleName with
   | None -> None
   | Some paths -> (
@@ -241,7 +241,7 @@ let validateLoc (loc : Location.t) (backup : Location.t) =
     else backup
   else loc
 
-let resolveModuleDefinition ~file ~package stamp =
+let resolveModuleDefinition ~(file : File.t) ~package stamp =
   match Hashtbl.find_opt file.stamps.modules stamp with
   | None -> None
   | Some md -> (

analysis/src/SharedTypes.ml

@@ -88,23 +88,25 @@ let initStamps () =
 
 type env = {stamps : stamps; modulePath : visibilityPath; scope : Location.t}
 
-type file = {
-  uri : Uri2.t;
-  stamps : stamps;
-  moduleName : string;
-  contents : moduleContents;
-}
-
-let emptyFile moduleName uri =
-  {
-    uri;
-    stamps = initStamps ();
-    moduleName;
-    contents = {docstring = []; exported = initExported (); topLevel = []};
+module File = struct
+  type t = {
+    uri : Uri2.t;
+    stamps : stamps;
+    moduleName : string;
+    contents : moduleContents;
   }
 
+  let create moduleName uri =
+    {
+      uri;
+      stamps = initStamps ();
+      moduleName;
+      contents = {docstring = []; exported = initExported (); topLevel = []};
+    }
+end
+
 module QueryEnv = struct
-  type t = {file : file; exported : exported}
+  type t = {file : File.t; exported : exported}
 
   let fromFile file = {file; exported = file.contents.exported}
 end
@@ -213,7 +215,7 @@ type package = {
   opens : string list;
 }
 
-type full = {extra : extra; file : file; package : package}
+type full = {extra : extra; file : File.t; package : package}
 
 let initExtra () =
   {
@@ -226,7 +228,7 @@ let initExtra () =
 type state = {
   packagesByRoot : (string, package) Hashtbl.t;
   rootForUri : (Uri2.t, string) Hashtbl.t;
-  cmtCache : (filePath, float * file) Hashtbl.t;
+  cmtCache : (filePath, float * File.t) Hashtbl.t;
 }
 
 (* There's only one state, so it can as well be global *)