Release merlin (4.2-411/412 and 3.5.0) and dot-merlin-reader (3.5.0)

[voodoos]

Project page: https://github.com/ocaml/merlin

CHANGES

v4.2-41X:

• merlin binary
  • external configuration reading:
    • use relative paths to communicate with Dune when possible. This solves
      issues related to symlinks on Unix and improve Windows support (omd 0.6.2 + 0.6.3 (bug fixes) + mpp 0.1.2 (feature fix) #1271,
      fixes merlin does not work (4.1-412 / dune 2.8.2): "Path is not in dune workspace" merlin#1288)
    • make the workdir configuration value when using the
      dune ocaml-merlin configuration provider the same as when using
      dot-merlin-reader so that ppxes behaves in the same way as before
      (Upgrade Dlist to 0.1.0 #1284, fixes interop between dune and merlin since 2.8 does not work with ppx_expect dune#4479, discussion in nanomsg #1292)
  • destruct:
    • improve prefixing of generated constructors in Destruct by filtering
      opened modules (fix package qcheck-0.2 (build files were packaged in old archive) #1277)
    • make the destruct command more resilient to ill-typed expressions and
      when called without nodes (Triage run on Ubuntu/4.01/x86_64 with depexts #1304, fixes Assertion failure when calling destruct inside a pattern merlin#1300)
  • reintroduce some record recovery and improve completion (Ctypes 0.2. #1276)
  • introduce a new AST node for holes (_), allow correct typing of these
    holes and add a new holes command that returns the locations of all
    holes in the current file along with their types (Add piqi-0.6.5 #1242, ctypes 0.2.1 #1289)
  • Mppx: don't restore cookies after invocation. Ppx are invoked only once
    so there is no need to manage cookies. This small change should increase
    performance and should not change any other behavior (omd 0.7.1 #1309)
  • Windows: system command variant: do not open a window console when
    launching a ppx (Upgrade batsh to version 0.0.5. #1270, fixes Merlin process opens short-lived cmd windows on Windows Emacs merlin#714)
  • fix same file documentation bug (Omake mode 1.1. #1265 by @ulugbekna, fixes Documentation missing for references to things defined in the same file merlin#1261)
• editor modes
  • vim: Add MerlinNextHole and MerlinPreviousHole commands to navigate
    between holes. Jump to the first hole after destruct (opam-lib.1.1.0 #1287, debian wheezy and curl #1303)
  • emacs: Add merlin-next-hole and merlin-previous-hole commands to
    navigate holes. Jump to the first hole after calling destruct. (notify package maintainer on new issues of maintained package #1291)
  • emacs: modernization of the elisp code and conformance with coding
    guidelines (Added new library: exenum. #1247, omd 0.7.2 (bug fixes) #1310 by Steve Purcell )
  • vim & emacs : new client-side "merlin use package" commands, restoring
    previous behavior (CSV 1.3.2 #1272, fixes "unknown flag '-package'" when running "merlin-use" since 3.3.7 merlin#1191)
• test suite
  • cover constructor disambiguation and record fields (Ctypes 0.2. #1276)
  • cover the new holes command and AST node (Add piqi-0.6.5 #1242, ctypes 0.2.1 #1289)
  • cover the document fix (Omake mode 1.1. #1265, omd.0.7.3 (bug fix for h1..h6 when using option -m) #1315)

v3.5.0:

Tue Apr 12 11:44:22 AM CET 2021

• merlin binary
  • external configuration reading:
    • use relative paths to communicate with Dune when possible. This solves
      issues related to symlinks on Unix and improve Windows support (omd 0.6.2 + 0.6.3 (bug fixes) + mpp 0.1.2 (feature fix) #1271,
      fixes re2 109.45.01 #1288)
    • make the workdir configuration value when using the
      dune ocaml-merlin configuration provider the same as when using
      dot-merlin-reader so that ppxes behaves in the same way as before
      (Upgrade Dlist to 0.1.0 #1284, fixes interop between dune and merlin since 2.8 does not work with ppx_expect dune#4479, discussion in nanomsg #1292)
  • destruct: make the destruct command more resilient to ill-typed
    expressions and when called without nodes (Triage run on Ubuntu/4.01/x86_64 with depexts #1304, fixes add opam package for pfff, just the parsing libraries #1300)
  • Mppx: don't restore cookies after invocation. Ppx are invoked only once
    so there is no need to manage cookies. This small change should increase
    performance and should not change any other behavior (omd 0.7.1 #1309)
  • windows:
    • system command variant: do not open a window console when
      launching a ppx (Upgrade batsh to version 0.0.5. #1270, fixes core 109.23.00-rc1 #714)
    • fix Emacs hanging when starting Merlin (Patch readline to make omake compile on OSX #1263)
    • fix path canonicalization (Omake patch for Ubuntu which requires linker flags after source files. #1254)
  • fix same file documentation bug (Omake mode 1.1. #1265 by @ulugbekna, fixes nit 0.6 #1261)
• editor modes
  • emacs:
    • modernization of the elisp code and conformance with coding
      guidelines (Added new library: exenum. #1247, omd 0.7.2 (bug fixes) #1310 by Steve Purcell )
    • use opam var where applicable (omd 0.7.2 (bug fixes) #1310)
    • fix "wrong number of argument" (Omake patch for Ubuntu which requires linker flags after source files. #1250 by @atharvashukla, fixes issue with why.2.33 configure's patches #1234)
    • fix for Neovim's CursorMoved semantics (Upgrade batsh to 0.0.2. #1213 by @ddickstein)
  • vim & emacs : new client-side "merlin use package" commands, restoring
    previous behavior (CSV 1.3.2 #1272, fixes Updated Lacaml #1191)
• test suite
  • cover the document fix (Omake mode 1.1. #1265, omd.0.7.3 (bug fix for h1..h6 when using option -m) #1315)

[voodoos]

Expected CI failures:

• For 3.5.0 only OCamlCI-4.02 should fail, all other tests should pass all the time.
  (we did not find a solution to prevent OCI from installing test deps and running tests on 4.02 only.)

• For 4.2-41X the random failures on tests typer-cache, file-cache and warnings-backtrack are still an issue (but should be fixed with Dune 2.9)

[mseri]

Are the tests failures in the extras build related to the sandbox? (See https://opam.ci.ocaml.org/github/ocaml/opam-repository/commit/22e8ac056690645795d582ae4497a8acf54c112d)

[mseri]

The license field is missing. I have added MIT, which seems the one used in the repo. Can you double-check that this is correct, and upstream this change?

[voodoos]

Are the tests failures in the extras build related to the sandbox? (See https://opam.ci.ocaml.org/github/ocaml/opam-repository/commit/22e8ac056690645795d582ae4497a8acf54c112d)

I believe so, these tests are a bit fragile and I will rework them. I think they should not block the release.
What is exactly the difference between the extra jobs and the other ones ? I did not succeed in reproducing the failure on my machine: I have an unrelated error when copy/pasting the docker rules. Is there another way to reproduce these ?

The license field is missing. I have added MIT, which seems the one used in the repo. Can you double-check that this is correct, and upstream this change?

Will do, along with the other changes.

[voodoos]

Running:
~/.opam/opam-init/hooks/sandbox.sh build dune runtest -p merlin,dot-merlin-reader

Pass on my setup...

[voodoos]

I was able to reproduce with:
opam remove -y merlin && opam install -vyt merlin

[mseri]

Super, thanks! The failure on alpine is independent of this PR, so you can ignore it there. I am glad you could reproduce it locally, I agree that they should not make a difference.

I don't know if extra manual testing on BSD is needed in this case, so I wait for @kit-ty-kate and if it's not (or it's done), she will merge

[camelus]

Commit: 895cfa7

@voodoos has posted 14 contributions.

☀️ All lint checks passed 895cfa7

• These packages passed lint tests: dot-merlin-reader.3.5.0, merlin.3.5.0, merlin.4.2-411, merlin.4.2-412

---

☀️ Installability check (+4)

• new installable packages (4): dot-merlin-reader.3.5.0 merlin.3.5.0 merlin.4.2-411 merlin.4.2-412

[kit-ty-kate]

Thanks a lot!