Optional dig

Author: nojaf

analysis/src/CompletionBackEnd.ml

@@ -966,11 +966,7 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
           (* should not happen, but just ignore extra arguments *) []
       in
 
-      (* (match typ.desc with
-         | Tarrow _ -> print_endline "its an arrow"
-         | Tconstr _ -> print_endline "it's an alias"
-         | _ -> print_endline "something else"); *)
-      match TypeUtils.extractFunctionType ~env ~package typ with
+      match TypeUtils.extractFunctionType ~env ~package ~digInto:false typ with
       | args, tRet when args <> [] ->
         let args = processApply args labels in
         let retType = reconstructFunctionType args tRet in
@@ -1052,7 +1048,6 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
       | None -> [])
     | None -> [])
   | CPPipe {contextPath = cp; id = prefix; lhsLoc; inJsx; synthetic} -> (
-    (* TODO: resolve somewhere in here a potential alias *)
     if Debug.verbose () then print_endline "[ctx_path]--> CPPipe";
     match
       cp

analysis/src/TypeUtils.ml

@@ -243,11 +243,21 @@ let rec extractObjectType ~env ~package (t : Types.type_expr) =
     | _ -> None)
   | _ -> None
 
-let extractFunctionType ~env ~package typ =
+let extractFunctionType ~env ~package ?(digInto = true) typ =
   let rec loop ~env acc (t : Types.type_expr) =
     match t.desc with
     | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> loop ~env acc t1
     | Tarrow (label, tArg, tRet, _, _) -> loop ~env ((label, tArg) :: acc) tRet
+    | Tconstr (path, typeArgs, _) when digInto -> (
+      match References.digConstructor ~env ~package path with
+      | Some
+          ( env,
+            {
+              item = {decl = {type_manifest = Some t1; type_params = typeParams}};
+            } ) ->
+        let t1 = t1 |> instantiateType ~typeParams ~typeArgs in
+        loop ~env acc t1
+      | _ -> (List.rev acc, t))
     | _ -> (List.rev acc, t)
   in
   loop ~env [] typ