Refactor forLocalStamp.

Author: cristianoc

analysis/.depend

@@ -1,9 +1,9 @@
 src/BuildSystem.cmx : src/ModuleResolution.cmx src/Log.cmx src/Infix.cmx \
     src/Files.cmx
 src/Cli.cmx : src/Commands.cmx
-src/Commands.cmx : src/Utils.cmx src/Uri2.cmx src/TopTypes.cmx \
-    src/SharedTypes.cmx src/Shared.cmx src/References.cmx src/Protocol.cmx \
-    src/ProcessCmt.cmx src/NewCompletions.cmx src/Hover.cmx src/Files.cmx
+src/Commands.cmx : src/Utils.cmx src/Uri2.cmx src/SharedTypes.cmx \
+    src/Shared.cmx src/References.cmx src/Protocol.cmx src/ProcessCmt.cmx \
+    src/NewCompletions.cmx src/Hover.cmx src/Files.cmx
 src/Files.cmx :
 src/FindFiles.cmx : src/Utils.cmx src/SharedTypes.cmx \
     src/ModuleResolution.cmx src/Log.cmx src/vendor/Json.cmx src/Infix.cmx \

analysis/src/Commands.ml

@@ -133,7 +133,6 @@ let definition ~path ~line ~col =
   print_endline result
 
 let references ~file ~line ~col ~extra ~package =
-  let open TopTypes in
   let locations =
     extra.SharedTypes.locations
     |> List.filter (fun (l, _) -> not l.Location.loc_ghost)
@@ -145,7 +144,7 @@ let references ~file ~line ~col ~extra ~package =
   | Some (_, loc) ->
     let allReferences =
       References.allReferencesForLoc ~package ~file ~extra
-        ~allModules:package.localModules ~getUri:ProcessCmt.fileForUri
+        ~getUri:ProcessCmt.fileForUri
         ~getExtra:(ProcessCmt.extraForModule ~package)
         loc
     in

analysis/src/References.ml

@@ -369,7 +369,7 @@ let rec pathFromVisibility visibilityPath current =
 let pathFromVisibility visibilityPath tipName =
   pathFromVisibility visibilityPath (Tip tipName)
 
-let forLocalStamp ~package ~file ~extra ~allModules ~getExtra stamp tip =
+let forLocalStamp ~package ~file ~extra ~getExtra stamp tip =
   let env = ProcessCmt.fileEnv file in
   let open Infix in
   match
@@ -416,7 +416,7 @@ let forLocalStamp ~package ~file ~extra ~allModules ~getExtra stamp tip =
               maybeLog ("Now checking path " ^ pathToString path);
               let thisModuleName = file.moduleName in
               let externals =
-                allModules
+                package.localModules
                 |> List.filter (fun name -> name <> file.moduleName)
                 |> Utils.filterMap (fun name ->
                        match ProcessCmt.fileForModule ~package name with
@@ -447,22 +447,21 @@ let forLocalStamp ~package ~file ~extra ~allModules ~getExtra stamp tip =
       in
       (file.uri, local) :: externals)
 
-let allReferencesForLoc ~package ~getUri ~file ~extra ~allModules ~getExtra loc
-    =
+let allReferencesForLoc ~package ~getUri ~file ~extra ~getExtra loc =
   match loc with
   | Explanation _
   | Typed (_, NotFound)
   | LModule NotFound
   | TopLevelModule _ | Constant _ ->
     []
   | TypeDefinition (_, _, stamp) ->
-    forLocalStamp ~package ~file ~extra ~allModules ~getExtra stamp Type
+    forLocalStamp ~package ~file ~extra ~getExtra stamp Type
   | Typed (_, (LocalReference (stamp, tip) | Definition (stamp, tip)))
   | LModule (LocalReference (stamp, tip) | Definition (stamp, tip)) ->
     maybeLog
       ("Finding references for " ^ Uri2.toString file.uri ^ " and stamp "
      ^ string_of_int stamp ^ " and tip " ^ tipToString tip);
-    forLocalStamp ~package ~file ~extra ~allModules ~getExtra stamp tip
+    forLocalStamp ~package ~file ~extra ~getExtra stamp tip
   | LModule (GlobalReference (moduleName, path, tip))
   | Typed (_, GlobalReference (moduleName, path, tip)) -> (
     match ProcessCmt.fileForModule ~package moduleName with
@@ -482,5 +481,4 @@ let allReferencesForLoc ~package ~getUri ~file ~extra ~allModules ~getExtra loc
               ("Finding references for (global) " ^ Uri2.toString env.file.uri
              ^ " and stamp " ^ string_of_int stamp ^ " and tip "
              ^ tipToString tip);
-            forLocalStamp ~package ~file ~extra ~allModules ~getExtra stamp tip)
-        )))
+            forLocalStamp ~package ~file ~extra ~getExtra stamp tip))))