Prepare infra for hover on unsaved.

Try to use completion infra to hover on unsaved code.

Author: cristianoc

analysis/src/Cli.ml

@@ -70,7 +70,7 @@ let main () =
   | [_; "completion"; path; line; col; currentFile] ->
     Commands.completion ~debug:false ~path
       ~pos:(int_of_string line, int_of_string col)
-      ~currentFile
+      ~currentFile ~forHover:false
   | [_; "definition"; path; line; col] ->
     Commands.definition ~path ~line:(int_of_string line)
       ~col:(int_of_string col)

analysis/src/Commands.ml

@@ -1,4 +1,4 @@
-let completion ~debug ~path ~pos ~currentFile =
+let completion ~debug ~path ~pos ~currentFile ~forHover =
   let result =
     let textOpt = Files.readFile currentFile in
     match textOpt with
@@ -22,7 +22,7 @@ let completion ~debug ~path ~pos ~currentFile =
             let package = full.package in
             completable
             |> NewCompletions.processCompletable ~debug ~package ~pos ~scope
-                 ~env)
+                 ~env ~forHover)
       in
       completionItems
   in
@@ -316,7 +316,8 @@ let test ~path =
                    in
                    Printf.fprintf cout "%s\n" lineToOutput);
             close_out cout;
-            completion ~debug:true ~path ~pos:(line, col) ~currentFile;
+            completion ~debug:true ~path ~pos:(line, col) ~currentFile
+              ~forHover:false;
             Sys.remove currentFile
           | "hig" ->
             print_endline ("Highlight " ^ path);

analysis/src/NewCompletions.ml

@@ -3,7 +3,7 @@ open SharedTypes
 let domLabels =
   let bool = "bool" in
   let float = "float" in
-  let int = "int" in 
+  let int = "int" in
   let string = "string" in
   [
     ("ariaDetails", string);
@@ -703,6 +703,7 @@ let detail name (kind : Completion.kind) =
   | Type {decl} -> decl |> Shared.declToString name
   | Value typ -> typ |> Shared.typeToString
   | ObjLabel typ -> typ |> Shared.typeToString
+  | Label typString -> typString
   | Module _ -> "module"
   | FileModule _ -> "file module"
   | Field ({typ}, s) -> name ^ ": " ^ (typ |> Shared.typeToString) ^ "\n\n" ^ s
@@ -1311,7 +1312,7 @@ let getOpens ~rawOpens ~package ~env =
   (* Last open takes priority *)
   List.rev resolvedOpens
 
-let processCompletable ~debug ~package ~scope ~env ~pos
+let processCompletable ~debug ~package ~scope ~env ~pos ~forHover
     (completable : Completable.t) =
   let rawOpens = Scope.getRawOpens scope in
   let opens = getOpens ~rawOpens ~package ~env in
@@ -1330,20 +1331,18 @@ let processCompletable ~debug ~package ~scope ~env ~pos
          ~env ~exact:false ~scope
     |> List.map completionToItem
   | Cjsx ([id], prefix, identsSeen) when String.uncapitalize_ascii id = id ->
-    let mkLabel_ name typString =
-      mkItem ~name ~kind:4 ~deprecated:None ~detail:typString ~docstring:[]
+    let mkLabel (name, typString) =
+      Completion.create ~name ~kind:(Label typString) ~env
     in
-    let mkLabel (name, typ) = mkLabel_ name typ in
     let keyLabels =
-      if Utils.startsWith "key" prefix then [mkLabel_ "key" "string"] else []
+      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)
-      @ keyLabels
+    (domLabels
+    |> List.filter (fun (name, _t) ->
+           Utils.startsWith name prefix && not (List.mem name identsSeen))
+    |> List.map mkLabel)
+    @ keyLabels
+    |> List.map completionToItem
   | Cjsx (componentPath, prefix, identsSeen) ->
     let labels =
       match componentPath @ ["make"] |> findTypeOfValue with
@@ -1389,7 +1388,7 @@ let processCompletable ~debug ~package ~scope ~env ~pos
       | None -> []
     in
     let mkLabel_ name typString =
-      mkItem ~name ~kind:4 ~deprecated:None ~detail:typString ~docstring:[]
+      Completion.create ~name ~kind:(Label typString) ~env
     in
     let mkLabel (name, typ) = mkLabel_ name (typ |> Shared.typeToString) in
     let keyLabels =
@@ -1399,13 +1398,13 @@ let processCompletable ~debug ~package ~scope ~env ~pos
     else
       (labels
       |> List.filter (fun (name, _t) ->
-             Utils.startsWith name prefix && not (List.mem name identsSeen))
+             Utils.startsWith name prefix
+             && (forHover || not (List.mem name identsSeen)))
       |> List.map mkLabel)
       @ keyLabels
+      |> List.map completionToItem
   | Cdecorator prefix ->
-    let mkDecorator name =
-      mkItem ~name ~kind:4 ~deprecated:None ~detail:"" ~docstring:[]
-    in
+    let mkDecorator name = Completion.create ~name ~kind:(Label "") ~env in
     [
       "as";
       "deriving";
@@ -1445,7 +1444,7 @@ let processCompletable ~debug ~package ~scope ~env ~pos
              else decorator
            in
            dec2)
-    |> List.map mkDecorator
+    |> List.map mkDecorator |> List.map completionToItem
   | CnamedArg (cp, prefix, identsSeen) ->
     let labels =
       match
@@ -1475,11 +1474,9 @@ let processCompletable ~debug ~package ~scope ~env ~pos
       | None -> []
     in
     let mkLabel (name, typ) =
-      mkItem ~name ~kind:4 ~deprecated:None
-        ~detail:(typ |> Shared.typeToString)
-        ~docstring:[]
+      Completion.create ~name ~kind:(Label (typ |> Shared.typeToString)) ~env
     in
     labels
     |> List.filter (fun (name, _t) ->
            Utils.startsWith name prefix && not (List.mem name identsSeen))
-    |> List.map mkLabel
+    |> List.map mkLabel |> List.map completionToItem

analysis/src/SharedTypes.ml

@@ -209,6 +209,7 @@ module Completion = struct
     | Module of Module.t
     | Value of Types.type_expr
     | ObjLabel of Types.type_expr
+    | Label of string
     | Type of Type.t
     | Constructor of Constructor.t * string
     | Field of field * string
@@ -233,6 +234,7 @@ module Completion = struct
     | FileModule _ -> 9
     | Constructor (_, _) -> 4
     | ObjLabel _ -> 4
+    | Label _ -> 4
     | Field (_, _) -> 5
     | Type _ -> 22
     | Value _ -> 12