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.
In ocaml-flambda, we've added a new constructor to
Typedtree.expression_desc
namedTexp_hole
: https://github.com/ocaml-flambda/flambda-backend/pull/3310/files#diff-ed47e32f450beb29b2f22ff8073a5592865c82845687a224124858a6b6060fc3R504. This unfortunately conflicts with theTexp_hole
constructor that Merlin adds to the same type in order to represent typed holes. To solve this, we are renaming what was Merlin'sTexp_hole
toTexp_typed_hole
. For consistency, we are also renamingTmod_hole
toTmod_typed_hole
, even though there is noTmod_hole
in the compiler. This PR includes the same renames in order to minimize the diff with merlin-jst.