-
Notifications
You must be signed in to change notification settings - Fork 233
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Correctly traverse patterns when looking for docs in the typedtree #1572
Merged
voodoos
merged 4 commits into
ocaml:master
from
voodoos:iter-on-whole-pattern-to-find-uids
Feb 24, 2023
Merged
Correctly traverse patterns when looking for docs in the typedtree #1572
voodoos
merged 4 commits into
ocaml:master
from
voodoos:iter-on-whole-pattern-to-find-uids
Feb 24, 2023
Conversation
This file contains 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
voodoos
added a commit
to voodoos/merlin
that referenced
this pull request
Feb 24, 2023
from voodoos/iter-on-whole-pattern-to-find-uids
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Feb 24, 2023
CHANGES: Fri Feb 24 16:55:42 CEST 2023 + merlin binary - Recognize OCaml 5.0 cmi magic number in compiler version mismatch message (ocaml/merlin#1554, fixes ocaml/merlin#1553) - Upgrade Merlin from the RC2 to the stable 5.0.0 compiler release (ocaml/merlin#1559, fixes ocaml/merlin#1558) - Improve type-enclosing behaviour when used on records' labels (ocaml/merlin#1565, fixes ocaml/merlin#1564) - Restore compatibility with the compiler's command line by accepting the `-safe-string` flag as a no-op instead of rejecting it (ocaml/merlin#1544, fixes ocaml/merlin#1518) - Traverse aliases when jumping to declaration. This matches jump-to-definition's behavior (ocaml/merlin#1563) - Improve locate's behavior in various ill-typed expressions (ocaml/merlin#1546, fixes ocaml/merlin#1567 and partially ocaml/merlin#1543) - Correctly traverse patterns when looking for docs in the typedtree (ocaml/merlin#1572) - Get documentation when the declaration or definition is selected (ocaml/merlin#1542, fixes ocaml/merlin#1540) - On Windows, change to a harmless directory when launching server to avoid locking down current directory (ocaml/merlin#1569, fixes ocaml/merlin#1474) + editor modes - emacs: Fix misuse of `eq` comparison (ocaml/merlin#1549, @mattiase) - emacs: xref works from context menus; better highlighting of xref matches; xref recognises operators and binding operators at the cursor position; bad locations are filtered out (ocaml/merlin#1385, fixes ocaml/merlin#1410, @mattiase) + test suite - Add a test for incorrect alert defaults (ocaml/merlin#1559) - Add multiple tests for locate over ill-typed expressions (ocaml/merlin#1546) - Add non-regression tests for other fixes in this release
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Feb 24, 2023
CHANGES: Fri Feb 24 16:55:42 CEST 2023 + merlin binary - Update internal typer to match OCaml 4.14.1 release (ocaml/merlin#1557) - Improve type-enclosing behaviour when used on records' labels (ocaml/merlin#1565, fixes ocaml/merlin#1564) - Restore compatibility with some OCaml compiler's debug flags that were incorrectly rejected by Merlin (ocaml/merlin#1556) - Traverse aliases when jumping to declaration. This matches jump-to-definition's behavior (ocaml/merlin#1563) - Improve locate's behavior in various ill-typed expressions (ocaml/merlin#1546, fixes ocaml/merlin#1567 and partially ocaml/merlin#1543) - Correctly traverse patterns when looking for docs in the typedtree (ocaml/merlin#1572) - Get documentation when the declaration or definition is selected (ocaml/merlin#1542, fixes ocaml/merlin#1540) - On Windows, change to a harmless directory when launching server to avoid locking down current directory (ocaml/merlin#1569, fixes ocaml/merlin#1474) + test suite - Add multiple tests for locate over ill-typed expressions (ocaml/merlin#1546) - Add non-regression tests for other fixes in this release
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Feb 24, 2023
CHANGES: Fri Feb 24 16:55:42 CEST 2023 + merlin binary - Recognize OCaml 5.0 cmi magic number in compiler version mismatch message (ocaml/merlin#1554, fixes ocaml/merlin#1553) - Upgrade Merlin from the RC2 to the stable 5.0.0 compiler release (ocaml/merlin#1559, fixes ocaml/merlin#1558) - Improve type-enclosing behaviour when used on records' labels (ocaml/merlin#1565, fixes ocaml/merlin#1564) - Restore compatibility with the compiler's command line by accepting the `-safe-string` flag as a no-op instead of rejecting it (ocaml/merlin#1544, fixes ocaml/merlin#1518) - Traverse aliases when jumping to declaration. This matches jump-to-definition's behavior (ocaml/merlin#1563) - Improve locate's behavior in various ill-typed expressions (ocaml/merlin#1546, fixes ocaml/merlin#1567 and partially ocaml/merlin#1543) - Correctly traverse patterns when looking for docs in the typedtree (ocaml/merlin#1572) - Get documentation when the declaration or definition is selected (ocaml/merlin#1542, fixes ocaml/merlin#1540) - On Windows, change to a harmless directory when launching server to avoid locking down current directory (ocaml/merlin#1569, fixes ocaml/merlin#1474) + editor modes - emacs: Fix misuse of `eq` comparison (ocaml/merlin#1549, @mattiase) - emacs: xref works from context menus; better highlighting of xref matches; xref recognises operators and binding operators at the cursor position; bad locations are filtered out (ocaml/merlin#1385, fixes ocaml/merlin#1410, @mattiase) + test suite - Add a test for incorrect alert defaults (ocaml/merlin#1559) - Add multiple tests for locate over ill-typed expressions (ocaml/merlin#1546) - Add non-regression tests for other fixes in this release
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Feb 24, 2023
CHANGES: Fri Feb 24 16:55:42 CEST 2023 + merlin binary - Update internal typer to match OCaml 4.14.1 release (ocaml/merlin#1557) - Improve type-enclosing behaviour when used on records' labels (ocaml/merlin#1565, fixes ocaml/merlin#1564) - Restore compatibility with some OCaml compiler's debug flags that were incorrectly rejected by Merlin (ocaml/merlin#1556) - Traverse aliases when jumping to declaration. This matches jump-to-definition's behavior (ocaml/merlin#1563) - Improve locate's behavior in various ill-typed expressions (ocaml/merlin#1546, fixes ocaml/merlin#1567 and partially ocaml/merlin#1543) - Correctly traverse patterns when looking for docs in the typedtree (ocaml/merlin#1572) - Get documentation when the declaration or definition is selected (ocaml/merlin#1542, fixes ocaml/merlin#1540) - On Windows, change to a harmless directory when launching server to avoid locking down current directory (ocaml/merlin#1569, fixes ocaml/merlin#1474) + test suite - Add multiple tests for locate over ill-typed expressions (ocaml/merlin#1546) - Add non-regression tests for other fixes in this release
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
cc @trefis
This are the two non-controversial commit extracted from #1562
They improve get_doc when looking for comments in another compilation unit: the previous Typedtree iterator was wrong and get_doc relied on the old "comment list" heuristic in some cases involving value bindings patterns.
It also include the refactoring.