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.

Sign up for GitHub

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

Jump to bottom

Fix 1113 #1858

Merged
merged 5 commits into from
Oct 24, 2024
Merged

Fix 1113 #1858

merged 5 commits into from
Oct 24, 2024

Conversation

xvw
Copy link
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
@xvw xvw mentioned this pull request Oct 24, 2024
Open
voodoos
voodoos approved these changes Oct 24, 2024
View reviewed changes
Copy link
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
4 checks passed
@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
[B] ocaml#1858 from xvw/fix-1113 Fix ocaml#1113
614add9
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 26, 2024
@voodoos
[new release] merlin (4 packages) (5.3-502)
252e0d4 
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
@voodoos
[new release] merlin (3 packages) (4.18-414)
5ab8f9b 
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
@voodoos
[new release] merlin (4 packages) (5.3-502)
d5de66f 
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
@voodoos
[new release] merlin (3 packages) (4.18-414)
71f7414 
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 voodoos mentioned this pull request Nov 26, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@voodoos voodoos voodoos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Backport to 414
Status: 4.18-414
Backport to 501
Status: Ready for backporting
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@xvw @voodoos