Requests: Refactor implIntf and inferIntf parameters

ocaml-lsp-server/docs/ocamllsp/inferIntf-spec.md

@@ -22,7 +22,14 @@ property type: `boolean`
 ## Request
 
 - method: `ocamllsp/inferIntf`
-- params: `DocumentUri` (see [`DocumentUri`](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#uri) in LSP specification)
+- params:
+
+```json
+{
+  "uri": DocumentUri,
+}
+```
+(see [`DocumentUri`](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#uri) in LSP specification)
 
 ## Response
 

ocaml-lsp-server/docs/ocamllsp/switchImplIntf-spec.md

@@ -25,11 +25,16 @@ property type: `boolean`
 ## Request
 
 - method: `ocamllsp/switchImplIntf`
-- params: `DocumentUri` (see [`DocumentUri`](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#uri) in LSP specification)
+- params:
+
+```json
+{
+  "uri": DocumentUri,
+}
+```
+(see [`DocumentUri`](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#uri) in LSP specification)
 
 ## Response
 
 - result: DocumentUri[] (non-empty)
 - error: code and message set in case an exception happens during the `ocamllsp/switchImplIntf` request.
-
-

ocaml-lsp-server/src/custom_requests/req_infer_intf.ml

@@ -6,32 +6,18 @@ let meth = "ocamllsp/inferIntf"
 
 let on_request ~(params : Jsonrpc.Structured.t option) (state : State.t) =
   Fiber.of_thunk (fun () ->
-    match params with
-    | Some (`List [ json_uri ]) ->
-      let json_uri = DocumentUri.t_of_yojson json_uri in
-      (match Document_store.get_opt state.store json_uri with
-       | None ->
-         Jsonrpc.Response.Error.raise
-           (Jsonrpc.Response.Error.make
-              ~code:InvalidParams
-              ~message:
-                "ocamllsp/inferIntf received a URI for an unloaded file. Load the file \
-                 first."
-              ())
-       | Some impl ->
-         let+ intf = Inference.infer_intf_for_impl impl in
-         Json.t_of_yojson (`String intf))
-    | Some json ->
-      Jsonrpc.Response.Error.raise
-        (Jsonrpc.Response.Error.make
-           ~code:InvalidRequest
-           ~message:"The input parameter for ocamllsp/inferIntf is invalid"
-           ~data:(`Assoc [ "param", (json :> Json.t) ])
-           ())
+    let uri = Request_uri_params.parse_exn params in
+    let doc = Document_store.get_opt state.store uri in
+    match doc with
     | None ->
       Jsonrpc.Response.Error.raise
         (Jsonrpc.Response.Error.make
-           ~code:InvalidRequest
-           ~message:"ocamllsp/inferIntf must receive param: DocumentUri.t"
-           ()))
+           ~code:InvalidParams
+           ~message:
+             "ocamllsp/inferIntf received a URI for an unloaded file. Load the file \
+              first."
+           ())
+    | Some impl ->
+      let+ intf = Inference.infer_intf_for_impl impl in
+      Json.t_of_yojson (`String intf))
 ;;

ocaml-lsp-server/src/custom_requests/req_switch_impl_intf.ml

@@ -10,33 +10,18 @@ let switch merlin_doc (param : DocumentUri.t) : Json.t =
 ;;
 
 let on_request ~(params : Jsonrpc.Structured.t option) (state : State.t) =
-  match params with
-  | Some (`List [ json_uri ]) ->
-    let uri = DocumentUri.t_of_yojson json_uri in
-    (match Document_store.get_opt state.store uri with
-     | Some doc ->
-       (match Document.kind doc with
-        | `Merlin merlin_doc -> switch (Some merlin_doc) uri
-        | `Other ->
-          Jsonrpc.Response.Error.raise
-            (Jsonrpc.Response.Error.make
-               ~code:InvalidRequest
-               ~message:
-                 "Document with this URI is not supported by ocamllsp/switchImplIntf"
-               ~data:(`Assoc [ "param", (json_uri :> Json.t) ])
-               ()))
-     | None -> switch None uri)
-  | Some json ->
-    Jsonrpc.Response.Error.raise
-      (Jsonrpc.Response.Error.make
-         ~code:InvalidRequest
-         ~message:"The input parameter for ocamllsp/switchImplIntf is invalid"
-         ~data:(`Assoc [ "param", (json :> Json.t) ])
-         ())
-  | None ->
-    Jsonrpc.Response.Error.raise
-      (Jsonrpc.Response.Error.make
-         ~code:InvalidRequest
-         ~message:"ocamllsp/switchImplIntf must receive param: DocumentUri.t"
-         ())
+  let uri = Request_uri_params.parse_exn params in
+  let doc = Document_store.get_opt state.store uri in
+  match doc with
+  | Some doc ->
+    (match Document.kind doc with
+     | `Merlin merlin_doc -> switch (Some merlin_doc) uri
+     | `Other ->
+       Jsonrpc.Response.Error.raise
+         (Jsonrpc.Response.Error.make
+            ~code:InvalidRequest
+            ~message:"Document with this URI is not supported by ocamllsp/switchImplIntf"
+            ~data:(Uri.yojson_of_t uri)
+            ()))
+  | None -> switch None uri
 ;;

ocaml-lsp-server/src/custom_requests/req_typed_holes.ml

@@ -4,46 +4,6 @@ open Fiber.O
 let capability = "handleTypedHoles", `Bool true
 let meth = "ocamllsp/typedHoles"
 
-module Request_params = struct
-  type t = Uri.t
-
-  (* Request params must have the form as in the given string. *)
-  let expected_params = `Assoc [ "uri", `String "<DocumentUri>" ]
-  let create uri = uri
-
-  let t_of_structured_json params : t option =
-    match params with
-    | `Assoc [ ("uri", uri) ] ->
-      let uri = Uri.t_of_yojson uri in
-      Some uri
-    | _ -> None
-  ;;
-
-  let parse_exn (params : Jsonrpc.Structured.t option) : t =
-    let raise_invalid_params ?data ~message () =
-      Jsonrpc.Response.Error.raise
-      @@ Jsonrpc.Response.Error.make
-           ?data
-           ~code:Jsonrpc.Response.Error.Code.InvalidParams
-           ~message
-           ()
-    in
-    match params with
-    | None -> raise_invalid_params ~message:"Expected params but received none" ()
-    | Some params ->
-      (match t_of_structured_json params with
-       | Some uri -> uri
-       | None ->
-         let error_json =
-           `Assoc
-             [ "params_expected", expected_params; "params_received", (params :> Json.t) ]
-         in
-         raise_invalid_params ~message:"Unxpected parameter format" ~data:error_json ())
-  ;;
-
-  let yojson_of_t = Uri.yojson_of_t
-end
-
 type t = Range.t list
 
 let yojson_of_t holes =
@@ -57,7 +17,7 @@ let t_of_yojson list =
 
 let on_request ~(params : Jsonrpc.Structured.t option) (state : State.t) =
   Fiber.of_thunk (fun () ->
-    let uri = Request_params.parse_exn params in
+    let uri = Request_uri_params.parse_exn params in
     let store = state.store in
     let doc = Document_store.get_opt store uri in
     match doc with

ocaml-lsp-server/src/custom_requests/req_typed_holes.mli

@@ -1,12 +1,5 @@
 open Import
 
-module Request_params : sig
-  type t
-
-  val create : Uri.t -> t
-  val yojson_of_t : t -> Json.t
-end
-
 type t
 
 val t_of_yojson : Json.t -> t

ocaml-lsp-server/src/custom_requests/request_uri_params.ml

@@ -0,0 +1,38 @@
+open Import
+
+type t = Uri.t
+
+(* Request params must have the form as in the given string. *)
+let expected_params = `Assoc [ "uri", `String "<DocumentUri>" ]
+
+let t_of_structured_json params : t option =
+  match params with
+  | `Assoc [ ("uri", uri) ] ->
+    let uri = Uri.t_of_yojson uri in
+    Some uri
+  | _ -> None
+;;
+
+let parse_exn (params : Jsonrpc.Structured.t option) : t =
+  let raise_invalid_params ?data ~message () =
+    Jsonrpc.Response.Error.raise
+    @@ Jsonrpc.Response.Error.make
+         ?data
+         ~code:Jsonrpc.Response.Error.Code.InvalidParams
+         ~message
+         ()
+  in
+  match params with
+  | None -> raise_invalid_params ~message:"Expected params but received none" ()
+  | Some params ->
+    (match t_of_structured_json params with
+     | Some uri -> uri
+     | None ->
+       let error_json =
+         `Assoc
+           [ "params_expected", expected_params; "params_received", (params :> Json.t) ]
+       in
+       raise_invalid_params ~message:"Unexpected parameter format" ~data:error_json ())
+;;
+
+let yojson_of_t = Uri.yojson_of_t

ocaml-lsp-server/src/custom_requests/request_uri_params.mli

@@ -0,0 +1,6 @@
+open Import
+
+type t = Uri.t
+
+val yojson_of_t : t -> Json.t
+val parse_exn : Jsonrpc.Structured.t option -> t