Skip to content
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

Fix issue with jump to "fun" after upgrade to 5.2 #1863

Merged
merged 3 commits into from
Nov 21, 2024

Conversation

voodoos
Copy link
Collaborator

@voodoos voodoos commented Oct 31, 2024

Changes in the representation of functions in the Typedtree broke invariants in the jump-to-fun features.

voodoos added a commit to voodoos/merlin that referenced this pull request Oct 31, 2024
@voodoos voodoos linked an issue Oct 31, 2024 that may be closed by this pull request
@voodoos voodoos merged commit 300686c into ocaml:main Nov 21, 2024
4 checks passed
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 26, 2024
CHANGES:

Tue Nov 26 17:30:42 CET 2024

  + merlin binary
    - Respect the `EXCLUDE_QUERY_DIR` configuration directive when looking for cmt
      files (ocaml/merlin#1854)
    - Fix occurrences bug in which relative paths in index files are resolved against the
      PWD rather than the SOURCE_ROOT (ocaml/merlin#1855)
    - Fix exception in polarity search (ocaml/merlin#1858 fixes ocaml/merlin#1113)
    - Fix jump to `fun` targets not working (ocaml/merlin#1863, fixes ocaml/merlin#1862)
    - Fix type-enclosing results instability. This reverts some overly
      aggressive deduplication that should be done on the client side. (ocaml/merlin#1864)
    - Fix occurrences not working when the definition comes from a hidden source
      file (ocaml/merlin#1865)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 26, 2024
CHANGES:

Tue Nov 26 17:30:42 CET 2024

  + merlin binary
    - Respect the `EXCLUDE_QUERY_DIR` configuration directive when looking for cmt
      files (ocaml/merlin#1854)
    - Fix occurrences bug in which relative paths in index files are resolved against the
      PWD rather than the SOURCE_ROOT (ocaml/merlin#1855)
    - Fix exception in polarity search (ocaml/merlin#1858 fixes ocaml/merlin#1113)
    - Fix jump to `fun` targets not working (ocaml/merlin#1863, fixes ocaml/merlin#1862)
    - Fix type-enclosing results instability. This reverts some overly
      aggressive deduplication that should be done on the client side. (ocaml/merlin#1864)
    - Fix occurrences not working when the definition comes from a hidden source
      file (ocaml/merlin#1865)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merlin jump crashes
2 participants