Add Other variant to locate-types command#2025
Merged
voodoos merged 5 commits intoocaml:mainfrom Jan 22, 2026
Merged
Conversation
xvw
approved these changes
Jan 22, 2026
Collaborator
There was a problem hiding this comment.
There are a few formatting relicat, but yes, the PR looks fine to me. I do have one question, though!
Are we sure we want to rebuild the original type, and if so, it seems to me that labelled arguments and labelled tuples (and probably object abbreviations) complicate the task?
Collaborator
|
I also think that the change probably deserves an entry in the changelog! |
Contributor
Author
Sorry I always manage to forget this. I've done so now. |
xvw
reviewed
Jan 22, 2026
xvw
approved these changes
Jan 22, 2026
voodoos
approved these changes
Jan 22, 2026
Collaborator
voodoos
left a comment
voodoos
left a comment
There was a problem hiding this comment.
Thanks, happy to merge after a few tweaks.
voodoos
approved these changes
Jan 22, 2026
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Feb 27, 2026
CHANGES:
+ merlin library
- Add "Other" variant to locate-types result (ocaml/merlin#2025)
- Don't include `option` in locate-types result for optional parameters (ocaml/merlin#2027)
- Fix record field autocompletion (ocaml/merlin#2028)
- Signature help should not loop over the parameters once it is finished (ocaml/merlin#2023)
+ tests
- Add a reproduction case for ocaml/merlin#1214, the issue has been resolved before (ocaml/merlin#2022)
- Add reproduction case for ocaml/merlin#1763 but it is not failing anymore (ocaml/merlin#2021)
- Add a test to reproduce [Locate command fails on multi-line type definitions](ocaml/merlin#1987) (ocaml/merlin#2020)
- Add a regression test for issue ocaml/merlin#2019 (ocaml/merlin#2030)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Apr 9, 2026
CHANGES:
Thu Apr 09 09:59:38 WAT 2026
+ merlin library
- Implement new refactor-extract-region command for extracting region to a fresh let binding (warning: this feature is still experimental) (ocaml/merlin#1948)
- Add "Other" variant to locate-types result (ocaml/merlin#2025)
- Don't include `option` in locate-types result for optional parameters (ocaml/merlin#2027)
- Fix record field autocompletion (ocaml/merlin#2028)
- Signature help should not loop over the parameters once it is finished (ocaml/merlin#2023)
- Fix bugs on signature help about labelled and optional parameters (ocaml/merlin#2032)
- Add `-end-position` parameter for `enclosing` (ocaml/merlin#2029)
- Signature help should appear even if the 'in' is not written (ocaml/merlin#2036)
- Improve type enclosing behavior on various class and object related items
(ocaml/merlin#2053)
+ merlin binary
- Define PATH_MAX to 4096 if undefined (eg. hurd) (ocaml/merlin#2039)
+ test suite
- Add a reproduction case for ocaml/merlin#1214, the issue has been resolved before (ocaml/merlin#2022)
- Add reproduction case for ocaml/merlin#1763 but it is not failing anymore (ocaml/merlin#2021)
- Add a test to reproduce [Locate command fails on multi-line type definitions](ocaml/merlin#1987) (ocaml/merlin#2020)
- Add a regression test for issue ocaml/merlin#2019 (ocaml/merlin#2030)
merlin 5.6.1
Sat Dec 20 11:15:42 CET 2025
+ merlin binary
- Fix a plethora of minor issues with the C code (ocaml/merlin#1998)
+ merlin library
- Signature help should not appear on the function name (ocaml/merlin#1997)
- Fix completion not working for inlined records labels (ocaml/merlin#1978, fixes ocaml/merlin#1977)
- Perform buffer indexing only if the query requires it (ocaml/merlin#1990 and ocaml/merlin#1991)
- Stop unnecessarily forcing substitutions when initializing short-paths graph (ocaml/merlin#1988)
- Fix Mocaml.with_printer didn't update replacement_printer_doc (ocaml/merlin#2010)
+ test suite
- Add a test to ensure the behavior showed in issue ocaml/merlin#1517 is no longer relevant (ocaml/merlin#1995)
- Add a test to ensure the code fragment exhibited in issue ocaml/merlin#1118 no longer makes Merlin crash (ocaml/merlin#1996)
- Add a test case illustrating how a snippet produces two unrelated errors in issue ocaml/merlin#2000. (ocaml/merlin#2003)
- Add a test reproducing issue ocaml/merlin#1983 where `document` command which sometime concatenates consecutive variants and labels (ocaml/merlin#2005)
- Signature-help should trigger on unfinished `let ... in` bindings (ocaml/merlin#2009)
merlin 5.6
Sat Oct 04 15:10:42 CEST 2025
+ merlin binary
- Add `locate-types` command (ocaml/merlin#1951)
+ merlin library
- Implement new refactor-extract-region command for extracting region to a fresh let binding (ocaml/merlin#1948)
- Fix `merlin_reader` for OpenBSD (ocaml/merlin#1956)
- Improve recovery of mutually recursive definitions (ocaml/merlin#1962, ocaml/merlin#1963, fixes ocaml/merlin#1953)
- Support for OCaml 5.4 (ocaml/merlin#1974)
+ vim plugin
- Fix error when `:MerlinOccurrencesProjectWide` fails to gather code previews (ocaml/merlin#1970)
+ test suite
- Add more short-paths tests cases (ocaml/merlin#1904)
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
3 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 extends the protocol for
locate-typesto include anOthervariant. This can enable editors to display certain types more nicely. For example, if the type is'a t -> 'a, the'as are included in the result. Although the user can't jump-to-definition on the'as, they are useful for recovering the original structure of the type.