make Tarray work with both extracted and type expr types

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -709,7 +709,8 @@ and getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env
       | Some (typ, env) ->
         [
           Completion.create "dummy" ~env
-            ~kind:(Completion.ExtractedType (Tarray (env, typ), `Type));
+            ~kind:
+              (Completion.ExtractedType (Tarray (env, ExtractedType typ), `Type));
         ])
     | Pipe ->
       (* Pipe completion with array just needs to know that it's an array, not
@@ -1314,11 +1315,14 @@ let rec completeTypedValue ~full ~prefix ~completionContext ~mode
           ~insertText:(if !Cfg.supportsSnippets then "[$0]" else "[]")
           ~sortText:"A"
           ~kind:
-            (ExtractedType
-               ( typ,
-                 match mode with
-                 | Pattern _ -> `Type
-                 | Expression -> `Value ))
+            (match typ with
+            | ExtractedType typ ->
+              ExtractedType
+                ( typ,
+                  match mode with
+                  | Pattern _ -> `Type
+                  | Expression -> `Value )
+            | TypeExpr typ -> Value typ)
           ~env ();
       ]
     else []

analysis/src/SharedTypes.ml

@@ -302,7 +302,7 @@ and completionType =
   | Texn of QueryEnv.t
   | Toption of QueryEnv.t * innerType
   | Tbool of QueryEnv.t
-  | Tarray of QueryEnv.t * completionType
+  | Tarray of QueryEnv.t * innerType
   | Tstring of QueryEnv.t
   | Tvariant of {
       env: QueryEnv.t;

analysis/src/TypeUtils.ml

@@ -114,8 +114,7 @@ let rec extractType ~env ~package (t : Types.type_expr) =
   | Tconstr (Path.Pident {name = "option"}, [payloadTypeExpr], _) ->
     Some (Toption (env, TypeExpr payloadTypeExpr))
   | Tconstr (Path.Pident {name = "array"}, [payloadTypeExpr], _) ->
-    payloadTypeExpr |> extractType ~env ~package
-    |> Option.map (fun payloadTyp -> Tarray (env, payloadTyp))
+    Some (Tarray (env, TypeExpr payloadTypeExpr))
   | Tconstr (Path.Pident {name = "bool"}, [], _) -> Some (Tbool env)
   | Tconstr (Path.Pident {name = "string"}, [], _) -> Some (Tstring env)
   | Tconstr (Path.Pident {name = "exn"}, [], _) -> Some (Texn env)
@@ -341,7 +340,13 @@ let rec resolveNested (typ : completionType) ~env ~full ~nested =
           |> extractType ~env ~package:full.package
           |> Utils.Option.flatMap (fun typ ->
                  typ |> resolveNested ~env ~full ~nested)))
-    | NArray, Tarray (env, typ) -> typ |> resolveNested ~env ~full ~nested
+    | NArray, Tarray (env, ExtractedType typ) ->
+      typ |> resolveNested ~env ~full ~nested
+    | NArray, Tarray (env, TypeExpr typ) ->
+      typ
+      |> extractType ~env ~package:full.package
+      |> Utils.Option.flatMap (fun typ ->
+             typ |> resolveNested ~env ~full ~nested)
     | _ -> None)
 
 let getArgs ~env (t : Types.type_expr) ~full =
@@ -417,7 +422,9 @@ let rec extractedTypeToString ?(inner = false) = function
     else Shared.typeToString typ
   | Tbool _ -> "bool"
   | Tstring _ -> "string"
-  | Tarray (_, innerTyp) ->
+  | Tarray (_, TypeExpr innerTyp) ->
+    "array<" ^ Shared.typeToString innerTyp ^ ">"
+  | Tarray (_, ExtractedType innerTyp) ->
     "array<" ^ extractedTypeToString ~inner:true innerTyp ^ ">"
   | Toption (_, TypeExpr innerTyp) ->
     "option<" ^ Shared.typeToString innerTyp ^ ">"

analysis/tests/src/expected/CompletionJsxProps.res.txt

@@ -173,7 +173,7 @@ Completable: Cexpression CJsxPropValue [CompletionSupport, TestComponent] testAr
     "label": "[]",
     "kind": 12,
     "tags": [],
-    "detail": "type testVariant = One | Two | Three(int)",
+    "detail": "testVariant",
     "documentation": null,
     "sortText": "A",
     "insertText": "{[$0]}",

analysis/tests/src/expected/CompletionPattern.res.txt

@@ -410,7 +410,7 @@ XXX Not found!
 Completable: Cpattern Value[c]
 [{
     "label": "[]",
-    "kind": 22,
+    "kind": 12,
     "tags": [],
     "detail": "bool",
     "documentation": null,
@@ -539,7 +539,7 @@ posCursor:[143:35] posNoWhite:[143:34] Found pattern:[143:20->143:38]
 Completable: Cpattern Value[p]->variantPayload::Test($3)
 [{
     "label": "[]",
-    "kind": 22,
+    "kind": 12,
     "tags": [],
     "detail": "bool",
     "documentation": null,
@@ -625,7 +625,7 @@ posCursor:[159:36] posNoWhite:[159:35] Found pattern:[159:21->159:38]
 Completable: Cpattern Value[v]->polyvariantPayload::test($3)
 [{
     "label": "[]",
-    "kind": 22,
+    "kind": 12,
     "tags": [],
     "detail": "bool",
     "documentation": null,