Test completion cleanup

This might be safer and easier on the eyes?
We might also be able to ditch JsonShort and Json serialization afterward? Dunno

Author: chenglou

src/EditorSupportCommands.ml

@@ -113,10 +113,9 @@ let dump files =
 
 let autocomplete ~currentFile ~full ~package ~pos ~state =
   let maybeText = Files.readFile currentFile in
-  let completions =
-    NewCompletions.computeCompletions ~full ~maybeText ~package ~pos ~state
-  in
-  Json.stringify completions
+  NewCompletions.computeCompletions ~full ~maybeText ~package ~pos ~state
+  |> List.map Protocol.stringifyCompletionItem
+  |> Protocol.array
 
 let complete ~pathWithPos ~currentFile =
   let state = TopTypes.empty () in

src/JsonShort.ml

@@ -4,4 +4,3 @@ let o o = Object o
 let s s = String s
 let i i = Number (float_of_int i)
 let l l = Array l
-let null = Null

src/NewCompletions.ml

@@ -424,8 +424,6 @@ let getItems ~full ~package ~rawOpens ~getModule ~allModules ~pos ~parts =
         @ List.concat
             (opens |> List.map (fun env -> attributeCompletions ~env ~suffix))))
 
-module J = JsonShort
-
 let mkItem ~name ~kind ~detail ~deprecated ~docstring ~uri ~pos_lnum =
   let valueMessage =
     (match deprecated with None -> "" | Some s -> "Deprecated: " ^ s ^ "\n\n")
@@ -437,17 +435,18 @@ let mkItem ~name ~kind ~detail ~deprecated ~docstring ~uri ~pos_lnum =
   let tags =
     match deprecated = None with
     | true -> []
-    | false -> [J.i 1 (* deprecated *)]
+    | false -> [1 (* deprecated *)]
   in
-  J.o
-    [
-      ("label", J.s name);
-      ("kind", J.i kind);
-      ("tags", J.l tags);
-      ("detail", detail |> J.s);
-      ( "documentation",
-        J.o [("kind", J.s "markdown"); ("value", J.s valueMessage)] );
-    ]
+  Protocol.{
+    label = name;
+    kind = kind;
+    tags = tags;
+    detail = detail;
+    documentation = {
+      kind = "markdown";
+      value = valueMessage;
+    };
+  }
 
 let processCompletable ~findItems ~full ~package ~pos ~rawOpens
     (completable : PartialParser.completable) =
@@ -668,34 +667,31 @@ let processCompletable ~findItems ~full ~package ~pos ~rawOpens
     |> List.map mkLabel
 
 let computeCompletions ~full ~maybeText ~package ~pos ~state =
-  let items =
-    match maybeText with
+  match maybeText with
+  | None -> []
+  | Some text -> (
+    match PartialParser.positionToOffset text pos with
     | None -> []
-    | Some text -> (
-      match PartialParser.positionToOffset text pos with
+    | Some offset -> (
+      match PartialParser.findCompletable text offset with
       | None -> []
-      | Some offset -> (
-        match PartialParser.findCompletable text offset with
-        | None -> []
-        | Some completable ->
-          let rawOpens = PartialParser.findOpens text offset in
-          let allModules =
-            package.TopTypes.localModules @ package.dependencyModules
-          in
-          let findItems ~exact parts =
-            let items =
-              getItems ~full ~package ~rawOpens
-                ~getModule:(State.fileForModule state ~package)
-                ~allModules ~pos ~parts
-            in
-            match parts |> List.rev with
-            | last :: _ when exact ->
-              items
-              |> List.filter (fun (_uri, {SharedTypes.name = {txt}}) ->
-                     txt = last)
-            | _ -> items
+      | Some completable ->
+        let rawOpens = PartialParser.findOpens text offset in
+        let allModules =
+          package.TopTypes.localModules @ package.dependencyModules
+        in
+        let findItems ~exact parts =
+          let items =
+            getItems ~full ~package ~rawOpens
+              ~getModule:(State.fileForModule state ~package)
+              ~allModules ~pos ~parts
           in
-          completable
-          |> processCompletable ~findItems ~full ~package ~pos ~rawOpens))
-  in
-  if items = [] then J.null else items |> J.l
+          match parts |> List.rev with
+          | last :: _ when exact ->
+            items
+            |> List.filter (fun (_uri, {SharedTypes.name = {txt}}) ->
+                   txt = last)
+          | _ -> items
+        in
+        completable
+        |> processCompletable ~findItems ~full ~package ~pos ~rawOpens))

src/Protocol.ml

@@ -5,3 +5,34 @@ let posOfLexing {Lexing.pos_lnum; pos_cnum; pos_bol} =
 
 let rangeOfLoc {Location.loc_start; loc_end} =
   J.o [("start", posOfLexing loc_start); ("end", posOfLexing loc_end)]
+
+let array l = "[" ^ (String.concat ", " l) ^ "]"
+
+type markupContent = {
+  kind: string;
+  value: string;
+}
+type completionItem = {
+  label: string;
+  kind: int;
+  tags: int list;
+  detail: string;
+  documentation: markupContent;
+}
+let stringifyMarkupContent (m: markupContent) =
+  Printf.sprintf {|{"kind": "%s", "value": "%s"}|}
+  m.kind (String.escaped m.value)
+
+let stringifyCompletionItem c =
+  Printf.sprintf {|{
+    "label": "%s",
+    "kind": %i,
+    "tags": %s,
+    "detail": "%s",
+    "documentation": %s
+  }|}
+  (String.escaped c.label)
+  c.kind
+  (c.tags |> List.map string_of_int |> array)
+  (String.escaped c.detail)
+  (stringifyMarkupContent c.documentation)

src/RescriptEditorSupport.ml

@@ -1,4 +1,3 @@
-module J = JsonShort
 module StringSet = Set.Make (String)
 
 let parseArgs args =