fixes and updates

Makefile

@@ -13,6 +13,9 @@ clean:
 doc:
 	@dune build @doc
 
+update-submodules:
+	@git submodule update --init
+
 VERSION=$(shell awk '/^version:/ {print $$2}' linol.opam)
 
 update_next_tag:

example/template-eio/main.ml

@@ -15,6 +15,8 @@
      of a document are expected to be able to return.
 *)
 
+module Lsp = Linol.Lsp
+
 type state_after_processing = unit
 
 let process_some_input_file (_file_contents : string) : state_after_processing =

example/template-lwt/main.ml

@@ -15,6 +15,8 @@
      of a document are expected to be able to return.
 *)
 
+module Lsp = Linol.Lsp
+
 type state_after_processing = unit
 
 let process_some_input_file (_file_contents : string) : state_after_processing =

src/common_.ml

@@ -1,3 +1,5 @@
+module Lsp = Linol_lsp.Lsp
+module Jsonrpc = Linol_jsonrpc.Jsonrpc
 module Trace = Trace_core
 
 let ( let@ ) = ( @@ )

src/dune

@@ -3,4 +3,4 @@
  (public_name linol)
  (private_modules log)
  (flags :standard -warn-error -a+8)
- (libraries yojson logs threads trace.core lsp jsonrpc))
+ (libraries yojson logs threads trace.core (re_export linol.lsp) (re_export linol.jsonrpc)))

src/eio/linol_eio.ml

@@ -1,3 +1,7 @@
+open struct
+  module Lsp = Linol_lsp.Lsp
+end
+
 module type IO = Linol.IO
 
 module IO_eio :

src/jsonrpc2.mli

@@ -2,6 +2,7 @@
 
     See {{: https://www.jsonrpc.org/specification} the spec} *)
 
+open Common_
 type json = Yojson.Safe.t
 
 module type IO = Sigs.IO

src/linol.ml

@@ -3,13 +3,16 @@
     Abstraction over The "Lsp" library, to make it easier to develop
     LSP servers in OCaml (but not necessarily {b for} OCaml). *)
 
-module Imports = struct
-  module Lsp = Lsp
-  module Jsonrpc = Jsonrpc
-end    
     
 module type IO = Sigs.IO
 
+(** {2 Re-export from vendored lsp} *)
+
+module Lsp = Linol_lsp.Lsp
+module Jsonrpc = Linol_jsonrpc.Jsonrpc
+
+(** {2 Main modules} *)
+
 module Jsonrpc2 = Jsonrpc2
 module Server = Server
 module Blocking_IO = Blocking_IO

src/lwt/linol_lwt.ml

@@ -1,3 +1,7 @@
+open struct
+  module Lsp = Linol_lsp.Lsp
+end
+
 module type IO = Linol.IO
 
 module IO_lwt :

vendor/jsonrpc/dune

@@ -1,5 +1,5 @@
 (copy_files %{project_root}/submodules/ocaml-lsp/jsonrpc/src/*.{ml,mli})
 
 (library
- (name jsonrpc)
+ (name linol_jsonrpc)
  (public_name linol.jsonrpc))

vendor/lsp/dune

@@ -1,9 +1,10 @@
 (copy_files %{project_root}/submodules/ocaml-lsp/lsp/src/*.{ml,mli,mll})
 
 (library
- (name lsp)
+ (name linol_lsp)
  (public_name linol.lsp)
- (libraries jsonrpc ppx_yojson_conv_lib uutf yojson)
+ (libraries linol_jsonrpc ppx_yojson_conv_lib uutf yojson)
+ (flags :standard -open Linol_jsonrpc)
  (lint
   (pps ppx_yojson_conv)))