Refactor return from getFullFromCmt.

Author: cristianoc

analysis/src/Commands.ml

@@ -27,8 +27,7 @@ let dump files =
          let result =
            match ProcessCmt.getFullFromCmt ~uri with
            | None -> "[]"
-           | Some (package, {file; extra}) ->
-             dumpLocations ~package ~file ~extra
+           | Some {package; file; extra} -> dumpLocations ~package ~file ~extra
          in
          print_endline result)
 
@@ -37,10 +36,9 @@ let completion ~path ~line ~col ~currentFile =
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
     | None -> "[]"
-    | Some (package, full) ->
+    | Some full ->
       let maybeText = Files.readFile currentFile in
-      NewCompletions.computeCompletions ~full ~maybeText ~package
-        ~pos:(line, col)
+      NewCompletions.computeCompletions ~full ~maybeText ~pos:(line, col)
       |> List.map Protocol.stringifyCompletionItem
       |> Protocol.array
   in
@@ -51,7 +49,7 @@ let hover ~path ~line ~col =
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
     | None -> Protocol.null
-    | Some (package, {file; extra}) -> (
+    | Some {package; file; extra} -> (
       let pos = Utils.protocolLineColToCmtLoc ~line ~col in
       match References.locItemForPos ~extra pos with
       | None -> Protocol.null
@@ -89,7 +87,7 @@ let definition ~path ~line ~col =
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
     | None -> Protocol.null
-    | Some (package, {file; extra}) -> (
+    | Some {package; file; extra} -> (
       let pos = Utils.protocolLineColToCmtLoc ~line ~col in
 
       match References.locItemForPos ~extra pos with
@@ -126,7 +124,7 @@ let references ~path ~line ~col =
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
     | None -> Protocol.null
-    | Some (package, {file; extra}) -> (
+    | Some {package; file; extra} -> (
       let pos = Utils.protocolLineColToCmtLoc ~line ~col in
       match References.locItemForPos ~extra pos with
       | None -> Protocol.null
@@ -154,7 +152,7 @@ let references ~path ~line ~col =
 
 let documentSymbol ~path =
   let uri = Uri2.fromLocalPath path in
-  match ProcessCmt.fileForUri uri with
+  match ProcessCmt.getFullFromCmt ~uri with
   | None -> print_endline Protocol.null
   | Some {file} ->
     let open SharedTypes in

analysis/src/NewCompletions.ml

@@ -523,8 +523,7 @@ let processCompletable ~findItems ~package ~rawOpens
     in
     let removePackageOpens modulePath =
       match modulePath with
-      | toplevel :: rest when package.opens |> List.mem toplevel ->
-        rest
+      | toplevel :: rest when package.opens |> List.mem toplevel -> rest
       | _ -> modulePath
     in
     let rec removeRawOpen rawOpen modulePath =
@@ -637,7 +636,8 @@ let processCompletable ~findItems ~package ~rawOpens
     |> List.filter (fun (name, _t) -> Utils.startsWith name prefix)
     |> List.map mkLabel
 
-let computeCompletions ~full ~maybeText ~package ~pos =
+let computeCompletions ~full ~maybeText ~pos =
+  let package = full.package in
   match maybeText with
   | None -> []
   | Some text -> (
@@ -648,9 +648,7 @@ let computeCompletions ~full ~maybeText ~package ~pos =
       | None -> []
       | Some completable ->
         let rawOpens = PartialParser.findOpens text offset in
-        let allModules =
-          package.localModules @ package.dependencyModules
-        in
+        let allModules = package.localModules @ package.dependencyModules in
         let findItems ~exact parts =
           let items =
             getItems ~full ~package ~rawOpens ~allModules ~pos ~parts

analysis/src/ProcessCmt.ml

@@ -1173,16 +1173,11 @@ let getFullFromCmt ~uri =
       | Ok full ->
         Hashtbl.replace package.interModuleDependencies moduleName
           (SharedTypes.hashList full.extra.externalReferences |> List.map fst);
-        Some (package, full))
+        Some full)
     | None ->
       prerr_endline ("can't find module " ^ moduleName);
       None)
 
-let fileForUri uri =
-  match getFullFromCmt ~uri with
-  | None -> None
-  | Some (_package, full) -> Some full
-
 let extraForModule ~package modname =
   if Hashtbl.mem package.pathsForModule modname then
     let paths = Hashtbl.find package.pathsForModule modname in

analysis/src/References.ml

@@ -169,7 +169,7 @@ let alternateDeclared ~file ~package declared tip =
       let intfUri = Uri2.fromPath intf in
       let implUri = Uri2.fromPath impl in
       if intfUri = file.uri then
-        match ProcessCmt.fileForUri implUri with
+        match ProcessCmt.getFullFromCmt ~uri:implUri with
         | None -> None
         | Some {file; extra} -> (
           match
@@ -179,7 +179,7 @@ let alternateDeclared ~file ~package declared tip =
           | None -> None
           | Some declared -> Some (file, extra, declared))
       else
-        match ProcessCmt.fileForUri intfUri with
+        match ProcessCmt.getFullFromCmt ~uri:intfUri with
         | None -> None
         | Some {file; extra} -> (
           match
@@ -414,7 +414,7 @@ let forLocalStamp ~package ~file ~extra stamp tip =
                        | Some file -> (
                          match ProcessCmt.extraForModule ~package name with
                          | None -> None
-                         | Some (_, {extra}) -> (
+                         | Some {extra} -> (
                            match
                              Hashtbl.find_opt extra.externalReferences
                                thisModuleName
@@ -459,7 +459,7 @@ let allReferencesForLocItem ~package ~file ~extra locItem =
         match ProcessCmt.exportedForTip ~env name tip with
         | None -> []
         | Some stamp -> (
-          match ProcessCmt.fileForUri env.qFile.uri with
+          match ProcessCmt.getFullFromCmt ~uri:env.qFile.uri with
           | None -> []
           | Some {file; extra} ->
             maybeLog