Clean up type vs docstring.

Author: cristianoc

analysis/src/Commands.ml

@@ -43,8 +43,12 @@ let hover ~path ~line ~col ~currentFile ~debug =
             ~forHover:true
         in
         match completions with
-        | {kind = Label typString} :: _ ->
-          Protocol.stringifyHover (Hover.codeBlock typString)
+        | {kind = Label typString; docstring} :: _ ->
+          let parts =
+            (if typString = "" then [] else [Hover.codeBlock typString])
+            @ docstring
+          in
+          Protocol.stringifyHover (String.concat "\n\n" parts)
         | _ -> (
           match CompletionBackEnd.completionsGetTypeEnv completions with
           | Some (typ, _env) ->

analysis/src/CompletionBackEnd.ml

@@ -1403,39 +1403,39 @@ let processCompletable ~debug ~package ~scope ~env ~pos ~forHover
       |> List.map mkLabel)
       @ keyLabels
   | Cdecorator prefix ->
-    let mkDecorator (name, doc) =
-      Completion.create ~name ~kind:(Label doc) ~env
+    let mkDecorator (name, docstring) =
+      {(Completion.create ~name ~kind:(Label "") ~env) with docstring}
     in
     [
-      ("as", "");
-      ("dead", "...docs for dead...");
-      ("deriving", "");
-      ("genType", "");
-      ("genType.as", "");
-      ("genType.import", "");
-      ("genType.opaque", "");
-      ("get", "");
-      ("get_index", "");
-      ("inline", "");
-      ("int", "");
-      ("live", "...docs for live...");
-      ("meth", "");
-      ("module", "");
-      ("new", "");
-      ("obj", "");
-      ("react.component", "");
-      ("return", "");
-      ("scope", "");
-      ("send", "");
-      ("set", "");
-      ("set_index", "");
-      ("string", "");
-      ("this", "");
-      ("unboxed", "");
-      ("uncurry", "");
-      ("unwrap", "");
-      ("val", "");
-      ("variadic", "");
+      ("as", []);
+      ("dead", ["...docs for dead..."]);
+      ("deriving", []);
+      ("genType", []);
+      ("genType.as", []);
+      ("genType.import", []);
+      ("genType.opaque", []);
+      ("get", []);
+      ("get_index", []);
+      ("inline", []);
+      ("int", []);
+      ("live", ["...docs for live..."]);
+      ("meth", []);
+      ("module", []);
+      ("new", []);
+      ("obj", []);
+      ("react.component", []);
+      ("return", []);
+      ("scope", []);
+      ("send", []);
+      ("set", []);
+      ("set_index", []);
+      ("string", []);
+      ("this", []);
+      ("unboxed", []);
+      ("uncurry", []);
+      ("unwrap", []);
+      ("val", []);
+      ("variadic", []);
     ]
     |> List.filter (fun (decorator, _) -> Utils.startsWith decorator prefix)
     |> List.map (fun (decorator, doc) ->

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

@@ -68,5 +68,5 @@ Hover tests/src/Hover.res 112:3
 Nothing at that position. Now trying to use completion.
 Attribute id:live:[112:0->112:5] label:live
 Completable: Cdecorator(live)
-{"contents": "```rescript\n...docs for live...\n```"}
+{"contents": "...docs for live..."}