Merge branch 'master' of github.com:/ocaml/ocaml-lsp into Add-ocamlformat-mlx

* 'master' of github.com:/ocaml/ocaml-lsp:
  nix: updates (ocaml#1550)
  refactor: get rid of a bunch of [Stdune.String] uses (ocaml#1551)
  Deleted a dead link (ocaml#1549)
  Yojson 3 compat (ocaml#1534)
  Prepare release 1.23.0 (ocaml#1539)
  Delegate outline generation to Merlin (ocaml#1529)
  Fix yojson constraint (ocaml#1538)
  chore: remove all the stdune [O] references (ocaml#1483)
  Handle new kind of outline symbol (ocaml#1527)

Author: davesnx

.github/workflows/build-and-test.yml

@@ -49,7 +49,7 @@ jobs:
 
       # Remove this pin once a compatible version of Merlin has been released
       - name: Pin dev Merlin
-        run: opam --cli=2.1 pin --with-version=5.4-503 https://github.com/ocaml/merlin.git#main
+        run: opam --cli=2.1 pin --with-version=5.5-503 https://github.com/ocaml/merlin.git#main
 
       - name: Build and install dependencies
         run: opam install .
@@ -90,7 +90,7 @@ jobs:
 
       # Remove this pin once a compatible version of Merlin has been released
       - name: Pin dev Merlin
-        run: opam --cli=2.1 pin --with-version=5.4-503 https://github.com/ocaml/merlin.git#main
+        run: opam --cli=2.1 pin --with-version=5.5-503 https://github.com/ocaml/merlin.git#main
 
       - name: Install dependencies
         run: |

CHANGES.md

@@ -1,4 +1,4 @@
-# unreleased
+# 1.23.0
 
 ## Features
 
@@ -14,6 +14,7 @@
 - Fix `inlay-hint` for function parameters (#1515)
 - More precise diagnostics in the event of a failed identifier search (`Definition_query`) (#1518)
 - Remove `ocamlformat` application after `destruct` (that remove some useful parenthesis) (#1519)
+- Make compatible with Yojson 3.x by removing `Tuple` and `Variant` (#1534)
 
 # 1.22.0
 

README.md

@@ -415,9 +415,3 @@ date. Also, both servers seem deprecated.
   use merlin which means that it supports fewer versions of OCaml and offers less
   "smart" functionality - especially in the face of sources that do not yet
   compile.
-
-- [ocaml-language-server](https://github.com/ocaml-lsp/ocaml-language-server)
-  This project is extremely similar in the functionality it provides because it
-  also reuses merlin on the backend. The essential difference is that this
-  project is written in typescript, while our server is in OCaml. We feel that
-  it's best to use OCaml to maximize the contributor pool.

dune-project

@@ -70,13 +70,14 @@ possible and does not make any assumptions about IO.
   (csexp (>= 1.5))
   (ocamlformat-rpc-lib (>= 0.21.0))
   (odoc :with-doc)
-  (merlin-lib (and (>= 5.4) (< 6.0)))
+  (merlin-lib (and (>= 5.5) (< 6.0)))
   (ppx_yojson_conv :with-dev-setup)))
 
 (package
  (name jsonrpc)
- (synopsis "Jsonrpc protocol implemenation")
+ (synopsis "Jsonrpc protocol implementation")
  (description "See https://www.jsonrpc.org/specification")
  (depends
+  yojson
   (ocaml (>= 4.08))
   (odoc :with-doc)))

flake.lock

@@ -3,7 +3,7 @@
     flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:nix-ocaml/nix-overlays";
     merlin5_3 = {
-      url = "github:liam923/merlin/rename-holes";
+      url = "github:ocaml/merlin";
       flake = false;
     };
     merlin5_2 = {
@@ -15,7 +15,7 @@
   outputs = { self, flake-utils, nixpkgs, ... }@inputs:
     let
       package = "ocaml-lsp-server";
-      ocamlformat = pkgs: pkgs.ocamlformat_0_26_2;
+      ocamlformat = pkgs: pkgs.ocamlformat_0_27_0;
       basePackage = {
         duneVersion = "3";
         version = "n/a";
@@ -59,7 +59,7 @@
           jsonrpc = buildDunePackage (basePackage // {
             pname = "jsonrpc";
             doCheck = false;
-            propagatedBuildInputs = with pkgs.ocamlPackages; [ ];
+            propagatedBuildInputs = with pkgs.ocamlPackages; [ yojson ];
           });
 
           lsp = buildDunePackage (basePackage // {

flake.nix

@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-synopsis: "Jsonrpc protocol implemenation"
+synopsis: "Jsonrpc protocol implementation"
 description: "See https://www.jsonrpc.org/specification"
 maintainer: ["Rudi Grinberg <[email protected]>"]
 authors: [
@@ -20,6 +20,7 @@ homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
   "dune" {>= "3.0"}
+  "yojson"
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]

jsonrpc.opam

@@ -1,4 +1,5 @@
 (library
  (public_name jsonrpc)
+ (libraries yojson)
  (instrumentation
   (backend bisect_ppx)))

jsonrpc/src/dune

@@ -9,18 +9,7 @@ module Option = struct
 end
 
 module Json = struct
-  type t =
-    [ `Assoc of (string * t) list
-    | `Bool of bool
-    | `Float of float
-    | `Int of int
-    | `Intlit of string
-    | `List of t list
-    | `Null
-    | `String of string
-    | `Tuple of t list
-    | `Variant of string * t option
-    ]
+  type t = Yojson.Safe.t
 
   exception Of_json of (string * t)
 

jsonrpc/src/import.ml

@@ -1,18 +1,7 @@
 (** Jsonrpc implementation *)
 
 module Json : sig
-  type t =
-    [ `Assoc of (string * t) list
-    | `Bool of bool
-    | `Float of float
-    | `Int of int
-    | `Intlit of string
-    | `List of t list
-    | `Null
-    | `String of string
-    | `Tuple of t list
-    | `Variant of string * t option
-    ]
+  type t = Yojson.Safe.t
 
   (** Raised when conversions from json fail *)
   exception Of_json of (string * t)