Fix issue in JSX autocompletion where the key label would always appear.

Author: cristianoc

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Add autocompletion for object access of the form `foo["x"]` and `foo["x"]["y"]["z"]`. 
 - Fix issue with autocomplete then punned props are used in JSX. E.g. `<M foo ...>`.
 - Fix issue with JSX autocompletion not working after `foo=#variant`.
+- Fix issue in JSX autocompletion where the `key` label would always appear.
 
 ## 1.1.3
 

analysis/src/NewCompletions.ml

@@ -879,14 +879,16 @@ let processCompletable ~findItems ~full ~package ~rawOpens
       mkItem ~name ~kind:4 ~deprecated:None ~detail:typString ~docstring:[]
     in
     let mkLabel (name, typ) = mkLabel_ name typ in
-    let keyLabel = mkLabel_ "key" "string" in
+    let keyLabels =
+      if Utils.startsWith "key" prefix then [mkLabel_ "key" "string"] else []
+    in
     if domLabels = [] then []
     else
       (domLabels
       |> List.filter (fun (name, _t) ->
              Utils.startsWith name prefix && not (List.mem name identsSeen))
       |> List.map mkLabel)
-      @ [keyLabel]
+      @ keyLabels
   | Cjsx (componentPath, prefix, identsSeen) ->
     let items = findItems ~exact:true (componentPath @ ["make"]) in
     let labels =
@@ -936,14 +938,16 @@ let processCompletable ~findItems ~full ~package ~rawOpens
       mkItem ~name ~kind:4 ~deprecated:None ~detail:typString ~docstring:[]
     in
     let mkLabel (name, typ) = mkLabel_ name (typ |> Shared.typeToString) in
-    let keyLabel = mkLabel_ "key" "string" in
+    let keyLabels =
+      if Utils.startsWith "key" prefix then [mkLabel_ "key" "string"] else []
+    in
     if labels = [] then []
     else
       (labels
       |> List.filter (fun (name, _t) ->
              Utils.startsWith name prefix && not (List.mem name identsSeen))
       |> List.map mkLabel)
-      @ [keyLabel]
+      @ keyLabels
   | Cpath parts ->
     let items = parts |> findItems ~exact:false in
     (* TODO(#107): figure out why we're getting duplicates. *)

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

@@ -446,12 +446,6 @@ Complete tests/src/Completion.res 52:2
     "tags": [],
     "detail": "option<int>",
     "documentation": null
-  }, {
-    "label": "key",
-    "kind": 4,
-    "tags": [],
-    "detail": "string",
-    "documentation": null
   }]
 
 DocumentSymbol tests/src/Completion.res

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

@@ -8,11 +8,5 @@ Complete tests/src/Div.res 3:3
     "tags": [],
     "detail": "{\"__html\": string}",
     "documentation": null
-  }, {
-    "label": "key",
-    "kind": 4,
-    "tags": [],
-    "detail": "string",
-    "documentation": null
   }]
 

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

@@ -35,12 +35,6 @@ Complete tests/src/Jsx.res 9:2
     "tags": [],
     "detail": "option<string>",
     "documentation": null
-  }, {
-    "label": "key",
-    "kind": 4,
-    "tags": [],
-    "detail": "string",
-    "documentation": null
   }]
 
 Complete tests/src/Jsx.res 11:2
@@ -182,12 +176,6 @@ Complete tests/src/Jsx.res 52:2
     "tags": [],
     "detail": "option<string>",
     "documentation": null
-  }, {
-    "label": "key",
-    "kind": 4,
-    "tags": [],
-    "detail": "string",
-    "documentation": null
   }]
 
 Complete tests/src/Jsx.res 54:2