Update 4.14 branch with master #1574
Open
+610
−213
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davesnx
changed the title
* Update Yojson constraint * Make jsonrpc compatible with both Yojson 2 and 3. This patch has a drawback: now jsonrpc also depends on yojson. --------- Co-authored-by: Ulysse Gérard <[email protected]>
* Reproduce issue ocaml#1552 * Add missing Pexp_send case in hover filtering Fixes ocaml#1552 Now object method types are correctly shown * Add changelog entry
* Avoid NeoVim error when opening .mll files Opening a .mll file results in: `ocamllsp: -32600: unsuppported file extension` Signed-off-by: Edwin Török <[email protected]> * Add Changes entry Signed-off-by: Edwin Török <[email protected]> --------- Signed-off-by: Edwin Török <[email protected]>
* Add a setting to enable CodeLens only for toplevel let binding. * Add tests. * Use JSON to compare code lens test output. * Take Xavier's comments into account. * Fix config infos. * Better definition of option semantics. * Update changes.md.
* Improve precision of metrics timestamp. * Add change entry. --------- Co-authored-by: Ulysse <[email protected]>
* setup doesn't work, time to push * run ci * Enable ocamlformat * Keep ci as before * Resolve doubt about get_impl_intf_counterparts * Add mlx as exts_to_switch_to * Kind ensures --impl is passed to ocamlformat-mlx * Reorder get_impl_intf_counterparts * Enable mlx as interference * Ensure ocamlformat-mlx has --impl for mlx * Enable code_actions for mlx * Pass impl first * Support mlx for merlin diagnostics * Add changelog entry * Move mlx's changelog entry into unreleased
- Restore local Typed_hole module with can_be_hole and is_a_hole functions (merlin-lib 4.18 doesn't have Merlin_analysis.Typed_hole) - Remove hint_function_params from Inlay_hints (not available in 4.18) - Use 5-argument form of Query_protocol.Inlay_hints
…ocaml#1563) * More natural fallback on .merlin files when no dune-project is found. Implements the behaviour described in issue ocaml#1522, fixes ocaml#1522 * Add changelog entry for ocaml#1563 * Update CI after 5.4 release * fmt
Collaborator
|
Thanks a lot @davesnx ! Just a quick note: the latest merlin lib for 4.14 is 4.19-414, not 4.18 :-) Also you probably want to revert the CI workflow changes. |
<!-- ps-id: eb2c14ee-02d9-45df-a29a-3d85fca1759b --> Signed-off-by: Rudi Grinberg <[email protected]>
<!-- ps-id: b6e8b645-d9e0-4e56-bd51-78e6a26e8488 --> Signed-off-by: Rudi Grinberg <[email protected]>
<!-- ps-id: 8cf5536e-698b-4c53-90ce-114d68a8f87a --> Signed-off-by: Rudi Grinberg <[email protected]>
Contributor
Author
|
Totally @voodoos |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR brings additional features from master to work with OCaml 4.14, building on top of the 414-LTS-upgrade PR #1536.
Cherry-picked commits (on top of 414-LTS)
df3a9a82#1534 Yojson 3 compatf71ba500#1553 Fix hover on method calls3226c927#1567 Make code-lens for toplevel let binding configurabledb3c0ea5#1565 Improve precision of duration field in view-metricsd73c8f95#1568 Rename parameter used to configure nested bindings5f4308f2#1528 Add ocamlformat-mlx and most OCaml features for .mlx8fb19aca#1563 More natural fallback on .merlin files when no dune-project is found.19a5c2dc#1400 refactor: get rid of stdune from code generatore8d57f6b#1404 refactor: remove [Stdune.Io]6d5aaa92#1480 refactor: remove uses of [Stdune.List]Merlin-lib 4.18 compatibility fix
The final commit (
976749cd) fixes compatibility with merlin-lib 4.18:Typed_holemodule withcan_be_holeandis_a_holefunctions (merlin-lib 4.18 doesn't haveMerlin_analysis.Typed_hole)hint_function_paramsfromInlay_hints(6th argument not available in merlin-lib 4.18)Query_protocol.Inlay_hints