_

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

ocaml-lsp-server/src/check_for_comments.ml

@@ -5,13 +5,12 @@ let position_in_comment ~position ~merlin =
     let start = Position.of_lexical_position loc.loc_start in
     let end_ = Position.of_lexical_position loc.loc_end in
     match Option.both start end_ with
-    | Some (start, end_) ->
+    | Some (start, end_) -> (
       let range = Range.create ~start ~end_ in
-      (match Position.compare_inclusion position range with
-       | `Inside -> true
-       | `Outside _ -> false)
+      match Position.compare_inclusion position range with
+      | `Inside -> true
+      | `Outside _ -> false)
     | None -> false
   in
   Document.Merlin.with_pipeline_exn ~name:"get-comments" merlin (fun pipeline ->
-    Mpipeline.reader_comments pipeline |> List.exists ~f:loc_contains_position)
-;;
+      Mpipeline.reader_comments pipeline |> List.exists ~f:loc_contains_position)

ocaml-lsp-server/src/check_for_comments.mli

@@ -1,2 +1,3 @@
 (** Returns [true] if [position] occurs inside a comment in the document *)
-val position_in_comment : position:Position.t -> merlin:Document.Merlin.t -> bool Fiber.t
+val position_in_comment :
+  position:Position.t -> merlin:Document.Merlin.t -> bool Fiber.t

ocaml-lsp-server/src/compl.ml

@@ -242,12 +242,13 @@ module Complete_with_construct = struct
 end
 
 let complete (state : State.t)
-    ({ textDocument = { uri }; position = pos; context; _ } : CompletionParams.t) =
+    ({ textDocument = { uri }; position = pos; context; _ } :
+      CompletionParams.t) =
   Fiber.of_thunk (fun () ->
       let doc = Document_store.get state.store uri in
       match Document.kind doc with
       | `Other -> Fiber.return None
-      | `Merlin merlin ->
+      | `Merlin merlin -> (
         let completion_item_capability =
           let open Option.O in
           let capabilities = State.client_capabilities state in
@@ -267,26 +268,29 @@ let complete (state : State.t)
         in
         let* should_provide_completions =
           match context with
-          | Some context ->
-            (match context.triggerKind with
-             | TriggerCharacter ->
-               let+ inside_comment =
-                 Check_for_comments.position_in_comment ~position:pos ~merlin
-               in
-               (match inside_comment with
-                | true -> `Ignore
-                | false -> `Provide_completions)
-             | Invoked | TriggerForIncompleteCompletions ->
-               Fiber.return `Provide_completions)
+          | Some context -> (
+            match context.triggerKind with
+            | TriggerCharacter -> (
+              let+ inside_comment =
+                Check_for_comments.position_in_comment ~position:pos ~merlin
+              in
+              match inside_comment with
+              | true -> `Ignore
+              | false -> `Provide_completions)
+            | Invoked | TriggerForIncompleteCompletions ->
+              Fiber.return `Provide_completions)
           | None -> Fiber.return `Provide_completions
         in
-        (match should_provide_completions with
-         | `Ignore -> Fiber.return None
-         | `Provide_completions ->
+        match should_provide_completions with
+        | `Ignore -> Fiber.return None
+        | `Provide_completions ->
           let+ items =
             let position = Position.logical pos in
             let prefix =
-              prefix_of_position ~short_path:false (Document.source doc) position
+              prefix_of_position
+                ~short_path:false
+                (Document.source doc)
+                position
             in
             let deprecated =
               Option.value
@@ -299,7 +303,9 @@ let complete (state : State.t)
               Complete_by_prefix.complete merlin prefix pos ~resolve ~deprecated
             else
               let reindex_sortText completion_items =
-                List.mapi completion_items ~f:(fun idx (ci : CompletionItem.t) ->
+                List.mapi
+                  completion_items
+                  ~f:(fun idx (ci : CompletionItem.t) ->
                     let sortText = Some (sortText_of_index idx) in
                     { ci with sortText })
               in
@@ -349,7 +355,9 @@ let complete (state : State.t)
               construct_completionItems @ compl_by_prefix_completionItems
               |> reindex_sortText |> preselect_first
           in
-          Some (`CompletionList (CompletionList.create ~isIncomplete:false ~items ()))))
+          Some
+            (`CompletionList
+              (CompletionList.create ~isIncomplete:false ~items ()))))
 
 let format_doc ~markdown doc =
   match markdown with

ocaml-lsp-server/src/import.ml

@@ -108,6 +108,7 @@ module Asttypes = Ocaml_parsing.Asttypes
 module Cmt_format = Ocaml_typing.Cmt_format
 module Ident = Ocaml_typing.Ident
 module Env = Ocaml_typing.Env
+module Merlin_parsing = Ocaml_parsing
 
 module Loc = struct
   module T = struct

ocaml-lsp-server/src/signature_help.ml

@@ -197,7 +197,9 @@ let run (state : State.t)
     Fiber.return help
   | `Merlin merlin -> (
     let* application_signature =
-      let* inside_comment = Check_for_comments.position_in_comment ~position ~merlin in
+      let* inside_comment =
+        Check_for_comments.position_in_comment ~position ~merlin
+      in
       match inside_comment with
       | true -> Fiber.return None
       | false ->