Repository navigation
Conversation
…-short-paths * origin/ocaml-54-ast: (26 commits) Revert broken vendored source refresh wip Fix copy_files: exclude format_doc.ml and mocaml.ml from promotion Revert cosmetic changes in mocaml.ml, keep functional changes only Revert cosmetic changes in mconfig.mli, keep new fields only Revert extend_helper.ml parenthesization changes Revert remaining formatting-only changes Revert formatting-only changes in utils/ and kernel/ Revert formatting in extend/, keep only functional changes Revert formatting-only changes in vendored files Fix parser.ml/mli: replace Ocaml_common.Longident.t with Longident.t Fix OCaml 4.14 compat: Longident, Utf8_lexeme, Builtin_attributes Fix Longident type for 4.14: remove Ocaml_common qualification Fix 4.14 compat: Format.utf_8_scalar_width and Path.Map.of_list Fix OCaml 4.14 compatibility in vendored files Bump ppxlib requirement to >= 0.37.0 for Ast_504 Update test expectations for 504 error messages Update merlin kernel, extend, and utils for 504 Update merlin preprocess with JSX for OCaml 5.4 Update vendored merlin OCaml files to 504 ...
andreypopp
reviewed
Sep 15, 2026
Member
Author
|
Included in #44 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Summary
OCaml 5.5 removed special handling that assumed local abstract types were distinct. The private type definitions let the compiler prove that the
BasisandEnvconstructors cannot share an index. This follows the upstream Merlin fix in ocaml/merlin@9310954.Testing
OCAMLPARAM='_,warn-error=+8' dune build -p ocamlmerlin-mlx -j 1 @installdune build -p ocamlmerlin-mlx -j 1 @installThis PR is based on #29.
Fixes #31.