Merge pull request #1536 from voodoos/414-LTS-upgrade

414 lts upgrade

Author: voodoos

.git-blame-ignore-revs

@@ -7,3 +7,5 @@
 ab49baa5873e7f0b9181dbed3ad89681f1e4bcee
 # Upgrade to OCamlformat 0.26.1
 1a6419bac3ce012deb9c6891e6b25e2486c33388
+# Upgrade to OCamlformat 0.27.0
+2ccbee5dd691690228307d3636e2f82c8cdb3902

.github/dependabot.yml

@@ -8,7 +8,7 @@ updates:
       - dependencies
       - no changelog
   - package-ecosystem: npm
-    directory: /ocaml-lsp-server/test/e2e
+    directory: /
     schedule:
       interval: daily
     labels:

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

@@ -45,15 +45,14 @@ jobs:
         run: yarn --frozen-lockfile
         working-directory: ocaml-lsp-server/test/e2e
 
-      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
+      - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          allow-prerelease-opam: true
 
       # Remove this pin once a compatible version of Merlin has been released
-      # - name: Pin dev Merlin
-      #   run: opam pin https://github.com/ocaml/merlin.git#main
+      - name: Pin dev Merlin
+        run: opam pin --with-version 4.19-414 https://github.com/voodoos/merlin.git#414-4.19-backports
 
       - name: Build and install dependencies
         run: opam install .
@@ -85,10 +84,9 @@ jobs:
           submodules: true
 
       - name: Set-up OCaml
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: "4.14"
-          allow-prerelease-opam: true
 
       - name: Set git user
         run: |
@@ -99,7 +97,8 @@ jobs:
         run: |
           opam install . --deps-only
           opam exec -- make coverage-deps install-test-deps
+
       - run: opam exec -- make test-coverage
         env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_REPO_TOKEN: ${{ github.token }}
           PULL_REQUEST_NUMBER: ${{ github.event.number }}

.github/workflows/changelog.yml

@@ -10,4 +10,4 @@ jobs:
     name: Check Changelog Action
     runs-on: ubuntu-latest
     steps:
-      - uses: tarides/changelog-check-action@v2
+      - uses: tarides/changelog-check-action@v3

.github/workflows/update-flake-lock.yml

@@ -0,0 +1,21 @@
+name: Update Nix Flake Lock
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: 0 0 * * 0
+
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v30
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: DeterminateSystems/update-flake-lock@v24
+        with:
+          pr-labels: |
+            dependencies
+            no changelog

.ocamlformat

@@ -1,3 +1,3 @@
-version=0.26.2
+version=0.27.0
 profile=janestreet
 ocaml-version=4.14.0

CHANGES.md

@@ -1,3 +1,31 @@
+# 1.21.0
+
+## Features
+
+- Make `inlay-hint` for function parameters configurable (#1515)
+
+- Add custom `ocamllsp/jumpToTypedHole` to navigate through typed holes (#1516)
+
+- Add a code-action for combining pattern cases (just relaying on regex) (#1514)
+
+- Allow (by configuration) shortening of diagnostics (just highlighting the first line) (#1513)
+
+- Fix `yojson_of_t` for `Nullable_option`: serialize `None` as `Null` instead of asserting false (#1525 fixes #1524)
+
+## Fixes
+
+- Support for `class`, `class type`, `method` and `property` for `DocumentSymbol` query (#1487 fixes #1449)
+
+- 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)
+
+- Add a new server option `standardHover`, that can be used by clients to
+  disable the default hover provider.  When `standardHover = false`
+  `textDocument/hover` requests always returns with empty result. (#1416)
+
 # 1.20.1
 
 ## Fixes

README.md

@@ -182,7 +182,7 @@ Semantic highlighting support is enabled by default.
 > since OCaml-LSP 1.14.0
 
 OCaml-LSP implements experimental semantic highlighting support (also known as
-semantic tokens support). The support can be activated by passing an evironment
+semantic tokens support). The support can be activated by passing an environment
 variable to OCaml-LSP:
 
 - To enable non-incremental (expectedly slower but more stable) version, pass
@@ -245,7 +245,7 @@ type t = A | B of string option
 let f (v : t) = match v with | A -> _ | B (None) | B (Some _) -> _
 ```
 
-Importantly, note the undescores in place of expressions in each branch of the
+Importantly, note the underscores in place of expressions in each branch of the
 pattern match above. The underscores that occur in place of expressions are
 called "typed holes" - a concept explained below.
 

dune-project

@@ -31,20 +31,21 @@ possible and does not make any assumptions about IO.
 ")
  (depends
   (jsonrpc (= :version))
-  yojson
+  (yojson (< 3.0.0))
   (ppx_yojson_conv_lib (>= "v0.14"))
   (cinaps :with-test)
   (ppx_expect (and (>= v0.15.0) (< 0.17.0) :with-test))
   (uutf (>= 1.0.2))
   (odoc :with-doc)
-  (ocaml (>= 4.14))))
+  (ocaml (>= 4.14))
+  (ppx_yojson_conv :with-dev-setup)))
 
 (package
  (name ocaml-lsp-server)
  (synopsis "LSP Server for OCaml")
  (description "An LSP server for OCaml.")
  (depends
-  yojson
+  (yojson (< 3.0.0))
   (base (>= v0.16.0))
   (lsp (= :version))
   (jsonrpc (= :version))
@@ -63,13 +64,14 @@ possible and does not make any assumptions about IO.
   astring
   camlp-streams
   (ppx_expect (and (>= v0.15.0) (< 0.17.0) :with-test))
-  (ocamlformat (and :with-test (= 0.26.2)))
+  (ocamlformat (and :with-test (= 0.27.0)))
   (ocamlc-loc (>= 3.7.0))
   (pp (>= 1.1.2))
   (csexp (>= 1.5))
   (ocamlformat-rpc-lib (>= 0.21.0))
   (odoc :with-doc)
-  (merlin-lib (and (>= 4.18) (< 5.0)))))
+  (merlin-lib (and (>= 4.18) (< 5.0)))
+  (ppx_yojson_conv :with-dev-setup)))
 
 (package
  (name jsonrpc)

jsonrpc-fiber/src/jsonrpc_fiber.ml

@@ -137,11 +137,11 @@ struct
   ;;
 
   let create
-    ?(on_request = on_request_fail)
-    ?(on_notification = on_notification_fail)
-    ~name
-    chan
-    state
+        ?(on_request = on_request_fail)
+        ?(on_notification = on_notification_fail)
+        ~name
+        chan
+        state
     =
     let pending = Id.Table.create 10 in
     { chan
@@ -274,8 +274,8 @@ struct
       let* () =
         Fiber.fork_and_join_unit
           (fun () ->
-            let* () = loop () in
-            Fiber.Pool.stop later)
+             let* () = loop () in
+             Fiber.Pool.stop later)
           (fun () -> Fiber.Pool.run later)
       in
       close t)
@@ -358,11 +358,10 @@ struct
       let pending = !batch in
       batch := [];
       let pending, ivars =
-        List.fold_left pending ~init:([], []) ~f:(fun (pending, ivars) ->
-            function
-            | `Notification n -> Jsonrpc.Packet.Notification n :: pending, ivars
-            | `Request ((r : Request.t), ivar) ->
-              Jsonrpc.Packet.Request r :: pending, (r.id, ivar) :: ivars)
+        List.fold_left pending ~init:([], []) ~f:(fun (pending, ivars) -> function
+          | `Notification n -> Jsonrpc.Packet.Notification n :: pending, ivars
+          | `Request ((r : Request.t), ivar) ->
+            Jsonrpc.Packet.Request r :: pending, (r.id, ivar) :: ivars)
       in
       List.iter ivars ~f:(fun (id, ivar) -> register_request_ivar t id ivar);
       Chan.send t.chan pending)