Move branch master to 5.2 support #1757
Conversation
1470e1e9b13341893e68f404c5c798d0259bb564
from antalsz/unused-c-variables
And add an assertion that we can recognize our own magic number that we got compiled with. Fixes ocaml#1553 Signed-off-by: Edwin Török <edwin@etorok.net>
…eds parenthesis Doing that properly require compiler support for located longidents.
dfe59502ad2e115882296416afc4cfd814821572
Authored-by: Liam Stevenson <lstevenson@janestreet.com>
Authored-by: Liam Stevenson <lstevenson@janestreet.com>
|
@pitag-ha I am soon going to merge this PR that move the main branch to support OCaml 5.2. What should we do to fix the Fuzzy CI ? |
|
The Fuzzy CI needs to know the compiler version on the merge branch and on the base branch of the PR. That's the following two lines in the yml: https://github.com/ocaml/merlin/blob/master/.github/workflows/fuzzy-ci.yml#L46-L49 If we want the CI to create data for this PR, then we should set the merge branch compiler version to For the CI to work on future PRs (PRs coming after this one is merged), we need to set both merge branch compiler version and base branch compiler version to PD: Let's hope that the CI works just with those 1/2-liner changes I've mentioned 🤞 |
|
I'll will open a PR for remplacing Merlan tomorrow ! |
CHANGES:
Fri May 17 19:59:42 CET 2024
+ merlin binary
- Support for OCaml 5.2 (ocaml/merlin#1757)
- destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
- Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
fixes ocaml/merlin#1661)
- Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
- Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
- Improve cursor position detection in longidents (ocaml/merlin#1756)
- Addition of a `merlin-lib.commands` library which disassociates the
execution of commands from the `new_protocol`, from the binary, allowing
it to be invoked from other projects (ocaml/merlin#1758)
- New occurrences backend: Don't index occurrences when `merlin.hide`
attribute is present. (ocaml/merlin#1768)
- Use the new `uid_to_decl` table in 5.2's cmt files to get documentation.
(ocaml/merlin#1773)
We kept master on OCaml 4.14 for an unusually long time due to the experimental nature of OCaml 5.0.
Branch
502is the branch502-previewrebased onto master.Support for OCaml 4.14 will continue in it's own
414branch.