Refactor: no need for getUri.

Author: cristianoc

analysis/.depend

@@ -35,8 +35,8 @@ src/Process_406.cmx : src/SharedTypes.cmx src/Shared.cmx \
 src/Process_406.cmi : src/Uri2.cmx src/SharedTypes.cmx
 src/Protocol.cmx : src/vendor/Json.cmx
 src/Query.cmx : src/SharedTypes.cmx src/Log.cmx src/Infix.cmx
-src/References.cmx : src/Utils.cmx src/Uri2.cmx src/SharedTypes.cmx \
-    src/Query.cmx src/Log.cmx src/Infix.cmx
+src/References.cmx : src/Utils.cmx src/Uri2.cmx src/State.cmx \
+    src/SharedTypes.cmx src/Query.cmx src/Log.cmx src/Infix.cmx
 src/Shared.cmx : src/PrintType.cmx src/Files.cmx
 src/SharedTypes.cmx : src/Utils.cmx src/Uri2.cmx src/Shared.cmx \
     src/Infix.cmx

analysis/src/Commands.ml

@@ -13,7 +13,7 @@ let dumpLocations ~package ~file ~extra =
          in
          let uriLocOpt =
            References.definitionForLoc ~pathsForModule:package.pathsForModule
-             ~file ~getUri:State.fileForUri
+             ~file
              ~getModule:(State.fileForModule ~package)
              loc
          in
@@ -75,7 +75,6 @@ let hover ~file ~line ~col ~extra ~package =
     in
     let uriLocOpt =
       References.definitionForLoc ~pathsForModule:package.pathsForModule ~file
-        ~getUri:State.fileForUri
         ~getModule:(State.fileForModule ~package)
         loc
     in
@@ -125,7 +124,6 @@ let definition ~file ~line ~col ~extra ~package =
     in
     let uriLocOpt =
       References.definitionForLoc ~pathsForModule:package.pathsForModule ~file
-        ~getUri:State.fileForUri
         ~getModule:(State.fileForModule ~package)
         loc
     in

analysis/src/References.ml

@@ -112,7 +112,7 @@ let definedForLoc ~file ~getModule locKind =
             maybeLog "Yes!! got it";
             Some res))))
 
-let alternateDeclared ~file ~pathsForModule ~getUri declared tip =
+let alternateDeclared ~file ~pathsForModule declared tip =
   match Hashtbl.find_opt pathsForModule file.moduleName with
   | None -> None
   | Some paths -> (
@@ -123,7 +123,7 @@ let alternateDeclared ~file ~pathsForModule ~getUri declared tip =
       let intfUri = Uri2.fromPath intf in
       let implUri = Uri2.fromPath impl in
       if intfUri = file.uri then
-        match getUri implUri with
+        match State.fileForUri implUri with
         | Error e ->
           Log.log e;
           None
@@ -135,7 +135,7 @@ let alternateDeclared ~file ~pathsForModule ~getUri declared tip =
           | None -> None
           | Some declared -> Some (file, extra, declared))
       else
-        match getUri intfUri with
+        match State.fileForUri intfUri with
         | Error e ->
           Log.log e;
           None
@@ -248,7 +248,7 @@ let orLog message v =
     None
   | _ -> v
 
-let definitionForLoc ~pathsForModule ~file ~getUri ~getModule loc =
+let definitionForLoc ~pathsForModule ~file ~getModule loc =
   match loc with
   | Typed (_, Definition (stamp, tip)) -> (
     maybeLog "Trying to find a defintion for a definition";
@@ -258,7 +258,7 @@ let definitionForLoc ~pathsForModule ~file ~getUri ~getModule loc =
       maybeLog "Declared";
       if declared.exported then (
         maybeLog ("exported, looking for alternate " ^ file.moduleName);
-        match alternateDeclared ~pathsForModule ~file ~getUri declared tip with
+        match alternateDeclared ~pathsForModule ~file declared tip with
         | None -> None
         | Some (file, _extra, declared) ->
           let loc = validateLoc declared.name.loc declared.extentLoc in
@@ -325,8 +325,8 @@ let rec pathFromVisibility visibilityPath current =
 let pathFromVisibility visibilityPath tipName =
   pathFromVisibility visibilityPath (Tip tipName)
 
-let forLocalStamp ~pathsForModule ~file ~extra ~allModules ~getModule ~getUri
-    ~getExtra stamp tip =
+let forLocalStamp ~pathsForModule ~file ~extra ~allModules ~getModule ~getExtra
+    stamp tip =
   let env = Query.fileEnv file in
   let open Infix in
   match
@@ -348,9 +348,7 @@ let forLocalStamp ~pathsForModule ~file ~extra ~allModules ~getModule ~getUri
         | Some declared ->
           if isVisible declared then (
             let alternativeReferences =
-              match
-                alternateDeclared ~pathsForModule ~file ~getUri declared tip
-              with
+              match alternateDeclared ~pathsForModule ~file declared tip with
               | None -> []
               | Some (file, extra, {stamp}) -> (
                 match
@@ -417,15 +415,15 @@ let allReferencesForLoc ~pathsForModule ~getUri ~file ~extra ~allModules
   | TopLevelModule _ | Constant _ ->
     []
   | TypeDefinition (_, _, stamp) ->
-    forLocalStamp ~pathsForModule ~getUri ~file ~extra ~allModules ~getModule
-      ~getExtra stamp Type
+    forLocalStamp ~pathsForModule ~file ~extra ~allModules ~getModule ~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 ~pathsForModule ~getUri ~file ~extra ~allModules ~getModule
-      ~getExtra stamp tip
+    forLocalStamp ~pathsForModule ~file ~extra ~allModules ~getModule ~getExtra
+      stamp tip
   | LModule (GlobalReference (moduleName, path, tip))
   | Typed (_, GlobalReference (moduleName, path, tip)) -> (
     match getModule moduleName with
@@ -445,5 +443,5 @@ let allReferencesForLoc ~pathsForModule ~getUri ~file ~extra ~allModules
               ("Finding references for (global) " ^ Uri2.toString env.file.uri
              ^ " and stamp " ^ string_of_int stamp ^ " and tip "
              ^ tipToString tip);
-            forLocalStamp ~pathsForModule ~getUri ~file ~extra ~allModules
-              ~getModule ~getExtra stamp tip))))
+            forLocalStamp ~pathsForModule ~file ~extra ~allModules ~getModule
+              ~getExtra stamp tip))))