wip: compatibility with merlin-lib 5.1-502

[voodoos]

Preliminary support for the 414-5.2~preview version of merlin-lib for ocaml 5.2.

@jfeser the changes in the representation of functions breaks the beta-reduction feature of the action-inline code action. It would be great if you could find some time to restore it before the final release (sometime in April I think).

[jfeser]

Dumb question, but how do I get the right version of merlin for building this PR? I've been using nix and I'm not very familiar with the opam pinning workflow.

[voodoos]

I cannot help you with the nix setup, but there is a preview version of Merlin released on opam that should work with that pr: 4.14-502~preview

[jfeser]

I've pushed some commits here: https://github.com/jfeser/ocaml-lsp/tree/merlin-update. The new version of beta reduction is more correct but less aggressive. It only reduces fully applied functions and does not attempt to reduce functions with labeled parameters.

[voodoos]

Thanks for taking the time @jfeser !
I will cherry-pick these commits to the update's branch.

[rgrinberg]

Dumb question, but how do I get the right version of merlin for building this PR? I've been using nix and I'm not very familiar with the opam pinning workflow.

I've added a flake input for merlin here #1264. So you can just set the branch/tag/commit in the flake.nix and then run nix develop.

[voodoos]

@rgrinberg what are your plans for 5.2 support ? (Merlin 5.0-502 with which that PR is compatible was just released.)

With the non-trivial typedtree changes in 5.2, the update breaks the multi-version support we managed to kept for some time.
Additionally, we cannot get any of the CI running without bumping ocamlformat since they all try to install it...

Should we aim at merging this PR (there is some work to do on the CI still) and then cut a release ?
Or do you prefer that I open a branch for 5.2 and release from that branch ?

[rgrinberg]

My plan was to wait for @awilliambauer to finish submitting his series of patches and make a release. So that we can achieve the following two goals:

1. Release all the new features to users of 4.14 and 5.1
2. Sync the fork of ocamllsp and upstream

Once that is done, we'd no longer need to care about preserving 5.1 (and below) compatibility in the master branch

[awilliambauer]

Just a heads up there will be some delay getting the rest of the patches submitted. It will be a little while before I have more time to look into the issue with #1290. We also have a patch to add more inlay hint configuration that involves changes to typedtree stuff that is different upstream, and it will take some work to port and test that.

[rgrinberg]

Okay, in that case I’ll just disable this feature while running the test suite. The implementation is obviously correct, so I would still like end users to benefit from this.

…

On May 28, 2024, at 3:14 PM, Aaron Bauer ***@***.***> wrote: Just a heads up there will be some delay getting the rest of the patches submitted. It will be a little while before I have more time to look into the issue with #1290 <#1290>. We also have a patch to add more inlay hint configuration that involves changes to typedtree stuff that is different upstream, and it will take some work to port and test that. — Reply to this email directly, view it on GitHub <#1233 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AABB56YWBSGPLHF447C7KR3ZETXU7AVCNFSM6AAAAABDWYQGIOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDCMZWGEZDGNZYGE>. You are receiving this because you were mentioned.

[voodoos]

@rgrinberg there is no ppx_expect.common library since 0.17.0 I updated the dune files in 2aee922.

[rgrinberg]

@rgrinberg there is no ppx_expect.common library since 0.17.0 I updated the dune files in 2aee922.

Can this be done in a separate PR?

[voodoos]

Can this be done in a separate PR?

Will do.

About the release plan, what I have in mind right now is:

• Wait for merlin-lib.4.16 to be released ([new release] merlin (3 packages) (4.16-414/501) opam-repository#26052)
• Merge Add a custom query for raw invocation of Merlin #1265
• Release ocaml-lsp for 4.14 / 5.1
• Release merlin-lib.5.1-502 and ocaml-index.1.0 with support for project-wide occurrences
• Cleanup this upgrade PR, add a post dependency on ocaml-index and merge it
• Release ocaml-lsp for 5.2 with project-wide occurrences search

[coveralls]

Pull Request Test Coverage Report for Build 4465

Details

• 30 of 60 (50.0%) changed or added relevant lines in 11 files are covered.
• 10 unchanged lines in 7 files lost coverage.
• Overall coverage decreased (-0.1%) to 21.587%

---

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
ocaml-lsp-server/src/code_actions/action_add_rec.ml	0	1	0.0%
ocaml-lsp-server/src/code_actions/action_mark_remove_unused.ml	1	2	50.0%
ocaml-lsp-server/src/document_symbol.ml	0	1	0.0%
ocaml-lsp-server/src/hover_req.ml	0	1	0.0%
ocaml-lsp-server/src/merlin_config.ml	2	3	66.67%
ocaml-lsp-server/src/rename.ml	0	1	0.0%
ocaml-lsp-server/src/workspace_symbol.ml	0	1	0.0%
ocaml-lsp-server/src/code_actions/action_inline.ml	23	26	88.46%
ocaml-lsp-server/src/semantic_highlighting.ml	3	11	27.27%
ocaml-lsp-server/src/ocaml_lsp_server.ml	0	12	0.0%

Files with Coverage Reduction	New Missed Lines	%
ocaml-lsp-server/src/ocaml_lsp_server.ml	1	36.56%
ocaml-lsp-server/src/code_actions/action_type_annotate.ml	1	87.8%
ocaml-lsp-server/src/merlin_config.ml	1	84.96%
ocaml-lsp-server/src/code_actions/action_remove_type_annotation.ml	1	89.19%
ocaml-lsp-server/src/semantic_highlighting.ml	2	51.92%
ocaml-lsp-server/src/hover_req.ml	2	43.23%
ocaml-lsp-server/src/inlay_hints.ml	2	76.06%

Totals
Change from base Build 4456:	-0.1%
Covered Lines:	5472
Relevant Lines:	25349

---

💛 - Coveralls