Some fixes

Author: cknitt

analysis/src/CompletionBackEnd.ml

@@ -1090,7 +1090,10 @@ let rec completeTypedValue (t : SharedTypes.completionType) ~env ~full ~prefix
       |> List.filter (fun (field : field) ->
              List.mem field.fname.txt seenFields = false)
       |> List.map (fun (field : field) ->
-             Completion.create field.fname.txt
+             let fname =
+               PrintType.printIdentLike ~allowUident:false field.fname.txt
+             in
+             Completion.create fname
                ~kind:(Field (field, typeExpr |> Shared.typeToString))
                ~env)
       |> filterItems ~prefix
@@ -1214,6 +1217,7 @@ let rec processCompletable ~debug ~full ~scope ~env ~pos ~forHover
   | Cjsx ([id], prefix, identsSeen) when String.uncapitalize_ascii id = id ->
     (* Lowercase JSX tag means builtin *)
     let mkLabel (name, typString) =
+      let name = PrintType.printIdentLike ~allowUident:false name in
       Completion.create name ~kind:(Label typString) ~env
     in
     let keyLabels =
@@ -1230,6 +1234,7 @@ let rec processCompletable ~debug ~full ~scope ~env ~pos ~forHover
       CompletionJsx.getJsxLabels ~componentPath ~findTypeOfValue ~package
     in
     let mkLabel_ name typString =
+      let name = PrintType.printIdentLike ~allowUident:false name in
       Completion.create name ~kind:(Label typString) ~env
     in
     let mkLabel (name, typ, _env) =
@@ -1286,6 +1291,7 @@ let rec processCompletable ~debug ~full ~scope ~env ~pos ~forHover
       | None -> []
     in
     let mkLabel (name, typ) =
+      let name = PrintType.printIdentLike ~allowUident:false name in
       Completion.create name ~kind:(Label (typ |> Shared.typeToString)) ~env
     in
     labels

analysis/src/Hover.ml

@@ -10,7 +10,10 @@ let showModuleTopLevel ~docstring ~isType ~name (topLevel : Module.item list) =
              "  " ^ (decl |> Shared.declToString ~recStatus item.name)
            | Module _ -> "  module " ^ item.name
            | Value typ ->
-             "  let " ^ item.name ^ ": " ^ (typ |> Shared.typeToString))
+             "  let "
+             ^ PrintType.printIdentLike ~allowUident:false item.name
+             ^ ": "
+             ^ (typ |> Shared.typeToString))
     (* TODO indent *)
     |> String.concat "\n"
   in

analysis/src/PrintType.ml

@@ -8,3 +8,7 @@ let printDecl ?printNameAsIs ~recStatus name decl =
   Res_doc.toString ~width:60
     (Res_outcome_printer.printOutSigItemDoc ?printNameAsIs
        (Printtyp.tree_of_type_declaration (Ident.create name) decl recStatus))
+
+let printIdentLike ~allowUident name =
+  Res_doc.toString ~width:60
+    (Res_outcome_printer.printIdentLike ~allowUident name)

analysis/src/SharedTypes.ml

@@ -692,8 +692,12 @@ module Completable = struct
         ^ (match argumentLabel with
           | Unlabelled {argumentPosition} ->
             "$" ^ string_of_int argumentPosition
-          | Labelled name -> "~" ^ name
-          | Optional name -> "~" ^ name ^ "=?")
+          | Labelled name ->
+            let name = PrintType.printIdentLike ~allowUident:false name in
+            "~" ^ name
+          | Optional name ->
+            let name = PrintType.printIdentLike ~allowUident:false name in
+            "~" ^ name ^ "= ?")
         ^ ")"
       | CJsxPropValue {pathToComponent; propName} ->
         "CJsxPropValue " ^ (pathToComponent |> list) ^ " " ^ propName

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

@@ -1,5 +1,5 @@
 Hover src/ExoticIdentifiers.res 0:7
-{"contents": {"kind": "markdown", "value": "```rescript\nmodule X: {\n  let Foo: string\n}\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nmodule X: {\n  let \\\"Foo\": string\n}\n```"}}
 
 Complete src/ExoticIdentifiers.res 5:15
 posCursor:[5:15] posNoWhite:[5:14] Found expr:[5:13->5:15]
@@ -14,7 +14,7 @@ Completable: Cpath Value[X, ""]
   }]
 
 Hover src/ExoticIdentifiers.res 8:12
-{"contents": {"kind": "markdown", "value": "```rescript\nmodule type Y = {\n  let Foo: string\n}\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nmodule type Y = {\n  let \\\"Foo\": string\n}\n```"}}
 
 Hover src/ExoticIdentifiers.res 13:5
 {"contents": {"kind": "markdown", "value": "```rescript\ntype x = {\\\"Foo\": string}\n```"}}
@@ -25,10 +25,10 @@ posCursor:[17:10] posNoWhite:[17:9] Found expr:[17:5->19:11]
 posCursor:[17:10] posNoWhite:[17:9] Found pattern:[17:9->17:11]
 Completable: Cpattern Value[x]->recordBody
 [{
-    "label": "Foo",
+    "label": "\\\"Foo\"",
     "kind": 5,
     "tags": [],
-    "detail": "Foo: string\n\nx",
+    "detail": "\\\"Foo\": string\n\nx",
     "documentation": null
   }]
 
@@ -41,7 +41,7 @@ Pexp_apply ...[25:3->25:4] ()
 Completable: CnamedArg(Value[g], "", [])
 Found type for function (~Foo: 'a) => 'a
 [{
-    "label": "Foo",
+    "label": "\\\"Foo\"",
     "kind": 4,
     "tags": [],
     "detail": "'a",
@@ -56,7 +56,7 @@ posCursor:[38:11] posNoWhite:[38:9] Found expr:[38:9->38:13]
 JSX <C:[38:9->38:10] > _children:38:11
 Completable: Cjsx([C], "", [])
 [{
-    "label": "Foo",
+    "label": "\\\"Foo\"",
     "kind": 4,
     "tags": [],
     "detail": "option<string>",

analysis/vendor/res_outcome_printer/res_outcome_printer.mli

@@ -12,6 +12,8 @@ val parenthesized_ident : string -> bool [@@live]
 val setup : unit lazy_t [@@live]
 
 (* Needed for e.g. the playground to print typedtree data *)
+val printIdentLike : allowUident:bool -> string -> Res_doc.t
+
 val printOutTypeDoc : Outcometree.out_type -> Res_doc.t [@@live]
 val printOutSigItemDoc :
   ?printNameAsIs:bool -> Outcometree.out_sig_item -> Res_doc.t