Skip to content

Fix 1113#1858

Merged
voodoos merged 5 commits into
ocaml:mainfrom
xvw:fix-1113
Oct 24, 2024
Merged

Fix 1113#1858
voodoos merged 5 commits into
ocaml:mainfrom
xvw:fix-1113

Conversation

@xvw
Copy link
Copy Markdown
Collaborator

@xvw xvw commented Oct 24, 2024

The patch

@xvw xvw force-pushed the fix-1113 branch 2 times, most recently from 9191b8b to ba26490 Compare October 24, 2024 12:37
Copy link
Copy Markdown
Collaborator

@voodoos voodoos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the quick fix Xavier.

@voodoos voodoos merged commit a36f42a into ocaml:main Oct 24, 2024
@xvw xvw deleted the fix-1113 branch October 24, 2024 13:01
voodoos added a commit to voodoos/merlin that referenced this pull request Nov 26, 2024
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 exception in polarity search (ocaml/merlin#1858 fixes ocaml/merlin#1113)
    - Fix type-enclosing results instability. This reverts some overly
      aggressive deduplication that should be done on the client side. (ocaml/merlin#1864)
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 exception in polarity search (ocaml/merlin#1858 fixes ocaml/merlin#1113)
    - Fix type-enclosing results instability. This reverts some overly
      aggressive deduplication that should be done on the client side. (ocaml/merlin#1864)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: 4.18-414
Status: Ready for backporting

Development

Successfully merging this pull request may close these issues.

2 participants