Enable support for OCaml 5.4 and prepare release 1.24.0 (#1559)

* Restore compatibility with merlin for ocaml 5.4

* Update CI

* Bump ocaml version in pkg

* Update deps

* Update changelog

* Fix compiler name in CI

Author: voodoos

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

@@ -45,11 +45,11 @@ jobs:
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "ocaml-base-compiler.5.3.0"
+          ocaml-compiler: "ocaml-variants.5.4.0+trunk"
 
       # 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.5-503 https://github.com/ocaml/merlin.git#main
+        run: opam --cli=2.1 pin --with-version=5.6-504 https://github.com/voodoos/merlin.git#504-rebase
 
       - name: Build and install dependencies
         run: opam install .
@@ -81,7 +81,7 @@ jobs:
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "ocaml-base-compiler.5.3.0"
+          ocaml-compiler: "ocaml-variants.5.4.0+trunk"
 
       - name: Set git user
         run: |
@@ -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.5-503 https://github.com/ocaml/merlin.git#main
+        run: opam --cli=2.1 pin --with-version=5.6-504 https://github.com/voodoos/merlin.git#504-rebase
 
       - name: Install dependencies
         run: |

CHANGES.md

@@ -1,3 +1,9 @@
+# 1.24.0
+
+## Features
+
+- Support for OCaml 5.4 (#1559)
+
 # 1.23.1
 
 ## Fixes

dune-project

@@ -56,7 +56,7 @@ possible and does not make any assumptions about IO.
   dyn
   stdune
   (fiber (and (>= 3.1.1) (< 4.0.0)))
-  (ocaml (and (>= 5.3) (< 5.4)))
+  (ocaml (and (>= 5.4) (< 5.5)))
   xdg
   ordering
   dune-build-info
@@ -70,7 +70,8 @@ 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.5) (< 5.7)))
+  (merlin-lib (and (>= 5.6) (< 5.7)))
+  (ocaml-index :post)
   (ppx_yojson_conv :with-dev-setup)))
 
 (package

ocaml-lsp-server.opam

@@ -31,7 +31,7 @@ depends: [
   "dyn"
   "stdune"
   "fiber" {>= "3.1.1" & < "4.0.0"}
-  "ocaml" {>= "5.3" & < "5.4"}
+  "ocaml" {>= "5.4" & < "5.5"}
   "xdg"
   "ordering"
   "dune-build-info"
@@ -45,7 +45,8 @@ depends: [
   "csexp" {>= "1.5"}
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
-  "merlin-lib" {>= "5.5" & < "5.7"}
+  "merlin-lib" {>= "5.6" & < "5.7"}
+  "ocaml-index" {post}
   "ppx_yojson_conv" {with-dev-setup}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"

ocaml-lsp-server/src/code_actions/action_inline.ml

@@ -160,7 +160,7 @@ end = struct
     let pat_iter (type k) (iter : I.iterator) (pat : k Typedtree.general_pattern) =
       match pat.pat_desc with
       | Tpat_var (id, { loc; _ }, _) -> paths := Loc.Map.set !paths loc (Pident id)
-      | Tpat_alias (pat, id, { loc; _ }, _) ->
+      | Tpat_alias (pat, id, { loc; _ }, _, _) ->
         paths := Loc.Map.set !paths loc (Pident id);
         I.default_iterator.pat iter pat
       | _ -> I.default_iterator.pat iter pat
@@ -217,9 +217,12 @@ let beta_reduce (paths : Paths.t) (app : Parsetree.expression) =
       if is_pure arg then body else with_let ()
     | Ppat_var param | Ppat_constraint ({ ppat_desc = Ppat_var param; _ }, _) ->
       if is_pure arg then with_subst param else with_let ()
-    | Ppat_tuple pats ->
+    | Ppat_tuple ( pats, _) ->
+      let pats = List.map ~f:snd pats in
       (match arg.pexp_desc with
-       | Pexp_tuple args -> List.fold_left2 ~f:beta_reduce_arg ~init:body pats args
+       | Pexp_tuple args ->
+        let args = List.map ~f:snd args in
+        List.fold_left2 ~f:beta_reduce_arg ~init:body pats args
        | _ -> with_let ())
     | _ -> with_let ()
   in
@@ -275,16 +278,16 @@ let inline_edits pipeline task =
         env
         (iter : I.iterator)
         (label : Asttypes.arg_label)
-        (m_arg_expr : Typedtree.expression option)
+        (m_arg_expr : Typedtree.apply_arg)
     =
     match label, m_arg_expr with
     (* handle the labeled argument shorthand `f ~x` when inlining `x` *)
-    | Labelled name, Some { exp_desc = Texp_ident (Pident id, { loc; _ }, _); _ }
+    | Labelled name, Arg { exp_desc = Texp_ident (Pident id, { loc; _ }, _); _ }
     (* inlining is allowed for optional arguments that are being passed a Some
        parameter, i.e. `x` may be inlined in `let x = 1 in (fun ?(x = 0) -> x)
        ~x` *)
     | ( Optional name
-      , Some
+      , Arg
           { exp_desc =
               (* construct is part of desugaring, assumed to be Some *)
               Texp_construct
@@ -294,13 +297,14 @@ let inline_edits pipeline task =
       when Ident.same task.inlined_var id && not_shadowed env ->
       let newText = sprintf "%s:%s" name newText in
       insert_edit newText loc
-    | Optional _, Some ({ exp_desc = Texp_construct _; _ } as arg_expr) ->
+    | Optional _, Arg ({ exp_desc = Texp_construct _; _ } as arg_expr) ->
       iter.expr iter arg_expr
     (* inlining is _not_ allowed for optional arguments that are being passed an
        optional parameter i.e. `x` may _not_ be inlined in `let x = Some 1 in
        (fun ?(x = 0) -> x) ?x` *)
-    | Optional _, Some _ -> ()
-    | _, _ -> Option.iter m_arg_expr ~f:(iter.expr iter)
+    | Optional _, Arg _ -> ()
+    | _, Arg arg -> iter.expr iter arg
+    | _, _ -> ()
   in
   let paths = Paths.of_typedtree task.inlined_expr in
   let inlined_pexpr = find_parsetree_loc_exn pipeline task.inlined_expr.exp_loc in

ocaml-lsp-server/src/code_actions/action_mark_remove_unused.ml

@@ -89,7 +89,7 @@ let rec mark_value_unused_edit name contexts =
                  { range = Range.create ~start:start_pos ~end_:start_pos; newText = "_" }
            | _ -> None
            : Longident.t Loc.loc
-             * Types.label_description
+             * Data_types.label_description
              * Typedtree.value Typedtree.general_pattern
              -> TextEdit.t option)
     in

ocaml-lsp-server/src/import.ml

@@ -238,6 +238,7 @@ include struct
   module Path = Path
   module Typedtree = Typedtree
   module Types = Types
+  module Data_types = Data_types
 end
 
 include struct

ocaml-lsp-server/src/semantic_highlighting.ml

@@ -518,10 +518,10 @@ end = struct
 
   let pexp_apply (self : Ast_iterator.iterator) (expr : Parsetree.expression) args =
     match expr.pexp_desc with
-    | Pexp_ident { txt = Ldot (Lident "Array", "set"); _ }
-    | Pexp_ident { txt = Ldot (Lident "Array", "get"); _ }
-    | Pexp_ident { txt = Ldot (Lident "String", "set"); _ }
-    | Pexp_ident { txt = Ldot (Lident "String", "get"); _ } ->
+    | Pexp_ident { txt = Ldot ({ txt = Lident "Array"; _ }, { txt = "set"; _ }); _ }
+    | Pexp_ident { txt = Ldot ({ txt = Lident "Array"; _ }, { txt = "get"; _ }); _ }
+    | Pexp_ident { txt = Ldot ({ txt = Lident "String"; _ }, { txt = "set"; _ }); _ }
+    | Pexp_ident { txt = Ldot ({ txt = Lident "String"; _ }, { txt = "get"; _ }); _ } ->
       List.iter args ~f:(fun ((_ : Asttypes.arg_label), e) -> self.expr self e);
       `Custom_iterator
     | Pexp_ident lid ->