wip: compatibility with merlin-lib 5.1-502 #1233
Conversation
|
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 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 |
|
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. |
|
Thanks for taking the time @jfeser ! |
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 |
voodoos
force-pushed
the
5.2-preview
branch
2 times, most recently
from
f83462d
to
2525ad0
Compare
|
@rgrinberg what are your plans for 5.2 support ? (Merlin With the non-trivial typedtree changes in 5.2, the update breaks the multi-version support we managed to kept for some time. Should we aim at merging this PR (there is some work to do on the CI still) and then cut a release ? |
| let _ = | ||
| let f : int -> int = fun x -> x in | ||
| (0) |}] | ||
| [%expect {| |}] |
There was a problem hiding this comment.
cc @jfeser
It looks like this does not fit the description you made of the "less agressive" beta reduction:
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.
There was a problem hiding this comment.
Okay, let's leave a comment about why this is broken and move on. 5.1 support is more important than this corner case.
There was a problem hiding this comment.
Give me a chance to fix the nix compatibility before you merge though.
There was a problem hiding this comment.
Give me a chance to fix the nix compatibility before you merge though.
We have a working nix flake on merlin that might be of help: https://github.com/ocaml/merlin/blob/master/flake.nix
|
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:
Once that is done, we'd no longer need to care about preserving 5.1 (and below) compatibility in the master branch |
|
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. |
|
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
changed the title
|
@rgrinberg there is no |
voodoos
force-pushed
the
5.2-preview
branch
2 times, most recently
from
a644bff
to
e9ed7d2
Compare
Can this be done in a separate PR? |
Will do. About the release plan, what I have in mind right now is:
|
rgrinberg
force-pushed
the
5.2-preview
branch
2 times, most recently
from
ce036f2
to
3ac8ec6
Compare
Use merlin-lib config types and utilities Bump merlin-lib and ocaml-format versions
Note: function applications will only be eliminated when they are fully applied and none of the arguments are labeled.
This is due to Typedtree incompatibilities.
This reverts commit 9ee0aab.
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).