Repository navigation
Rename Texp_hole and Tmod_hole - #1888
Merged
Merged
Conversation
Contributor
Author
|
I see that the ocaml-lsp compatibility check is failing. Does that block merging this PR? If so, how would I atomically make this change to both repos? |
Collaborator
What we usually do is open a PR on both side and update the CIs to match the other-side branche. Then we merge both when they are ready. We try to progressively move all Typedtree usage to In that case, I think the best way forward would be to use that PR to move the |
Contributor
Author
|
voodoos
approved these changes
Jan 31, 2025
voodoos
left a comment
voodoos
left a comment
Collaborator
There was a problem hiding this comment.
Thanks Liam, looks good to me
voodoos
added a commit
to voodoos/merlin
that referenced
this pull request
Jun 10, 2025
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jun 23, 2025
CHANGES:
Mon Jun 23 10:10:42 CEST 2024
+ merlin library
- Expose utilities to manipulate typed-holes in `Merlin_analysis.Typed_hole`
(ocaml/merlin#1888)
- `inlay-hints` fix inlay hints on function parameters (ocaml/merlin#1923)
- Handle class type in outline (ocaml/merlin#1932)
- Handle locally defined value in outline (ocaml/merlin#1936)
+ vim plugin
- Added support for search-by-type (ocaml/merlin#1846)
This is exposed through the existing `:MerlinSearch` command, that
switches between search-by-type and polarity search depending on the
first character of the query.
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jun 24, 2025
CHANGES:
Tue Jun 24 16:10:42 CEST 2025
+ merlin library
- Expose utilities to manipulate typed-holes in `Merlin_analysis.Typed_hole`
(ocaml/merlin#1888)
- `locate` can now disambiguate between files with identical names and contents
(ocaml/merlin#1882)
- `occurrences` now reports stale files (ocaml/merlin#1885)
- `inlay-hints` fix inlay hints on function parameters (ocaml/merlin#1923)
- Fix issues with ident validation and Lid comparison for occurrences (ocaml/merlin#1924)
- Handle class type in outline (ocaml/merlin#1932)
- Handle locally defined value in outline (ocaml/merlin#1936)
- Fix a typer issue triggering assertions in the short-paths graph (ocaml/merlin#1935,
fixes ocaml/merlin#1913)
- Downstreamed a typer fix from 5.3.X that would trigger assertions linked
to scopes bit masks when backtracking the typer cache (ocaml/merlin#1935)
- Add a new selection field to outline results that contains the location of
the symbol itself. (ocaml/merlin#1942)
- Fix destruct hanging when printing patterns with (::). (ocaml/merlin#1944, fixes
ocaml/ocaml-lsp#1489)
- Reproduce and fix a handful of jump-to-definition (locate) issues (ocaml/merlin#1930,
fixes ocaml/merlin#1580 and ocaml/merlin#1588, workaround for ocaml/merlin#1934)
+ ocaml-index
- Improve the granularity of index reading by segmenting the marshalization
of the involved data-structures. (ocaml/merlin#1889)
+ test suite
- Add a test case illustrating wrong open order proposed in issue ocaml/merlin#1900. (ocaml/merlin#1901)
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.
In ocaml-flambda, we've added a new constructor to
Typedtree.expression_descnamedTexp_hole: https://github.com/ocaml-flambda/flambda-backend/pull/3310/files#diff-ed47e32f450beb29b2f22ff8073a5592865c82845687a224124858a6b6060fc3R504. This unfortunately conflicts with theTexp_holeconstructor that Merlin adds to the same type in order to represent typed holes. To solve this, we are renaming what was Merlin'sTexp_holetoTexp_typed_hole. For consistency, we are also renamingTmod_holetoTmod_typed_hole, even though there is noTmod_holein the compiler. This PR includes the same renames in order to minimize the diff with merlin-jst.