chore: bring back 4.14 suport

ps-id: D3D5054F-3AB6-4E4F-8858-464F8EE4B6DE

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

@@ -19,7 +19,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
         ocaml-compiler:
-          - 4.13.x
+          - 4.14.x
 
     runs-on: ${{ matrix.os }}
 

Makefile

@@ -21,7 +21,7 @@ install-test-deps:
 
 .PHONY: dev
 dev: ## Setup a development environment
-	opam switch create --no-install . ocaml-base-compiler.4.13.1
+	opam switch create --no-install . ocaml-base-compiler.4.14.0
 	opam install -y dune-release merlin ocamlformat utop ocaml-lsp-server
 	opam install --locked --deps-only --with-doc -y .
 	$(MAKE) install-test-deps

README.md

@@ -122,7 +122,7 @@ git clone --recursive git@github.com:ocaml/ocaml-lsp.git
 git submodule update --init --recursive
 
 # create local switch (or use global one)
-opam switch create . ocaml-base-compiler.4.13.0
+opam switch create . ocaml-base-compiler.4.14.0
 
 # don't forget to set your environment to use the local switch
 eval $(opam env)

dune-project

@@ -63,7 +63,7 @@ possible and does not make any assumptions about IO.
   (csexp (>= 1.5))
   (ocamlformat-rpc-lib (>= 0.21.0))
   (odoc :with-doc)
-  (ocaml (and (>= 4.13) (< 4.14)))))
+  (ocaml (and (>= 4.14) (< 4.15)))))
 
 (package
  (name jsonrpc)

jsonrpc-fiber/test/jsonrpc_fiber_tests.ml

@@ -266,7 +266,7 @@ let%expect_test "test from jsonrpc_test.ml" =
     Uncaught error when handling notification:
     { "method": "raise", "jsonrpc": "2.0" }
     Error:
-    [ { exn = "(Failure \"special failure\")"; backtrace = "" } ]
+    [ { exn = "Failure(\"special failure\")"; backtrace = "" } ]
     <opaque>
     { "id": 10, "jsonrpc": "2.0", "result": 1 }
     { "id": "testing", "jsonrpc": "2.0", "result": 2 } |}]

nix/default.nix

@@ -13,7 +13,7 @@ let
                  [ "nix" "shell.nix" "default.nix" ];
            in pkgs.nix-gitignore.gitignoreSourcePure ignores ../.;
   args = {
-    inherit (pkgs.ocaml-ng.ocamlPackages_4_13) ocaml;
+    inherit (pkgs.ocaml-ng.ocamlPackages_4_14) ocaml;
     selection = ./opam-selection.nix;
     src = {
       ocamlformat-rpc-lib = ocamlformat;

nix/opam-selection.nix

@@ -24,7 +24,7 @@ in
 {
   format-version = 4;
   inherit repos;
-  ocaml-version = "4.13.1";
+  ocaml-version = "4.14.0";
   selection = 
   {
     astring = 
@@ -522,7 +522,7 @@ in
     ocaml = 
     {
       pname = "ocaml";
-      version = "4.13.1";
+      version = "4.14.0";
       src = null;
       opamInputs = 
       {
@@ -534,25 +534,25 @@ in
       };
       opamSrc = repoPath (repos.opam-repository.src) 
       {
-        package = "packages/ocaml/ocaml.4.13.1";
-        hash = "sha256:12aajj2hc636jr6wbv4vba8pmjdndbcvnw7q35gj4agxmrjspziw";
+        package = "packages/ocaml/ocaml.4.14.0";
+        hash = "sha256-uEKCTkEWM1EhLO/zOkZtLP45aWRcN8Z/LFffwK8zkdw=";
       };
     };
     ocaml-base-compiler = 
     {
       pname = "ocaml-base-compiler";
-      version = "4.13.1";
+      version = "4.14.1";
       src = pkgs.fetchurl 
       {
-        url = "https://github.com/ocaml/ocaml/archive/4.13.1.tar.gz";
-        sha256 = "1i7ad8lh5l74wb3yzmhlv529wc75a5sjybzkad7wdl8zrj47jk0r";
+        url = "https://github.com/ocaml/ocaml/archive/4.14.0.tar.gz";
+        sha256 = "sha256-uEKCTkEWM1EhLO/zOkZtLP45aWRcN8Z/LFffwK8zkdw=";
       };
       opamInputs = {
       };
       opamSrc = repoPath (repos.opam-repository.src) 
       {
-        package = "packages/ocaml-base-compiler/ocaml-base-compiler.4.13.1";
-        hash = "sha256:069i5vsndd9lsvdm5wk898nfnc85ww7459nibjg6881ww43w8ck1";
+        package = "packages/ocaml-base-compiler/ocaml-base-compiler.4.14.0";
+        hash = "sha256-uEKCTkEWM1EhLO/zOkZtLP45aWRcN8Z/LFffwK8zkdw=";
       };
     };
     ocaml-compiler-libs = 

ocaml-lsp-server.opam

@@ -38,7 +38,7 @@ depends: [
   "csexp" {>= "1.5"}
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
-  "ocaml" {>= "4.13" & < "4.14"}
+  "ocaml" {>= "4.14" & < "4.15"}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [

ocaml-lsp-server/test/e2e/__tests__/completionItem-resolve.test.ts

@@ -53,11 +53,10 @@ describe("textDocument/completion", () => {
 
     expect(response).toMatchInlineSnapshot(`
       Object {
-        "documentation": " [map2 f [a1; ...; an] [b1; ...; bn]] is
+        "documentation": "[map2 f [a1; ...; an] [b1; ...; bn]] is
          [[f a1 b1; ...; f an bn]].
          @raise Invalid_argument if the two lists are determined
-         to have different lengths. Not tail-recursive.
-       ",
+         to have different lengths. Not tail-recursive.",
         "label": "map2",
       }
     `);
@@ -75,8 +74,7 @@ describe("textDocument/completion", () => {
 
     expect(response).toMatchInlineSnapshot(`
       Object {
-        "documentation": " [find_all] is another name for {!filter}.
-       ",
+        "documentation": "[find_all] is another name for {!filter}.",
         "label": "find_all",
       }
     `);

ocaml-lsp-server/test/e2e/__tests__/textDocument-diagnostics.ts

@@ -180,7 +180,8 @@ describe("textDocument/diagnostics", () => {
             sig val x : int end
           is not included in
             sig val x : unit end
-          Values do not match: val x : int is not included in val x : unit",
+          Values do not match: val x : int is not included in val x : unit
+          The type int is not compatible with the type unit",
                 "range": Object {
                   "end": Object {
                     "character": 3,