Refactor: no need to pass getModule around.

Author: cristianoc

analysis/src/Commands.ml

@@ -9,11 +9,7 @@ let dumpLocations ~package ~file ~extra =
          let hover =
            match hoverText with None -> "" | Some s -> String.escaped s
          in
-         let uriLocOpt =
-           References.definitionForLoc ~package ~file
-             ~getModule:(ProcessCmt.fileForModule ~package)
-             loc
-         in
+         let uriLocOpt = References.definitionForLoc ~package ~file loc in
          let def =
            match uriLocOpt with
            | None -> Protocol.null
@@ -69,11 +65,7 @@ let hover ~file ~line ~col ~extra ~package =
       | SharedTypes.LModule _ | TopLevelModule _ -> true
       | TypeDefinition _ | Typed _ | Constant _ | Explanation _ -> false
     in
-    let uriLocOpt =
-      References.definitionForLoc ~package ~file
-        ~getModule:(ProcessCmt.fileForModule ~package)
-        loc
-    in
+    let uriLocOpt = References.definitionForLoc ~package ~file loc in
     let skipZero =
       match uriLocOpt with
       | None -> false
@@ -86,9 +78,7 @@ let hover ~file ~line ~col ~extra ~package =
     in
     if skipZero then Protocol.null
     else
-      let hoverText =
-        Hover.newHover ~file ~package loc
-      in
+      let hoverText = Hover.newHover ~file ~package loc in
       match hoverText with
       | None -> Protocol.null
       | Some s -> Protocol.stringifyHover {contents = s})
@@ -117,11 +107,7 @@ let definition ~file ~line ~col ~extra ~package =
       | SharedTypes.LModule _ | TopLevelModule _ -> true
       | TypeDefinition _ | Typed _ | Constant _ | Explanation _ -> false
     in
-    let uriLocOpt =
-      References.definitionForLoc ~package ~file
-        ~getModule:(ProcessCmt.fileForModule ~package)
-        loc
-    in
+    let uriLocOpt = References.definitionForLoc ~package ~file loc in
     match uriLocOpt with
     | None -> Protocol.null
     | Some (uri2, loc) ->
@@ -160,7 +146,6 @@ let references ~file ~line ~col ~extra ~package =
     let allReferences =
       References.allReferencesForLoc ~package ~file ~extra
         ~allModules:package.localModules ~getUri:ProcessCmt.fileForUri
-        ~getModule:(ProcessCmt.fileForModule ~package)
         ~getExtra:(ProcessCmt.extraForModule ~package)
         loc
     in

analysis/src/NewCompletions.ml

@@ -139,7 +139,6 @@ let determineCompletion items =
 *)
 let getEnvWithOpens ~pos ~(env : ProcessCmt.queryEnv) ~package
     ~(opens : ProcessCmt.queryEnv list) path =
-  (* Query.resolvePath(~env, ~path, ~getModule) *)
   match ProcessCmt.resolveFromStamps ~env ~path ~package ~pos with
   | Some x -> Some x
   | None ->
@@ -288,20 +287,20 @@ let attributeCompletions ~(env : ProcessCmt.queryEnv) ~suffix =
   results |> List.map (fun x -> (env.file.uri, x))
 
 (* TODO filter out things that are defined after the current position *)
-let resolveRawOpens ~env ~getModule ~rawOpens ~package =
+let resolveRawOpens ~env ~rawOpens ~package =
   (* TODO Stdlib instead of Pervasives *)
   let packageOpens = "Pervasives" :: package.TopTypes.opens in
   Log.log ("Package opens " ^ String.concat " " packageOpens);
   let opens =
     resolveOpens ~env
       ~previous:
         (List.map ProcessCmt.fileEnv
-           (packageOpens |> Utils.filterMap getModule))
+           (packageOpens |> Utils.filterMap (ProcessCmt.fileForModule ~package)))
       rawOpens ~package
   in
   opens
 
-let getItems ~full ~package ~rawOpens ~getModule ~allModules ~pos ~parts =
+let getItems ~full ~package ~rawOpens ~allModules ~pos ~parts =
   Log.log
     ("Opens folkz > "
     ^ string_of_int (List.length rawOpens)
@@ -310,7 +309,7 @@ let getItems ~full ~package ~rawOpens ~getModule ~allModules ~pos ~parts =
   let env = ProcessCmt.fileEnv full.file in
   let packageOpens = "Pervasives" :: package.TopTypes.opens in
   Log.log ("Package opens " ^ String.concat " " packageOpens);
-  let resolvedOpens = resolveRawOpens ~env ~getModule ~rawOpens ~package in
+  let resolvedOpens = resolveRawOpens ~env ~rawOpens ~package in
   Log.log
     ("Opens nows "
     ^ string_of_int (List.length resolvedOpens)
@@ -681,9 +680,7 @@ let computeCompletions ~full ~maybeText ~package ~pos =
         in
         let findItems ~exact parts =
           let items =
-            getItems ~full ~package ~rawOpens
-              ~getModule:(ProcessCmt.fileForModule ~package)
-              ~allModules ~pos ~parts
+            getItems ~full ~package ~rawOpens ~allModules ~pos ~parts
           in
           match parts |> List.rev with
           | last :: _ when exact ->

analysis/src/References.ml

@@ -292,7 +292,7 @@ let orLog message v =
     None
   | _ -> v
 
-let definitionForLoc ~package ~file ~getModule loc =
+let definitionForLoc ~package ~file loc =
   match loc with
   | Typed (_, Definition (stamp, tip)) -> (
     maybeLog "Trying to find a defintion for a definition";
@@ -332,7 +332,7 @@ let definitionForLoc ~package ~file ~getModule loc =
     maybeLog
       ("Global defn " ^ moduleName ^ " " ^ pathToString path ^ " : "
      ^ tipToString tip);
-    match getModule moduleName with
+    match ProcessCmt.fileForModule ~package moduleName with
     | None -> None
     | Some file -> (
       let env = ProcessCmt.fileEnv file in
@@ -369,8 +369,7 @@ let rec pathFromVisibility visibilityPath current =
 let pathFromVisibility visibilityPath tipName =
   pathFromVisibility visibilityPath (Tip tipName)
 
-let forLocalStamp ~package ~file ~extra ~allModules ~getModule ~getExtra stamp
-    tip =
+let forLocalStamp ~package ~file ~extra ~allModules ~getExtra stamp tip =
   let env = ProcessCmt.fileEnv file in
   let open Infix in
   match
@@ -420,7 +419,7 @@ let forLocalStamp ~package ~file ~extra ~allModules ~getModule ~getExtra stamp
                 allModules
                 |> List.filter (fun name -> name <> file.moduleName)
                 |> Utils.filterMap (fun name ->
-                       match getModule name with
+                       match ProcessCmt.fileForModule ~package name with
                        | None -> None
                        | Some file -> (
                          match getExtra name with
@@ -448,27 +447,25 @@ let forLocalStamp ~package ~file ~extra ~allModules ~getModule ~getExtra stamp
       in
       (file.uri, local) :: externals)
 
-let allReferencesForLoc ~package ~getUri ~file ~extra ~allModules ~getModule
-    ~getExtra loc =
+let allReferencesForLoc ~package ~getUri ~file ~extra ~allModules ~getExtra loc
+    =
   match loc with
   | Explanation _
   | Typed (_, NotFound)
   | LModule NotFound
   | TopLevelModule _ | Constant _ ->
     []
   | TypeDefinition (_, _, stamp) ->
-    forLocalStamp ~package ~file ~extra ~allModules ~getModule ~getExtra stamp
-      Type
+    forLocalStamp ~package ~file ~extra ~allModules ~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 ~getModule ~getExtra stamp
-      tip
+    forLocalStamp ~package ~file ~extra ~allModules ~getExtra stamp tip
   | LModule (GlobalReference (moduleName, path, tip))
   | Typed (_, GlobalReference (moduleName, path, tip)) -> (
-    match getModule moduleName with
+    match ProcessCmt.fileForModule ~package moduleName with
     | None -> []
     | Some file -> (
       let env = ProcessCmt.fileEnv file in
@@ -485,5 +482,5 @@ let allReferencesForLoc ~package ~getUri ~file ~extra ~allModules ~getModule
               ("Finding references for (global) " ^ Uri2.toString env.file.uri
              ^ " and stamp " ^ string_of_int stamp ^ " and tip "
              ^ tipToString tip);
-            forLocalStamp ~package ~file ~extra ~allModules ~getModule ~getExtra
-              stamp tip))))
+            forLocalStamp ~package ~file ~extra ~allModules ~getExtra stamp tip)
+        )))