rename

Author: cristianoc

analysis/src/Cmt.ml

@@ -1,6 +1,6 @@
 open SharedTypes
 
-let fromUri ~uri =
+let fullFromUri ~uri =
   let path = Uri2.toPath uri in
   match Packages.getPackage ~uri with
   | None -> None
@@ -16,16 +16,16 @@ let fromUri ~uri =
       prerr_endline ("can't find module " ^ moduleName);
       None)
 
-let fromModule ~package modname =
-  if Hashtbl.mem package.pathsForModule modname then
-    let paths = Hashtbl.find package.pathsForModule modname in
+let fullFromModule ~package ~moduleName =
+  if Hashtbl.mem package.pathsForModule moduleName then
+    let paths = Hashtbl.find package.pathsForModule moduleName in
     let uri = getUri paths in
-    fromUri ~uri
+    fullFromUri ~uri
   else None
 
-let fromPath ~path =
+let fullFromPath ~path =
   let uri = Uri2.fromPath path in
-  fromUri ~uri
+  fullFromUri ~uri
 
 let resolveModuleFromCompilerPath ~env ~package path =
   match ProcessCmt.fromCompilerPath ~env path with

analysis/src/Commands.ml

@@ -13,11 +13,10 @@ let getCompletions ~debug ~path ~pos ~currentFile ~forHover =
         Printf.printf "Completable: %s\n"
           (SharedTypes.Completable.toString completable);
       (* Only perform expensive ast operations if there are completables *)
-      match Cmt.fromPath ~path with
+      match Cmt.fullFromPath ~path with
       | None -> []
-      | Some full ->
-        let env = SharedTypes.QueryEnv.fromFile full.file in
-        let package = full.package in
+      | Some {file; package} ->
+        let env = SharedTypes.QueryEnv.fromFile file in
         completable
         |> CompletionBackEnd.processCompletable ~debug ~package ~pos ~scope ~env
              ~forHover))
@@ -31,9 +30,9 @@ let completion ~debug ~path ~pos ~currentFile =
 
 let hover ~path ~line ~col ~currentFile ~debug =
   let result =
-    match Cmt.fromPath ~path with
+    match Cmt.fullFromPath ~path with
     | None -> Protocol.null
-    | Some ({file} as full) -> (
+    | Some full -> (
       match References.getLocItem ~full ~line ~col with
       | None -> (
         if debug then
@@ -62,7 +61,7 @@ let hover ~path ~line ~col ~currentFile ~debug =
           match uriLocOpt with
           | None -> false
           | Some (_, loc) ->
-            let isInterface = file.uri |> Uri2.isInterface in
+            let isInterface = full.file.uri |> Uri2.isInterface in
             let posIsZero {Lexing.pos_lnum; pos_bol; pos_cnum} =
               (not isInterface) && pos_lnum = 1 && pos_cnum - pos_bol = 0
             in
@@ -84,16 +83,16 @@ let codeAction ~path ~line ~col ~currentFile =
 
 let definition ~path ~line ~col =
   let locationOpt =
-    match Cmt.fromPath ~path with
+    match Cmt.fullFromPath ~path with
     | None -> None
-    | Some ({file} as full) -> (
+    | Some full -> (
       match References.getLocItem ~full ~line ~col with
       | None -> None
       | Some locItem -> (
         match References.definitionForLocItem ~full locItem with
         | None -> None
         | Some (uri, loc) ->
-          let isInterface = file.uri |> Uri2.isInterface in
+          let isInterface = full.file.uri |> Uri2.isInterface in
           let posIsZero {Lexing.pos_lnum; pos_bol; pos_cnum} =
             (* range is zero *)
             pos_lnum = 1 && pos_cnum - pos_bol = 0
@@ -122,7 +121,7 @@ let definition ~path ~line ~col =
 
 let typeDefinition ~path ~line ~col =
   let maybeLocation =
-    match Cmt.fromPath ~path with
+    match Cmt.fullFromPath ~path with
     | None -> None
     | Some full -> (
       match References.getLocItem ~full ~line ~col with
@@ -142,7 +141,7 @@ let typeDefinition ~path ~line ~col =
 
 let references ~path ~line ~col =
   let allLocs =
-    match Cmt.fromPath ~path with
+    match Cmt.fullFromPath ~path with
     | None -> []
     | Some full -> (
       match References.getLocItem ~full ~line ~col with
@@ -168,7 +167,7 @@ let references ~path ~line ~col =
 
 let rename ~path ~line ~col ~newName =
   let result =
-    match Cmt.fromPath ~path with
+    match Cmt.fullFromPath ~path with
     | None -> Protocol.null
     | Some full -> (
       match References.getLocItem ~full ~line ~col with

analysis/src/References.ml

@@ -199,7 +199,7 @@ let alternateDeclared ~(file : File.t) ~package (declared : _ Declared.t) tip =
       maybeLog
         ("alternateDeclared for " ^ file.moduleName ^ " has both resi and res");
       let alternateUri = if Uri2.isInterface file.uri then res else resi in
-      match Cmt.fromUri ~uri:(Uri2.fromPath alternateUri) with
+      match Cmt.fullFromUri ~uri:(Uri2.fromPath alternateUri) with
       | None -> None
       | Some {file; extra} -> (
         match
@@ -473,11 +473,11 @@ let forLocalStamp ~full:{file; extra; package} stamp (tip : Tip.t) =
               let externals =
                 package.projectFiles |> FileSet.elements
                 |> List.filter (fun name -> name <> file.moduleName)
-                |> List.map (fun name ->
-                       match ProcessCmt.fileForModule ~package name with
+                |> List.map (fun moduleName ->
+                       match ProcessCmt.fileForModule ~package moduleName with
                        | None -> []
                        | Some file -> (
-                         match Cmt.fromModule ~package name with
+                         match Cmt.fullFromModule ~package ~moduleName with
                          | None -> []
                          | Some {extra} -> (
                            match
@@ -514,7 +514,7 @@ let allReferencesForLocItem ~full:({file; package} as full) locItem =
       |> Utils.filterMap (fun name ->
              match ProcessCmt.fileForModule ~package name with
              | None -> None
-             | Some file -> Cmt.fromUri ~uri:file.uri)
+             | Some file -> Cmt.fullFromUri ~uri:file.uri)
       |> List.map (fun full ->
              match Hashtbl.find_opt full.extra.fileReferences moduleName with
              | None -> []
@@ -555,7 +555,7 @@ let allReferencesForLocItem ~full:({file; package} as full) locItem =
         match exportedForTip ~env name tip with
         | None -> []
         | Some stamp -> (
-          match Cmt.fromUri ~uri:env.file.uri with
+          match Cmt.fullFromUri ~uri:env.file.uri with
           | None -> []
           | Some full ->
             maybeLog

analysis/src/Xform.ml

@@ -298,8 +298,7 @@ let parse ~filename =
   (structure, printExpr, printStructureItem)
 
 let extractCodeActions ~path ~pos ~currentFile =
-  let fullOpt = Cmt.fromPath ~path in
-  match fullOpt with
+  match Cmt.fullFromPath ~path with
   | Some full when Filename.check_suffix currentFile ".res" ->
     let structure, printExpr, printStructureItem =
       parse ~filename:currentFile