refactor: rename module types

Signed-off-by: Rudi Grinberg <[email protected]>

Author: rgrinberg

ocaml-lsp-server/src/document.ml

@@ -94,7 +94,7 @@ type t =
       ; pipeline : Mpipeline.t Lazy_fiber.t
       ; merlin : Lev_fiber.Thread.t
       ; timer : Lev_fiber.Timer.Wheel.task
-      ; merlin_config : Merlin_config.Ref.t
+      ; merlin_config : Merlin_config.t
       ; syntax : Syntax.t
       }
 
@@ -157,7 +157,7 @@ let version t = Text_document.version (tdoc t)
 
 let make_pipeline merlin_config thread tdoc =
   Lazy_fiber.create (fun () ->
-      let* config = Merlin_config.Ref.config merlin_config in
+      let* config = Merlin_config.config merlin_config in
       let* async_make_pipeline =
         Lev_fiber.Thread.task thread ~f:(fun () ->
             Text_document.text tdoc |> Msource.make |> Mpipeline.make config)
@@ -167,11 +167,11 @@ let make_pipeline merlin_config thread tdoc =
       | Ok s -> s
       | Error e -> Exn_with_backtrace.reraise e)
 
-let make_merlin wheel merlin_config ~merlin_thread tdoc syntax =
+let make_merlin wheel merlin_db ~merlin_thread tdoc syntax =
   let+ timer = Lev_fiber.Timer.Wheel.task wheel in
   let merlin_config =
     let uri = Text_document.documentUri tdoc in
-    Merlin_config.get merlin_config uri
+    Merlin_config.DB.get merlin_db uri
   in
   let pipeline = make_pipeline merlin_config merlin_thread tdoc in
   Merlin
@@ -244,7 +244,7 @@ let close t =
   | Other _ -> Fiber.return ()
   | Merlin t ->
     Fiber.fork_and_join_unit
-      (fun () -> Merlin_config.Ref.destroy t.merlin_config)
+      (fun () -> Merlin_config.destroy t.merlin_config)
       (fun () -> Lev_fiber.Timer.Wheel.cancel t.timer)
 
 let get_impl_intf_counterparts uri =

ocaml-lsp-server/src/document.mli

@@ -30,7 +30,7 @@ val syntax : t -> Syntax.t
 
 val make :
      Lev_fiber.Timer.Wheel.t
-  -> Merlin_config.t
+  -> Merlin_config.DB.t
   -> merlin_thread:Lev_fiber.Thread.t
   -> DidOpenTextDocumentParams.t
   -> t Fiber.t

ocaml-lsp-server/src/merlin_config.ml

@@ -190,18 +190,11 @@ module Process = struct
       { pid; initial_cwd; stdin; stdout; session }
 end
 
-type t =
+type db =
   { running : (string, Process.t) Table.t
   ; pool : Fiber.Pool.t
   }
 
-let create () =
-  { running = Table.create (module String) 0; pool = Fiber.Pool.create () }
-
-let run t = Fiber.Pool.run t.pool
-
-let stop t = Fiber.Pool.stop t.pool
-
 let get_process t ~dir =
   match Table.find t.running dir with
   | Some p -> Fiber.return p
@@ -318,40 +311,49 @@ let find_project_context start_dir =
   in
   loop None start_dir
 
-module Ref = struct
-  type nonrec t =
-    { path : string
-    ; directory : string
-    ; initial : Mconfig.t
-    ; db : t
+type nonrec t =
+  { path : string
+  ; directory : string
+  ; initial : Mconfig.t
+  ; db : db
+  }
+
+let destroy _ = Fiber.return ()
+
+let create db path =
+  let path =
+    let path = Uri.to_path path in
+    Misc.canonicalize_filename path
+  in
+  let directory = Filename.dirname path in
+  let initial =
+    let filename = Filename.basename path in
+    let init = Mconfig.initial in
+    { init with
+      ocaml = { init.ocaml with real_paths = false }
+    ; query = { init.query with filename; directory }
     }
+  in
+  { path; directory; initial; db }
 
-  let destroy _ = Fiber.return ()
+let config (t : t) : Mconfig.t Fiber.t =
+  let* () = Fiber.return () in
+  match find_project_context t.directory with
+  | None -> Fiber.return t.initial
+  | Some (ctxt, config_path) ->
+    let+ dot, failures = get_config t.db ctxt t.path in
+    let merlin = Config.merge dot t.initial.merlin failures config_path in
+    Mconfig.normalize { t.initial with merlin }
 
-  let create db path =
-    let path =
-      let path = Uri.to_path path in
-      Misc.canonicalize_filename path
-    in
-    let directory = Filename.dirname path in
-    let initial =
-      let filename = Filename.basename path in
-      let init = Mconfig.initial in
-      { init with
-        ocaml = { init.ocaml with real_paths = false }
-      ; query = { init.query with filename; directory }
-      }
-    in
-    { path; directory; initial; db }
-
-  let config (t : t) : Mconfig.t Fiber.t =
-    let* () = Fiber.return () in
-    match find_project_context t.directory with
-    | None -> Fiber.return t.initial
-    | Some (ctxt, config_path) ->
-      let+ dot, failures = get_config t.db ctxt t.path in
-      let merlin = Config.merge dot t.initial.merlin failures config_path in
-      Mconfig.normalize { t.initial with merlin }
-end
+module DB = struct
+  type t = db
 
-let get t uri = Ref.create t uri
+  let get t uri = create t uri
+
+  let create () =
+    { running = Table.create (module String) 0; pool = Fiber.Pool.create () }
+
+  let run t = Fiber.Pool.run t.pool
+
+  let stop t = Fiber.Pool.stop t.pool
+end

ocaml-lsp-server/src/merlin_config.mli

@@ -2,20 +2,22 @@
 
 open Import
 
-module Ref : sig
-  type t
+type t
 
-  val config : t -> Mconfig.t Fiber.t
+val config : t -> Mconfig.t Fiber.t
 
-  val destroy : t -> unit Fiber.t
-end
+val destroy : t -> unit Fiber.t
 
-type t
+module DB : sig
+  type config := t
 
-val create : unit -> t
+  type t
+
+  val create : unit -> t
 
-val stop : t -> unit Fiber.t
+  val stop : t -> unit Fiber.t
 
-val run : t -> unit Fiber.t
+  val run : t -> unit Fiber.t
 
-val get : t -> Uri.t -> Ref.t
+  val get : t -> Uri.t -> config
+end

ocaml-lsp-server/src/ocaml_lsp_server.ml

@@ -1056,14 +1056,14 @@ let start () =
   Fiber.all_concurrently_unit
     [ Fiber.Pool.run detached
     ; Lev_fiber.Timer.Wheel.run wheel
-    ; Merlin_config.run state.merlin_config
+    ; Merlin_config.DB.run state.merlin_config
     ; (let* () = Server.start server in
        let finalize =
          [ Document_store.close_all store
          ; Fiber.Pool.stop detached
          ; Ocamlformat_rpc.stop ocamlformat_rpc
          ; Lev_fiber.Timer.Wheel.stop wheel
-         ; Merlin_config.stop state.merlin_config
+         ; Merlin_config.DB.stop state.merlin_config
          ]
        in
        let finalize =

ocaml-lsp-server/src/state.ml

@@ -12,7 +12,7 @@ type init =
 type t =
   { store : Document_store.t
   ; merlin : Lev_fiber.Thread.t
-  ; merlin_config : Merlin_config.t
+  ; merlin_config : Merlin_config.DB.t
   ; init : init
   ; detached : Fiber.Pool.t
   ; configuration : Configuration.t
@@ -26,7 +26,7 @@ type t =
 let create ~store ~merlin ~detached ~configuration ~ocamlformat_rpc ~diagnostics
     ~symbols_thread ~wheel =
   { init = Uninitialized
-  ; merlin_config = Merlin_config.create ()
+  ; merlin_config = Merlin_config.DB.create ()
   ; store
   ; merlin
   ; detached

ocaml-lsp-server/src/state.mli

@@ -12,7 +12,7 @@ type init =
 type t =
   { store : Document_store.t
   ; merlin : Lev_fiber.Thread.t
-  ; merlin_config : Merlin_config.t
+  ; merlin_config : Merlin_config.DB.t
   ; init : init
   ; detached : Fiber.Pool.t
   ; configuration : Configuration.t