only wrap root values for JSX props in braces

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -1415,17 +1415,21 @@ let rec processCompletable ~debug ~full ~scope ~env ~pos ~forHover
       match typ |> TypeUtils.resolveNested ~env ~full ~nested with
       | None -> []
       | Some (typ, env, completionContext) -> (
-        let isJsx =
-          match contextPath with
-          | CJsxPropValue _ | CPPipe {inJsx = true} -> true
-          | _ -> false
+        (* Wrap the insert text in braces when we're completing the root of a
+           JSX prop value. *)
+        let wrapInsertTextInBraces =
+          if List.length nested > 0 then false
+          else
+            match contextPath with
+            | CJsxPropValue _ -> true
+            | _ -> false
         in
         let items =
           typ
           |> completeTypedValue ~mode:Expression ~full ~prefix
                ~completionContext
           |> List.map (fun (c : Completion.t) ->
-                 if isJsx then
+                 if wrapInsertTextInBraces then
                    {
                      c with
                      insertText =

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

@@ -190,23 +190,23 @@ Completable: Cexpression CJsxPropValue [CompletionSupport, TestComponent] testAr
     "tags": [],
     "detail": "One\n\ntype testVariant = One | Two | Three(int)",
     "documentation": null,
-    "insertText": "{One}",
+    "insertText": "One",
     "insertTextFormat": 2
   }, {
     "label": "Two",
     "kind": 4,
     "tags": [],
     "detail": "Two\n\ntype testVariant = One | Two | Three(int)",
     "documentation": null,
-    "insertText": "{Two}",
+    "insertText": "Two",
     "insertTextFormat": 2
   }, {
     "label": "Three(_)",
     "kind": 4,
     "tags": [],
     "detail": "Three(int)\n\ntype testVariant = One | Two | Three(int)",
     "documentation": null,
-    "insertText": "{Three(${1:_})}",
+    "insertText": "Three(${1:_})",
     "insertTextFormat": 2
   }]