Refactor: clean up hover parts.

Author: cristianoc

src/rescript-editor-support/Hover.re

@@ -133,45 +133,45 @@ let newHover = (~file: SharedTypes.file, ~getModule, loc) => {
         | None => (typeString, docstring)
         | Some((extra, extraDocstring)) => (
             typeString ++ "\n\n" ++ codeBlock(extra),
-            extraDocstring,
+            switch (extraDocstring) {
+            | None => []
+            | Some(d) => [d]
+            },
           )
         };
-      (Some(typeString), docstring);
+      (typeString, docstring);
     };
 
     let parts =
       switch (References.definedForLoc(~file, ~getModule, locKind)) {
       | None =>
-        let (typeString, docstring) = t |> fromType(~docstring=None);
-        [typeString, docstring];
+        let (typeString, docstring) = t |> fromType(~docstring=[]);
+        [typeString, ...docstring];
       | Some((docstring, res)) =>
-        let parts =
-          switch (res) {
-          | `Declared =>
-            let (typeString, docstring) = t |> fromType(~docstring);
-            [typeString, docstring];
-          | `Constructor({cname: {txt}, args}) =>
-            let (typeString, docstring) = t |> fromType(~docstring);
+        switch (res) {
+        | `Declared =>
+          let (typeString, docstring) = t |> fromType(~docstring);
+          [typeString, ...docstring];
+        | `Constructor({cname: {txt}, args}) =>
+          let (typeString, docstring) = t |> fromType(~docstring);
 
-            let argsString =
-              switch (args) {
-              | [] => ""
-              | _ =>
-                args
-                |> List.map(((t, _)) => Shared.typeToString(t))
-                |> String.concat(", ")
-                |> Printf.sprintf("(%s)")
-              };
+          let argsString =
+            switch (args) {
+            | [] => ""
+            | _ =>
+              args
+              |> List.map(((t, _)) => Shared.typeToString(t))
+              |> String.concat(", ")
+              |> Printf.sprintf("(%s)")
+            };
 
-            [typeString, Some(codeBlock(txt ++ argsString)), docstring];
-          | `Field({typ}) =>
-            let (typeString, docstring) = typ |> fromType(~docstring);
-            [typeString, docstring];
-          };
-
-        parts;
+          [typeString, codeBlock(txt ++ argsString), ...docstring];
+        | `Field({typ}) =>
+          let (typeString, docstring) = typ |> fromType(~docstring);
+          [typeString, ...docstring];
+        }
       };
 
-    Some(String.concat("\n\n", parts |> Utils.filterMap(x => x)));
+    Some(String.concat("\n\n", parts));
   };
 };

src/rescript-editor-support/References.re

@@ -99,10 +99,10 @@ let definedForLoc = (~file, ~getModule, locKind) => {
     switch (tip) {
     | Constructor(name) =>
       let%opt constructor = Query.getConstructor(file, stamp, name);
-      Some((None, `Constructor(constructor)));
+      Some(([], `Constructor(constructor)));
     | Field(name) =>
       let%opt field = Query.getField(file, stamp, name);
-      Some((None, `Field(field)));
+      Some(([], `Field(field)));
     | _ =>
       maybeLog(
         "Trying for declared "
@@ -114,7 +114,12 @@ let definedForLoc = (~file, ~getModule, locKind) => {
       );
       let%opt declared =
         Query.declaredForTip(~stamps=file.stamps, stamp, tip);
-      Some((declared.docstring, `Declared));
+      let docstring =
+        switch (declared.docstring) {
+        | None => []
+        | Some(d) => [d]
+        };
+      Some((docstring, `Declared));
     };
   };