Merge pull request #1974 from voodoos/504-rebase

Rebase 5.4 support and prepare for release

Author: voodoos

.github/workflows/fuzzy-ci.yml

@@ -45,7 +45,7 @@ env:
 
   # The compiler version used on the respective branches. It also needs to form part of Irmin's build cache key.
   # Bump either of these whenever the compiler version is bumped on either of the two branches.
-  merge_branch_COMPILER_VERSION: ocaml-base-compiler.5.3.0
+  merge_branch_COMPILER_VERSION: ocaml-variants.5.4.0+trunk
   base_branch_COMPILER_VERSION: ocaml-base-compiler.5.3.0
 
 jobs:

.github/workflows/main.yml

@@ -40,7 +40,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
         ocaml-compiler:
-          - ocaml-base-compiler.5.3.0
+          - ocaml-variants.5.4.0+trunk
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
 

.github/workflows/ocaml-lsp-compat.yml

@@ -34,7 +34,7 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - ocaml-base-compiler.5.3.0
+          - ocaml-variants.5.4.0+trunk
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
 
@@ -51,6 +51,6 @@ jobs:
 
       - name: Check that Merlin and OCaml-LSP are co-installable
         run: |
-          opam --cli=2.1 pin --with-version=dev --no-action https://github.com/ocaml/ocaml-lsp.git
-          opam --cli=2.1 pin --with-version=5.6-503 --no-action .
+          opam --cli=2.1 pin --with-version=dev --no-action https://github.com/voodoos/ocaml-lsp.git#504-compat
+          opam --cli=2.1 pin --with-version=5.6-504 --no-action .
           opam install ocaml-lsp-server --ignore-constraints-on=ocamlformat

CHANGES.md

@@ -1,12 +1,13 @@
 merlin 5.6
 ==========
-Tue Jun 24 17:10:42 CEST 2025
+Sat Oct 04 15:10:42 CEST 2025
 
   + merlin binary
     - Add `locate-types` command (#1951)
   + merlin library
     - Fix `merlin_reader` for OpenBSD (#1956)
     - Improve recovery of mutually recursive definitions (#1962, #1963, fixes #1953)
+    - Support for OCaml 5.4 (#1974)
   + vim plugin
     - Fix error when `:MerlinOccurrencesProjectWide` fails to gather code previews (#1970)
     - Add more short-paths tests cases (#1904)

merlin-lib.opam

@@ -11,7 +11,7 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml" {>="5.3" & <"5.4"}
+  "ocaml" {>="5.4" & <"5.5"}
   "dune" {>= "3.0.0"}
   "csexp" {>= "1.5.1"}
   "alcotest" {with-test & >= "1.3.0" }

merlin.opam

@@ -15,7 +15,7 @@ depends: [
   "dune" {>= "3.0.0"}
   "merlin-lib" {= version}
   "dot-merlin-reader" {= version}
-  "ocaml-index" {>= "1.0" & post}
+  "ocaml-index" {= version & post}
   "yojson" {>= "2.0.0"}
   "conf-jq" {with-test}
   "ppxlib" {with-test}

ocaml-index.opam

@@ -10,7 +10,7 @@ bug-reports: "https://github.com/ocaml/merlin/issues"
 x-maintenance-intent: ["(latest)"]
 depends: [
   "dune" {>= "3.0.0"}
-  "ocaml" {>= "5.3"}
+  "ocaml" {>= "5.4"}
   "merlin-lib" {= version}
   "odoc" {with-doc}
 ]

src/analysis/browse_misc.ml

@@ -33,15 +33,15 @@ let dummy_type_scheme desc =
 
 let print_constructor c =
   let open Types in
-  match c.cstr_args with
+  match c.Data_types.cstr_args with
   | [] ->
     Out_type.tree_of_typexp Type_scheme
       (dummy_type_scheme (get_desc c.cstr_res))
   | args ->
     let desc =
       Tarrow
         ( Ast_helper.no_label,
-          dummy_type_scheme (Ttuple args),
+          dummy_type_scheme (Ttuple (List.map ~f:(fun a -> None, a) args)),
           c.cstr_res,
           commu_ok )
     in
@@ -76,11 +76,11 @@ let signature_of_env ?(ignore_extensions = true) env =
     | Env_type (_, i, t) -> Some (Sig_type (i, t, Trec_not, Exported))
     (* Texp_first == bluff, FIXME *)
     | Env_extension (_, i, e) -> begin
-      match e.ext_type_path with
-      | Path.Pident id when Ident.name id = "exn" ->
-        Some (Sig_typext (i, e, Text_exception, Exported))
-      | _ -> Some (Sig_typext (i, e, Text_first, Exported))
-    end
+        match e.ext_type_path with
+        | Path.Pident id when Ident.name id = "exn" ->
+          Some (Sig_typext (i, e, Text_exception, Exported))
+        | _ -> Some (Sig_typext (i, e, Text_first, Exported))
+      end
     | Env_module (_, i, pr, m) ->
       Some (Sig_module (i, pr, m, Trec_not, Exported))
     | Env_modtype (_, i, m) -> Some (Sig_modtype (i, m, Exported))
@@ -141,7 +141,7 @@ let dump_browse node =
   `List (append Env.empty node [])
 
 let annotate_tail_calls (ts : Mbrowse.t) :
-    (Env.t * Browse_raw.node * Query_protocol.is_tail_position) list =
+  (Env.t * Browse_raw.node * Query_protocol.is_tail_position) list =
   let is_one_of candidates node = List.mem node ~set:candidates in
   let find_entry_points candidates (env, node) =
     (Tail_analysis.entry_points node, (env, node, is_one_of candidates node))
@@ -155,9 +155,9 @@ let annotate_tail_calls (ts : Mbrowse.t) :
   let _, tail_positions = List.fold_n_map entry_points ~f:propagate ~init:[] in
   List.map
     ~f:(fun (env, node, tail) ->
-      ( env,
-        node,
-        if not tail then `No
-        else if Tail_analysis.is_call node then `Tail_call
-        else `Tail_position ))
+        ( env,
+          node,
+          if not tail then `No
+          else if Tail_analysis.is_call node then `Tail_call
+          else `Tail_position ))
     tail_positions