move Tarray to use completion type as well, plus clean up completion item kind output

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -233,7 +233,8 @@ let detail name (kind : Completion.kind) =
         ^ ")")
     ^ "\n\n" ^ s
   | Snippet s -> s
-  | ExtractedType extractedType -> TypeUtils.extractedTypeToString extractedType
+  | ExtractedType (extractedType, _) ->
+    TypeUtils.extractedTypeToString extractedType
 
 let findAllCompletions ~(env : QueryEnv.t) ~prefix ~exact ~namesUsed
     ~(completionContext : Completable.completionContext) =
@@ -594,7 +595,7 @@ let completionsGetCompletionType ~full = function
     match TypeUtils.extractTypeFromResolvedType typ ~env ~full with
     | None -> None
     | Some extractedType -> Some (extractedType, env))
-  | {Completion.kind = ExtractedType typ; env} :: _ -> Some (typ, env)
+  | {Completion.kind = ExtractedType (typ, _); env} :: _ -> Some (typ, env)
   | _ -> None
 
 let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env
@@ -1112,7 +1113,14 @@ let rec completeTypedValue (t : SharedTypes.completionType) ~full ~prefix
         [
           Completion.createWithSnippet ~name:"{}"
             ~insertText:(if !Cfg.supportsSnippets then "{$0}" else "{}")
-            ~sortText:"A" ~kind:(ExtractedType extractedType) ~env ();
+            ~sortText:"A"
+            ~kind:
+              (ExtractedType
+                 ( extractedType,
+                   match mode with
+                   | Pattern -> `Type
+                   | Expression -> `Value ))
+            ~env ();
         ]
       else [])
   | TinlineRecord {env; fields} -> (
@@ -1133,12 +1141,19 @@ let rec completeTypedValue (t : SharedTypes.completionType) ~full ~prefix
             ~sortText:"A" ~kind:(Label "Inline record") ~env ();
         ]
       else [])
-  | Tarray (env, typeExpr) ->
+  | Tarray (env, typ) ->
     if prefix = "" then
       [
         Completion.createWithSnippet ~name:"[]"
           ~insertText:(if !Cfg.supportsSnippets then "[$0]" else "[]")
-          ~sortText:"A" ~kind:(Value typeExpr) ~env ();
+          ~sortText:"A"
+          ~kind:
+            (ExtractedType
+               ( typ,
+                 match mode with
+                 | Pattern -> `Type
+                 | Expression -> `Value ))
+          ~env ();
       ]
     else []
   | Tstring env ->

analysis/src/SharedTypes.ml

@@ -299,7 +299,7 @@ type completionType =
   | Tuple of QueryEnv.t * Types.type_expr list * Types.type_expr
   | Toption of QueryEnv.t * completionType
   | Tbool of QueryEnv.t
-  | Tarray of QueryEnv.t * Types.type_expr
+  | Tarray of QueryEnv.t * completionType
   | Tstring of QueryEnv.t
   | Tvariant of {
       env: QueryEnv.t;
@@ -336,7 +336,7 @@ module Completion = struct
     | Field of field * string
     | FileModule of string
     | Snippet of string
-    | ExtractedType of completionType
+    | ExtractedType of completionType * [`Value | `Type]
 
   type t = {
     name: string;
@@ -387,8 +387,8 @@ module Completion = struct
     | ObjLabel _ -> 4
     | Label _ -> 4
     | Field (_, _) -> 5
-    | Type _ | ExtractedType _ -> 22
-    | Value _ -> 12
+    | Type _ | ExtractedType (_, `Type) -> 22
+    | Value _ | ExtractedType (_, `Value) -> 12
     | Snippet _ -> 15
 end
 

analysis/src/TypeUtils.ml

@@ -115,7 +115,8 @@ let rec extractType ~env ~package (t : Types.type_expr) =
     payloadTypeExpr |> extractType ~env ~package
     |> Option.map (fun payloadTyp -> Toption (env, payloadTyp))
   | Tconstr (Path.Pident {name = "array"}, [payloadTypeExpr], _) ->
-    Some (Tarray (env, payloadTypeExpr))
+    payloadTypeExpr |> extractType ~env ~package
+    |> Option.map (fun payloadTyp -> Tarray (env, payloadTyp))
   | Tconstr (Path.Pident {name = "bool"}, [], _) -> Some (Tbool env)
   | Tconstr (Path.Pident {name = "string"}, [], _) -> Some (Tstring env)
   | Tconstr (path, _, _) -> (
@@ -335,11 +336,7 @@ 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
-      |> extractType ~env ~package:full.package
-      |> Utils.Option.flatMap (fun typ ->
-             typ |> resolveNested ~env ~full ~nested)
+    | NArray, Tarray (env, typ) -> typ |> resolveNested ~env ~full ~nested
     | _ -> None)
 
 let getArgs ~env (t : Types.type_expr) ~full =
@@ -406,8 +403,8 @@ let rec extractedTypeToString = function
     Shared.typeToString typ
   | Tbool _ -> "bool"
   | Tstring _ -> "string"
-  | Tarray (_, innerTyp) -> "array<" ^ Shared.typeToString innerTyp ^ ">"
-  | Toption (_, typ) -> "option<" ^ extractedTypeToString typ ^ ">"
+  | Tarray (_, innerTyp) -> "array<" ^ extractedTypeToString innerTyp ^ ">"
+  | Toption (_, innerTyp) -> "option<" ^ extractedTypeToString innerTyp ^ ">"
   | Tvariant {variantDecl; variantName} ->
     Shared.declToString variantName variantDecl
   | Trecord {definition = `NameOnly name; fields} ->

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

@@ -169,7 +169,7 @@ Completable: Cexpression CArgument Value[fnTakingRecord]($0)->recordField(nested
     "insertTextFormat": 2
   }, {
     "label": "Some({})",
-    "kind": 22,
+    "kind": 12,
     "tags": [],
     "detail": "otherRecord",
     "documentation": null,
@@ -264,7 +264,7 @@ Pexp_apply ...[56:11->56:25] (...[56:26->56:60])
 Completable: Cexpression CArgument Value[fnTakingRecord]($0)->recordField(polyvariant), polyvariantPayload::three($0)
 [{
     "label": "{}",
-    "kind": 22,
+    "kind": 12,
     "tags": [],
     "detail": "someRecord",
     "documentation": null,
@@ -590,7 +590,7 @@ Pexp_apply ...[135:11->135:31] (...[135:32->135:66])
 Completable: Cexpression CArgument Value[fnTakingInlineRecord]($0)->variantPayload::WithInlineRecord($0), recordField(nestedRecord)
 [{
     "label": "{}",
-    "kind": 22,
+    "kind": 12,
     "tags": [],
     "detail": "otherRecord",
     "documentation": null,

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

@@ -410,7 +410,7 @@ XXX Not found!
 Completable: Cpattern Value[c]
 [{
     "label": "[]",
-    "kind": 12,
+    "kind": 22,
     "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": 12,
+    "kind": 22,
     "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": 12,
+    "kind": 22,
     "tags": [],
     "detail": "bool",
     "documentation": null,

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

@@ -3,7 +3,7 @@ XXX Not found!
 Completable: Cexpression Type[someRecord]
 [{
     "label": "{}",
-    "kind": 22,
+    "kind": 12,
     "tags": [],
     "detail": "type someRecord = {age: int, name: string}",
     "documentation": null,