Refactor digConstructor.

Author: cristianoc

analysis/.depend

@@ -51,13 +51,13 @@ src/NewCompletions.cmx : \
     src/vendor/compiler-libs-406/types.cmx \
     src/SharedTypes.cmx \
     src/Shared.cmx \
+    src/References.cmx \
     src/Protocol.cmx \
     src/ProcessCmt.cmx \
     src/vendor/compiler-libs-406/path.cmx \
     src/PartialParser.cmx \
     src/Log.cmx \
-    src/vendor/compiler-libs-406/ident.cmx \
-    src/Hover.cmx
+    src/vendor/compiler-libs-406/ident.cmx
 src/Packages.cmx : \
     src/Utils.cmx \
     src/Uri2.cmx \

analysis/src/Hover.ml

@@ -1,19 +1,3 @@
-let digConstructor ~env ~package path =
-  match ProcessCmt.resolveFromCompilerPath ~env ~package path with
-  | `Not_found -> None
-  | `Stamp stamp -> (
-    match Hashtbl.find_opt env.file.stamps.types stamp with
-    | None -> None
-    | Some t -> Some (env, t))
-  | `Exported (env, name) -> (
-    match Hashtbl.find_opt env.exported.types name with
-    | None -> None
-    | Some stamp -> (
-      match Hashtbl.find_opt env.file.stamps.types stamp with
-      | None -> None
-      | Some t -> Some (env, t)))
-  | _ -> None
-
 let codeBlock code = Printf.sprintf "```rescript\n%s\n```" code
 
 let showModuleTopLevel ~docstring ~name
@@ -121,7 +105,7 @@ let newHover ~full:{SharedTypes.file; package} locItem =
         match typ |> Shared.digConstructor with
         | None -> None
         | Some path -> (
-          match digConstructor ~env ~package path with
+          match References.digConstructor ~env ~package path with
           | None -> None
           | Some (_env, {docstring; name = {txt}; item = {decl}}) ->
             if Utils.isUncurriedInternal path then None

analysis/src/NewCompletions.ml

@@ -804,7 +804,7 @@ let getItems ~full ~rawOpens ~allFiles ~pos ~parts =
           match declared.item |> Shared.digConstructor with
           | None -> []
           | Some path -> (
-            match Hover.digConstructor ~env ~package path with
+            match References.digConstructor ~env ~package path with
             | None -> []
             | Some (env, typ) -> (
               match
@@ -826,7 +826,7 @@ let getItems ~full ~rawOpens ~allFiles ~pos ~parts =
                              match attr.typ |> Shared.digConstructor with
                              | None -> None
                              | Some path ->
-                               Hover.digConstructor ~env ~package path))
+                               References.digConstructor ~env ~package path))
                          | _ -> None))
                      (Some (env, typ))
               with
@@ -995,7 +995,7 @@ let processCompletable ~findItems ~full ~package ~rawOpens
       let getField ~env ~typ fieldName =
         match getConstr typ with
         | Some path -> (
-          match Hover.digConstructor ~env ~package path with
+          match References.digConstructor ~env ~package path with
           | None -> None
           | Some (env1, declared) -> (
             let t = declared.item in
@@ -1166,7 +1166,7 @@ let processCompletable ~findItems ~full ~package ~rawOpens
       | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> getObj t1
       | Tobject (tObj, _) -> getFields tObj
       | Tconstr (path, _, _) -> (
-        match Hover.digConstructor ~env:envRef.contents ~package path with
+        match References.digConstructor ~env:envRef.contents ~package path with
         | Some (env, {item = {decl = {type_manifest = Some tt}}}) ->
           envRef := env;
           getObj tt

analysis/src/References.ml

@@ -364,6 +364,22 @@ let definitionForLocItem ~full:{file; package} locItem =
           maybeLog ("Got stamp " ^ string_of_int stamp);
           definition ~file:env.file ~package stamp tip)))
 
+let digConstructor ~env ~package path =
+  match ProcessCmt.resolveFromCompilerPath ~env ~package path with
+  | `Not_found -> None
+  | `Stamp stamp -> (
+    match Hashtbl.find_opt env.file.stamps.types stamp with
+    | None -> None
+    | Some t -> Some (env, t))
+  | `Exported (env, name) -> (
+    match Hashtbl.find_opt env.exported.types name with
+    | None -> None
+    | Some stamp -> (
+      match Hashtbl.find_opt env.file.stamps.types stamp with
+      | None -> None
+      | Some t -> Some (env, t)))
+  | _ -> None
+
 let typeDefinitionForLocItem ~full:{file; package} locItem =
   match locItem.locType with
   | Constant _ | TopLevelModule _ | LModule _ -> None
@@ -373,20 +389,9 @@ let typeDefinitionForLocItem ~full:{file; package} locItem =
     match Shared.digConstructor typ with
     | None -> None
     | Some path -> (
-      match ProcessCmt.resolveFromCompilerPath ~env ~package path with
-      | `Not_found -> None
-      | `Stamp stamp -> (
-        match Hashtbl.find_opt env.file.stamps.types stamp with
-        | None -> None
-        | Some declared -> Some (env.file.uri, declared.item.decl.type_loc))
-      | `Exported (env, name) -> (
-        match Hashtbl.find_opt env.exported.types name with
-        | None -> None
-        | Some stamp -> (
-          match Hashtbl.find_opt env.file.stamps.types stamp with
-          | None -> None
-          | Some declared -> Some (env.file.uri, declared.item.decl.type_loc))))
-    )
+      match digConstructor ~env ~package path with
+      | Some (env, declared) -> Some (env.file.uri, declared.item.decl.type_loc)
+      | None -> None))
 
 let isVisible (declared : _ SharedTypes.declared) =
   declared.isExported