Refactor declared.

Author: cristianoc

analysis/src/Cmt.ml

@@ -10,7 +10,7 @@ let fromUri ~uri =
     in
     match Hashtbl.find_opt package.pathsForModule moduleName with
     | Some paths ->
-      let cmt = SharedTypes.getCmtPath ~uri paths in
+      let cmt = getCmtPath ~uri paths in
       ProcessCmt.fullForCmt ~moduleName ~package ~uri cmt
     | None ->
       prerr_endline ("can't find module " ^ moduleName);
@@ -19,7 +19,7 @@ let fromUri ~uri =
 let fromModule ~package modname =
   if Hashtbl.mem package.pathsForModule modname then
     let paths = Hashtbl.find package.pathsForModule modname in
-    let uri = SharedTypes.getUri paths in
+    let uri = getUri paths in
     fromUri ~uri
   else None
 

analysis/src/Commands.ml

@@ -1,7 +1,9 @@
+open SharedTypes
+
 let dumpLocations ~full =
-  full.SharedTypes.extra.locItems
+  full.extra.locItems
   |> List.map (fun locItem ->
-         let locItemTxt = SharedTypes.locItemToString locItem in
+         let locItemTxt = locItemToString locItem in
          let hoverText = Hover.newHover ~full locItem in
          let hover =
            match hoverText with None -> "" | Some s -> String.escaped s
@@ -60,7 +62,7 @@ let hover ~path ~line ~col =
       | Some locItem -> (
         let isModule =
           match locItem.locType with
-          | SharedTypes.LModule _ | TopLevelModule _ -> true
+          | LModule _ | TopLevelModule _ -> true
           | TypeDefinition _ | Typed _ | Constant _ -> false
         in
         let uriLocOpt = References.definitionForLocItem ~full locItem in
@@ -102,7 +104,7 @@ let definition ~path ~line ~col =
           in
           let isModule =
             match locItem.locType with
-            | SharedTypes.LModule _ | TopLevelModule _ -> true
+            | LModule _ | TopLevelModule _ -> true
             | TypeDefinition _ | Typed _ | Constant _ -> false
           in
           let skipLoc =
@@ -176,13 +178,13 @@ let documentSymbol ~path =
       let open SharedTypes in
       let rec getItems {ModuleKind.topLevel} =
         let rec getItem = function
-          | ModuleKind.Value v -> (v |> SharedTypes.variableKind, [])
-          | Type (t, _) -> (t.decl |> SharedTypes.declarationKind, [])
+          | ModuleKind.Value v -> (v |> variableKind, [])
+          | Type (t, _) -> (t.decl |> declarationKind, [])
           | Module (Structure contents) -> (Module, getItems contents)
           | Module (Constraint (_, modTypeItem)) -> getItem (Module modTypeItem)
           | Module (Ident _) -> (Module, [])
         in
-        let fn {name = {txt}; extentLoc; item} =
+        let fn {Declared.name = {txt}; extentLoc; item} =
           let item, siblings = getItem item in
           if extentLoc.loc_ghost then siblings
           else (txt, extentLoc, item) :: siblings
@@ -201,7 +203,7 @@ let documentSymbol ~path =
                        uri = Uri2.toString (Uri2.fromPath path);
                        range = Utils.cmtLocToRange loc;
                      };
-                   kind = SharedTypes.symbolKind kind;
+                   kind = symbolKind kind;
                  })
       in
       "[\n" ^ (allSymbols |> String.concat ",\n") ^ "\n]"

analysis/src/Hover.ml

@@ -1,13 +1,15 @@
+open SharedTypes
+
 let codeBlock code = Printf.sprintf "```rescript\n%s\n```" code
 
 let showModuleTopLevel ~docstring ~name
-    (topLevel : SharedTypes.ModuleKind.moduleItem SharedTypes.declared list) =
+    (topLevel : ModuleKind.moduleItem Declared.t list) =
   let contents =
     topLevel
     |> List.map (fun item ->
-           match item.SharedTypes.item with
+           match item.Declared.item with
            (* TODO pretty print module contents *)
-           | SharedTypes.ModuleKind.Type ({decl}, recStatus) ->
+           | ModuleKind.Type ({decl}, recStatus) ->
              "  " ^ (decl |> Shared.declToString ~recStatus item.name.txt)
            | Module _ -> "  module " ^ item.name.txt
            | Value typ ->
@@ -23,8 +25,8 @@ let showModuleTopLevel ~docstring ~name
   in
   Some (doc ^ full)
 
-let rec showModule ~docstring ~(file : SharedTypes.File.t) ~name
-    (declared : SharedTypes.ModuleKind.t SharedTypes.declared option) =
+let rec showModule ~docstring ~(file : File.t) ~name
+    (declared : ModuleKind.t Declared.t option) =
   match declared with
   | None -> showModuleTopLevel ~docstring ~name file.contents.topLevel
   | Some {item = Structure {topLevel}} ->
@@ -36,9 +38,9 @@ let rec showModule ~docstring ~(file : SharedTypes.File.t) ~name
   | Some {item = Ident path} ->
     Some ("Unable to resolve module reference " ^ Path.name path)
 
-let newHover ~full:{SharedTypes.file; package} locItem =
-  match locItem.SharedTypes.locType with
-  | SharedTypes.TypeDefinition (name, decl, _stamp) ->
+let newHover ~full:{file; package} locItem =
+  match locItem.locType with
+  | TypeDefinition (name, decl, _stamp) ->
     let typeDef = Shared.declToString name decl in
     Some (codeBlock typeDef)
   | LModule (Definition (stamp, _tip)) | LModule (LocalReference (stamp, _tip))
@@ -59,7 +61,7 @@ let newHover ~full:{SharedTypes.file; package} locItem =
     match ProcessCmt.fileForModule ~package moduleName with
     | None -> None
     | Some file -> (
-      let env = SharedTypes.QueryEnv.fromFile file in
+      let env = QueryEnv.fromFile file in
       match ProcessCmt.resolvePath ~env ~path ~package with
       | None -> None
       | Some (env, name) -> (
@@ -101,7 +103,7 @@ let newHover ~full:{SharedTypes.file; package} locItem =
     let fromType ~docstring typ =
       let typeString = codeBlock (typ |> Shared.typeToString) in
       let extraTypeInfo =
-        let env = SharedTypes.QueryEnv.fromFile file in
+        let env = QueryEnv.fromFile file in
         match typ |> Shared.digConstructor with
         | None -> None
         | Some path -> (

analysis/src/NewCompletions.ml

@@ -499,7 +499,7 @@ let resolveOpens ~env ~previous opens ~package =
 let completionForDeclareds ~pos declareds prefix transformContents =
   (* Log.log("completion for declares " ++ prefix); *)
   Hashtbl.fold
-    (fun _stamp declared results ->
+    (fun _stamp (declared : _ Declared.t) results ->
       if
         Utils.startsWith declared.name.txt prefix
         && Utils.locationContainsFuzzy declared.scopeLoc pos
@@ -522,8 +522,8 @@ let completionForDeclaredTypes ~pos ~env ~suffix =
       Kind.Type m)
 
 let completionForExporteds exporteds
-    (stamps : (int, 'a SharedTypes.declared) Hashtbl.t) prefix transformContents
-    =
+    (stamps : (int, _ Declared.t) Hashtbl.t) prefix
+    transformContents =
   Hashtbl.fold
     (fun name stamp results ->
       (* Log.log("checking exported: " ++ name); *)
@@ -550,7 +550,7 @@ let completionForConstructors ~(env : QueryEnv.t) ~suffix =
     (fun _name stamp results ->
       let t = Hashtbl.find env.file.stamps.types stamp in
       match t.item.kind with
-      | SharedTypes.Type.Variant constructors ->
+      | Type.Variant constructors ->
         (constructors
         |> List.filter (fun c ->
                Utils.startsWith c.Constructor.cname.txt suffix)
@@ -560,7 +560,7 @@ let completionForConstructors ~(env : QueryEnv.t) ~suffix =
     env.exported.types []
   |> List.map (fun (c, t) ->
          {
-           (emptyDeclared c.Constructor.cname.txt) with
+           (Declared.empty c.Constructor.cname.txt) with
            item = Kind.Constructor (c, t);
          })
 
@@ -577,7 +577,7 @@ let completionForFields ~(env : QueryEnv.t) ~suffix =
       | _ -> results)
     env.exported.types []
   |> List.map (fun (f, t) ->
-         {(emptyDeclared f.fname.txt) with item = Kind.Field (f, t)})
+         {(Declared.empty f.fname.txt) with item = Kind.Field (f, t)})
 
 let isCapitalized name =
   if name = "" then false
@@ -799,7 +799,7 @@ let getItems ~full ~rawOpens ~allFiles ~pos ~dotpath =
            (fun results env ->
              let completionsFromThisOpen = valueCompletions ~env suffix in
              List.filter
-               (fun (declared, _env) ->
+               (fun ((declared : Kind.t Declared.t), _env) ->
                  if Hashtbl.mem alreadyUsedIdentifiers declared.name.txt then
                    false
                  else (
@@ -816,7 +816,7 @@ let getItems ~full ~rawOpens ~allFiles ~pos ~dotpath =
              if Utils.startsWith name suffix && not (String.contains name '-')
              then
                Some
-                 ({(emptyDeclared name) with item = Kind.FileModule name}, env)
+                 ({(Declared.empty name) with item = Kind.FileModule name}, env)
              else None)
     in
     locallyDefinedValues @ valuesFromOpens @ localModuleNames
@@ -833,7 +833,7 @@ let getItems ~full ~rawOpens ~allFiles ~pos ~dotpath =
     | RecordAccess (valuePath, middleFields, lastField) -> (
       Log.log ("lastField :" ^ lastField);
       Log.log
-        ("-------------- Looking for " ^ (valuePath |> SharedTypes.pathToString));
+        ("-------------- Looking for " ^ (valuePath |> pathToString));
       match getEnvWithOpens ~pos ~env ~package ~opens valuePath with
       | Some (env, name) -> (
         match ProcessCmt.findInScope pos name env.file.stamps.values with
@@ -866,7 +866,7 @@ let getItems ~full ~rawOpens ~allFiles ~pos ~dotpath =
                      if Utils.startsWith field.fname.txt lastField then
                        Some
                          ( {
-                             (emptyDeclared field.fname.txt) with
+                             (Declared.empty field.fname.txt) with
                              item = Kind.Field (field, typ);
                            },
                            env )
@@ -922,7 +922,7 @@ let processCompletable ~processDotPath ~full ~package ~rawOpens
     let declareds = processDotPath ~exact:true (componentPath @ ["make"]) in
     let labels =
       match declareds with
-      | ({SharedTypes.item = Kind.Value typ}, _env) :: _ ->
+      | ({Declared.item = Kind.Value typ}, _env) :: _ ->
         let rec getFields (texp : Types.type_expr) =
           match texp.desc with
           | Tfield (name, _, t1, t2) ->
@@ -982,8 +982,7 @@ let processCompletable ~processDotPath ~full ~package ~rawOpens
     (* TODO(#107): figure out why we're getting duplicates. *)
     declareds |> Utils.dedup
     |> List.map
-         (fun
-           ({SharedTypes.name = {txt = name}; deprecated; docstring; item}, _env)
+         (fun ({Declared.name = {txt = name}; deprecated; docstring; item}, _env)
          ->
            mkItem ~name ~kind:(Kind.toInt item) ~deprecated
              ~detail:(detail name item) ~docstring)
@@ -1028,7 +1027,7 @@ let processCompletable ~processDotPath ~full ~package ~rawOpens
           match
             fields
             |> List.find_opt (fun field ->
-                   field.SharedTypes.fname.txt = fieldName)
+                   field.fname.txt = fieldName)
           with
           | None -> None
           | Some field -> Some (field.typ, env1))
@@ -1044,7 +1043,7 @@ let processCompletable ~processDotPath ~full ~package ~rawOpens
       match String.split_on_char '.' pipeId with
       | x :: fieldNames -> (
         match [x] |> processDotPath ~exact:true with
-        | ({SharedTypes.item = Value typ}, env) :: _ -> (
+        | ({Declared.item = Value typ}, env) :: _ -> (
           match getFields ~env ~typ fieldNames with
           | None -> None
           | Some (typ1, _env1) -> fromType typ1)
@@ -1095,11 +1094,11 @@ let processCompletable ~processDotPath ~full ~package ~rawOpens
         let dotpath = modulePath @ [partialName] in
         let declareds = dotpath |> processDotPath ~exact:false in
         declareds
-        |> List.filter (fun ({item}, _env) ->
+        |> List.filter (fun ({Declared.item}, _env) ->
                match item with Kind.Value _ -> true | _ -> false)
         |> List.map
              (fun
-               ( {SharedTypes.name = {txt = name}; deprecated; docstring; item},
+               ( {Declared.name = {txt = name}; deprecated; docstring; item},
                  _env )
              ->
                mkItem ~name:(completionName name) ~kind:(Kind.toInt item)
@@ -1153,7 +1152,7 @@ let processCompletable ~processDotPath ~full ~package ~rawOpens
   | Clabel (funPath, prefix, identsSeen) ->
     let labels =
       match funPath |> processDotPath ~exact:true with
-      | ({SharedTypes.item = Value typ}, _env) :: _ ->
+      | ({Declared.item = Value typ}, _env) :: _ ->
         let rec getLabels (t : Types.type_expr) =
           match t.desc with
           | Tlink t1 | Tsubst t1 -> getLabels t1
@@ -1202,7 +1201,7 @@ let processCompletable ~processDotPath ~full ~package ~rawOpens
     let env0 = QueryEnv.fromFile full.file in
     let env, fields =
       match lhs |> processDotPath ~exact:true with
-      | ({SharedTypes.item = Value typ}, env) :: _ -> getObjectFields ~env typ
+      | ({Declared.item = Value typ}, env) :: _ -> getObjectFields ~env typ
       | _ -> (env0, [])
     in
     let labels = resolvePath ~env fields path in
@@ -1243,7 +1242,7 @@ let computeCompletions ~completable ~full ~pos ~rawOpens =
       let rec prioritize decls =
         match decls with
         | (d1, e1) :: (d2, e2) :: rest ->
-          let pos2 = d2.extentLoc.loc_start |> Utils.tupleOfLexing in
+          let pos2 = d2.Declared.extentLoc.loc_start |> Utils.tupleOfLexing in
           if pos2 >= pos then prioritize ((d1, e1) :: rest)
           else
             let pos1 = d1.extentLoc.loc_start |> Utils.tupleOfLexing in
@@ -1252,7 +1251,7 @@ let computeCompletions ~completable ~full ~pos ~rawOpens =
         | [] | [_] -> decls
       in
       declareds
-      |> List.filter (fun ({SharedTypes.name = {txt}}, _env) -> txt = last)
+      |> List.filter (fun ({Declared.name = {txt}}, _env) -> txt = last)
       |> prioritize
     | _ -> declareds
   in

analysis/src/Packages.ml

@@ -1,4 +1,5 @@
 open Infix
+open SharedTypes
 
 (* Creates the `pathsForModule` hashtbl, which maps a `moduleName` to it's `paths` (the ml/re, mli/rei, cmt, and cmti files) *)
 let makePathsForModule ~projectFilesAndPaths ~dependenciesFilesAndPaths =
@@ -37,8 +38,7 @@ let newBsPackage ~rootPath =
                ~sourceDirectories ~libBs
            in
            projectFilesAndPaths
-           |> List.iter (fun (_name, paths) ->
-                  Log.log (SharedTypes.showPaths paths));
+           |> List.iter (fun (_name, paths) -> Log.log (showPaths paths));
            let pathsForModule =
              makePathsForModule ~projectFilesAndPaths ~dependenciesFilesAndPaths
            in
@@ -75,13 +75,11 @@ let newBsPackage ~rootPath =
            in
            Log.log ("Opens from bsconfig: " ^ (opens |> String.concat " "));
            {
-             SharedTypes.rootPath;
+             rootPath;
              projectFiles =
-               projectFilesAndPaths |> List.map fst
-               |> SharedTypes.FileSet.of_list;
+               projectFilesAndPaths |> List.map fst |> FileSet.of_list;
              dependenciesFiles =
-               dependenciesFilesAndPaths |> List.map fst
-               |> SharedTypes.FileSet.of_list;
+               dependenciesFilesAndPaths |> List.map fst |> FileSet.of_list;
              pathsForModule;
              opens;
              namespace;

analysis/src/ProcessAttributes.ml

@@ -37,7 +37,7 @@ let rec findDeprecatedAttribute attributes =
 let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath isExported
     attributes =
   {
-    name;
+    Declared.name;
     stamp;
     extentLoc = extent;
     scopeLoc = scope;

analysis/src/ProcessCmt.ml

@@ -40,7 +40,7 @@ let addItem ~name ~extent ~stamp ~(env : Env.t) ~item attributes exported stamps
   Hashtbl.add stamps stamp declared;
   declared
 
-let rec forTypeSignatureItem ~env ~(exported : SharedTypes.Exported.t)
+let rec forTypeSignatureItem ~env ~(exported : Exported.t)
     (item : Types.signature_item) =
   match item with
   | Sig_value (ident, {val_type; val_attributes; val_loc = loc}) ->
@@ -559,16 +559,16 @@ let extraForFile ~(file : File.t) =
       else []))
   in
   file.stamps.modules
-  |> Hashtbl.iter (fun stamp d ->
+  |> Hashtbl.iter (fun stamp (d : ModuleKind.t Declared.t) ->
          addLocItem extra d.name.loc (LModule (Definition (stamp, Module)));
          addReference stamp d.name.loc);
   file.stamps.values
-  |> Hashtbl.iter (fun stamp d ->
+  |> Hashtbl.iter (fun stamp (d : Types.type_expr Declared.t) ->
          addLocItem extra d.name.loc
            (Typed (d.name.txt, d.item, Definition (stamp, Value)));
          addReference stamp d.name.loc);
   file.stamps.types
-  |> Hashtbl.iter (fun stamp d ->
+  |> Hashtbl.iter (fun stamp (d : Type.t Declared.t) ->
          addLocItem extra d.name.loc
            (TypeDefinition (d.name.txt, d.item.Type.decl, stamp));
          addReference stamp d.name.loc;
@@ -1183,9 +1183,9 @@ let fileForModule modname ~package =
   if Hashtbl.mem package.pathsForModule modname then (
     let paths = Hashtbl.find package.pathsForModule modname in
     (* TODO: do better *)
-    let uri = SharedTypes.getUri paths in
-    let cmt = SharedTypes.getCmtPath ~uri paths in
-    Log.log ("fileForModule " ^ SharedTypes.showPaths paths);
+    let uri = getUri paths in
+    let cmt = getCmtPath ~uri paths in
+    Log.log ("fileForModule " ^ showPaths paths);
     match fileForCmt ~moduleName:modname ~cmt ~uri state with
     | None -> None
     | Some docs -> Some docs)
@@ -1217,7 +1217,7 @@ let locationIsBefore {Location.loc_start} pos = tupleOfLexing loc_start <= pos
 let findInScope pos name stamps =
   (* Log.log("Find " ++ name ++ " with " ++ string_of_int(Hashtbl.length(stamps)) ++ " stamps"); *)
   Hashtbl.fold
-    (fun _stamp declared result ->
+    (fun _stamp (declared : _ Declared.t) result ->
       if declared.name.txt = name then
         (* Log.log("a stamp " ++ Utils.showLocation(declared.scopeLoc) ++ " " ++ string_of_int(l) ++ "," ++ string_of_int(c)); *)
         if locationIsBefore declared.scopeLoc pos then