move most things to Protocol

Author: zth

analysis/src/CodeActions.ml

@@ -1,93 +1,36 @@
+open Protocol
+
 type kind = RefactorRewrite
 
 let kindToString kind = match kind with RefactorRewrite -> "refactor.rewrite"
 
-module TextDocument = struct
-  type t = {version : string option; uri : string}
-
-  let make ~version ~uri = {version; uri}
-
-  let toString t =
-    Printf.sprintf {|{"version": %s, "uri": "%s"}|}
-      (match t.version with
-      | Some version -> "\"" ^ Json.escape version ^ "\""
-      | None -> "null")
-      t.uri
-end
-
-module Position = struct
-  type t = {line : int; character : int}
-
-  let make ~line ~character = {line; character}
-
-  let toString t =
-    Printf.sprintf {|{"line": %s, "character": %s}|} (string_of_int t.line)
-      (string_of_int t.character)
-end
+type codeAction = {title : string; kind : kind; edit : codeActionEdit}
 
-module TextEditRange = struct
-  type t = {start : Position.t; end_ : Position.t}
-
-  let make ~start ~end_ = {start; end_}
-
-  let toString t =
-    Printf.sprintf {|{"start": %s, "end": %s}|}
-      (t.start |> Position.toString)
-      (t.end_ |> Position.toString)
-end
-
-module TextEdit = struct
-  type t = {newText : string; range : TextEditRange.t}
-
-  let make ~newText ~range = {newText; range}
-
-  let toString t =
-    Printf.sprintf {|{"newText": "%s", "range": %s}|} (Json.escape t.newText)
-      (t.range |> TextEditRange.toString)
-end
+let stringifyCodeAction ca =
+  Printf.sprintf {|{"title": "%s", "kind": "%s", "edit": %s}|} ca.title
+    (kindToString ca.kind)
+    (ca.edit |> stringifyCodeActionEdit)
 
-module DocumentChange = struct
-  type t = {textDocument : TextDocument.t; edits : TextEdit.t list}
-
-  let make ~textDocument ~edits = {textDocument; edits}
-
-  let toString t =
-    Printf.sprintf {|{"textDocument": %s, "edits": [%s]}|}
-      (t.textDocument |> TextDocument.toString)
-      (t.edits
-      |> List.map (fun edit -> edit |> TextEdit.toString)
-      |> String.concat ",")
-end
-
-module CodeActionEdit = struct
-  type t = {documentChanges : DocumentChange.t list}
-
-  let make ~documentChanges = {documentChanges}
+(* This is the return that's expected when resolving code actions *)
+type result = codeAction list
 
-  let toString t =
-    Printf.sprintf {|{"documentChanges": [%s]}|}
-      (t.documentChanges
-      |> List.map (fun documentChange ->
-             documentChange |> DocumentChange.toString)
-      |> String.concat ",")
-end
+let stringifyCodeActions codeActions =
+  Printf.sprintf {|%s|} (codeActions |> List.map stringifyCodeAction |> array)
 
 module CodeAction = struct
-  type t = {title : string; kind : kind; edit : CodeActionEdit.t}
-
-  let make ~title ~kind ~edit = {title; kind; edit}
-
-  let toString t =
-    Printf.sprintf {|{"title": "%s", "kind": "%s", "edit": %s}|} t.title
-      (kindToString t.kind)
-      (t.edit |> CodeActionEdit.toString)
+  let makeRangeReplace ~title ~kind ~file ~newText ~range =
+    {
+      title;
+      kind;
+      edit =
+        {
+          documentChanges =
+            [
+              {
+                textDocument = {version = None; uri = file};
+                edits = [{newText; range}];
+              };
+            ];
+        };
+    }
 end
-
-(* This is the return that's expected when resolving code actions *)
-type result = CodeAction.t list
-
-let stringifyCodeActions codeActions =
-  Printf.sprintf {|[%s]|}
-    (codeActions
-    |> List.map (fun codeAction -> codeAction |> CodeAction.toString)
-    |> String.concat ",")

analysis/src/Commands.ml

@@ -121,35 +121,13 @@ let codeAction ~path ~line ~col =
               CodeActions.(
                 stringifyCodeActions
                   [
-                    CodeAction.make ~title:"Unwrap optional"
-                      ~kind:RefactorRewrite
-                      ~edit:
-                        (CodeActionEdit.make
-                           ~documentChanges:
-                             [
-                               DocumentChange.make
-                                 ~textDocument:
-                                   (TextDocument.make ~version:None ~uri:path)
-                                 ~edits:
-                                   [
-                                     TextEdit.make
-                                       ~newText:
-                                         ("switch " ^ n
-                                        ^ " { | None => failWith(\"TODO\") | \
-                                           Some(" ^ n ^ ") => _" ^ n ^ " }")
-                                       ~range:
-                                         (TextEditRange.make
-                                            ~start:
-                                              (Position.make
-                                                 ~line:range.start.line
-                                                 ~character:
-                                                   range.start.character)
-                                            ~end_:
-                                              (Position.make
-                                                 ~line:range.end_.line
-                                                 ~character:range.end_.character));
-                                   ];
-                             ]);
+                    CodeAction.makeRangeReplace ~title:"Unwrap optional"
+                      ~kind:RefactorRewrite ~file:path
+                      ~newText:
+                        ("switch " ^ n
+                       ^ " { | None => failWith(\"TODO\") | Some(" ^ n
+                       ^ ") => _" ^ n ^ " }")
+                      ~range;
                   ])
             | _ -> Protocol.null)
           | _ -> Protocol.null))

analysis/src/Protocol.ml

@@ -1,7 +1,5 @@
 type position = {line : int; character : int}
-
 type range = {start : position; end_ : position}
-
 type markupContent = {kind : string; value : string}
 
 type completionItem = {
@@ -13,15 +11,10 @@ type completionItem = {
 }
 
 type hover = {contents : string}
-
 type location = {uri : string; range : range}
-
 type documentSymbolItem = {name : string; kind : int; location : location}
-
 type codeAction = {newText : string; range : range}
-
 type renameFile = {oldUri : string; newUri : string}
-
 type textEdit = {range : range; newText : string}
 
 type optionalVersionedTextDocumentIdentifier = {
@@ -34,8 +27,9 @@ type textDocumentEdit = {
   edits : textEdit list;
 }
 
-let null = "null"
+type codeActionEdit = {documentChanges : textDocumentEdit list}
 
+let null = "null"
 let array l = "[" ^ String.concat ", " l ^ "]"
 
 let stringifyPosition p =
@@ -74,8 +68,7 @@ let stringifyCodeAction c =
         "content": "%s",
         "range": %s
 }|}
-    (Json.escape c.newText)
-    (stringifyRange c.range)
+    (Json.escape c.newText) (stringifyRange c.range)
 
 let stringifyLocation (h : location) =
   Printf.sprintf {|{"uri": "%s", "range": %s}|} (Json.escape h.uri)
@@ -121,3 +114,7 @@ let stringifyTextDocumentEdit tde =
   }|}
     (stringifyoptionalVersionedTextDocumentIdentifier tde.textDocument)
     (tde.edits |> List.map stringifyTextEdit |> array)
+
+let stringifyCodeActionEdit cae =
+  Printf.sprintf {|{"documentChanges": %s}|}
+    (cae.documentChanges |> List.map stringifyTextDocumentEdit |> array)