Merge branch 'main' into issue_1987

Author: Lucccyo

.github/workflows/emacs-lint.yml

@@ -29,6 +29,6 @@ jobs:
       with:
         version: ${{ matrix.emacs_version }}
 
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Run tests
       run: 'cd emacs && ./check.sh'

.github/workflows/fuzzy-ci-privileged.yml

@@ -21,7 +21,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Download instruction artifact
         env:
           GH_API_ACTIONS: https://api.github.com/repos/${{ github.repository }}/actions

.github/workflows/fuzzy-ci.yml

@@ -67,7 +67,7 @@ jobs:
         commit: ["merge_branch", "base_branch"]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -309,7 +309,7 @@ jobs:
       diff_dir: ${{ needs.artifact_names.outputs.diff_dir }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Download current diff(s)
         if: ${{ env.current_diff_exists == 'true' }}

.github/workflows/main.yml

@@ -52,7 +52,7 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Checkout tree
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
         uses: ocaml/setup-ocaml@v3

.github/workflows/nix.yml

@@ -27,11 +27,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         submodules: true
     - name: nix
-      uses: cachix/install-nix-action@v31.8.2
+      uses: cachix/install-nix-action@v31.8.4
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - run: nix develop -c dune build @check @runtest -p merlin-lib,dot-merlin-reader,ocaml-index,merlin

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

@@ -41,7 +41,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up OCaml ${{ matrix.ocaml-compiler }}
         uses: ocaml/setup-ocaml@v3

CHANGES.md

@@ -1,15 +1,25 @@
-unreleased
-==========
+merlin 5.6.1
+============
+Sat Dec 20 11:15:42 CET 2025
 
+  + merlin binary
+    - Fix a plethora of minor issues with the C code (#1998)
   + merlin library
+    - Signature help should not appear on the function name (#1997)
     - Fix completion not working for inlined records labels (#1978, fixes #1977)
     - Perform buffer indexing only if the query requires it (#1990 and #1991)
     - Stop unnecessarily forcing substitutions when initializing short-paths graph (#1988)
+    - Fix Mocaml.with_printer didn't update replacement_printer_doc (#2010)
   + test suite
     - Add a test to ensure the behavior showed in issue #1517 is no longer relevant (#1995)
     - Add a test to ensure the code fragment exhibited in issue #1118 no longer makes Merlin crash (#1996)
+    - Add a test case illustrating how a snippet produces two unrelated errors in issue #2000. (#2003)
+    - Add a test reproducing issue #1983 where `document` command which sometime concatenates consecutive variants and labels (#2005)
+    - Signature-help should trigger on unfinished `let ... in` bindings (#2009)
     - Add a test to reproduce [Locate command fails on multi-line type definitions](#1987)
 
+
+
 merlin 5.6
 ==========
 Sat Oct 04 15:10:42 CEST 2025

Makefile

@@ -26,3 +26,4 @@ bench:
 	jq . merl-an_bench/bench.json
 
 .PHONY: all build dev clean test promote bench bench
+.NOTPARALLEL:

src/frontend/ocamlmerlin/dune

@@ -14,28 +14,55 @@
   -open Merlin_analysis
   -open Merlin_kernel
   -open Merlin_commands)
- (modules (:standard \ gen_ccflags))
  (libraries merlin-lib.config yojson merlin-lib.analysis merlin-lib.kernel
             merlin-lib.utils merlin-lib.os_ipc merlin-lib.ocaml_parsing
             merlin-lib.query_protocol merlin-lib.query_commands
             merlin-lib.ocaml_typing merlin-lib.ocaml_utils
             merlin-lib.commands
             unix str))
 
-(executable
- (name      gen_ccflags)
- (modules   gen_ccflags)
- (libraries str))
+; Write one flag per line in the output file
+
+(rule
+ (enabled_if (= %{ocaml-config:ccomp_type} "cc"))
+ (action
+  (progn
+   (write-file ldlibs "")
+   (write-file outputexe "-o"))))
+
+(rule
+ (enabled_if (= %{ocaml-config:ccomp_type} "msvc"))
+ (action
+  (progn
+   (write-file ldlibs "advapi32.lib")
+   (write-file outputexe "-Fe"))))
+
+(rule
+ (enabled_if
+  (and
+   (= %{ocaml-config:ccomp_type} "cc")
+   (= %{profile} "dev")))
+ (action
+  (write-file cflags "-Wextra\n-Werror")))
+
+(rule
+ (enabled_if
+  (and
+   (= %{ocaml-config:ccomp_type} "msvc")
+   (= %{profile} "dev")))
+ (action
+  (write-file cflags "-WX")))
 
 (rule
- (targets pre-flags post-flags)
- (deps    gen_ccflags.exe)
- (action  (run %{deps} "%{ocaml-config:ccomp_type}" %{targets})))
+ (enabled_if
+  (<> %{profile} "dev"))
+ (action
+  (write-file cflags "")))
 
 (rule
- (targets ocamlmerlin.exe)
- (deps    (:c ocamlmerlin.c) pre-flags post-flags)
- (action  (run %{cc} "%{read-lines:pre-flags}%{targets}" %{c} %{read-lines:post-flags})))
+ (target ocamlmerlin.exe)
+ (deps   (:c ocamlmerlin.c))
+ (action (run %{cc} %{read-strings:cflags} %{read:outputexe}%{target} %{c} %{read-strings:ldlibs})))
 
 (install
  (package merlin)