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

Ignore hidden branches when listing occurrences #1677

Merged
merged 4 commits into from
Sep 21, 2023
Merged

Ignore hidden branches when listing occurrences #1677

merged 4 commits into from
Sep 21, 2023

Conversation

voodoos
Copy link
Collaborator

@voodoos voodoos commented Sep 20, 2023

Fixes unexpected behavior described in #1671

voodoos added a commit to voodoos/merlin that referenced this pull request Sep 20, 2023
@voodoos
Add changelog for ocaml#1677
af95b26
voodoos added a commit to voodoos/merlin that referenced this pull request Sep 21, 2023
@voodoos
Add changelog for ocaml#1677
14183c5
@voodoos voodoos force-pushed the issue1671-occurrences-hidden-nodes branch from af95b26 to 14183c5 Compare September 21, 2023 08:37
@voodoos voodoos force-pushed the issue1671-occurrences-hidden-nodes branch from 33c0109 to a385cbb Compare September 21, 2023 12:12
@voodoos voodoos merged commit 604f6ac into ocaml:master Sep 21, 2023
6 of 7 checks passed
voodoos added a commit to voodoos/merlin that referenced this pull request Sep 21, 2023
@voodoos
[B] Ignore hidden branches when listing occurrences (ocaml#1677)
597ee28 
from voodoos/issue1671-occurrences-hidden-nodes
voodoos added a commit to voodoos/opam-repository that referenced this pull request Sep 21, 2023
@voodoos
[new release] merlin, merlin-lib and dot-merlin-reader (4.11-414)
1f87f0d 
CHANGES:

Thu Sep 24 18:01:42 CEST 2023

  + merlin binary
    - Improve error messages for missing configuration reader (ocaml/merlin#1669)
    - Fix regression causing crash when using ppxes under Windows (ocaml/merlin#1673)
    - Fix confusion between aliased modules and module types (ocaml/merlin#1676,
      fixes ocaml/merlin#1667)
    - Ignore hidden branches when listing occurrences (ocaml/merlin#1677, fixes ocaml/merlin#1671)
  + editor modes
    - emacs: fix/improve keybindings (ocaml/merlin#1668, fixes ocaml/merlin#1386):
      Unbind <kbd>C-c C-r</kbd> (to avoid shadowing `tuareg-eval-region`)
      and bind <kbd>C-c C-v</kbd> instead to `merlin-error-check`;
      rebind <kbd>C-c C-d</kbd> to `merlin-document`
      and bind <kbd>C-c M-d</kbd> and <kbd>C-c |</kbd> instead to `merlin-destruct`;
      bind <kbd>C-u C-c C-t</kbd> to `merlin-type-expr`.
      See also <ocaml/merlin#1386 (comment)>
    - emacs: remove use of obsolete `defadvice` macro (ocaml/merlin#1675)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Sep 21, 2023
@voodoos
[new release] merlin, merlin-lib and dot-merlin-reader (4.11-500)
0093171 
CHANGES:

Thu Sep 24 18:01:42 CEST 2023

  + merlin binary
    - Improve error messages for missing configuration reader (ocaml/merlin#1669)
    - Fix regression causing crash when using ppxes under Windows (ocaml/merlin#1673)
    - Fix confusion between aliased modules and module types (ocaml/merlin#1676,
      fixes ocaml/merlin#1667)
    - Ignore hidden branches when listing occurrences (ocaml/merlin#1677, fixes ocaml/merlin#1671)
  + editor modes
    - emacs: fix/improve keybindings (ocaml/merlin#1668, fixes ocaml/merlin#1386):
      Unbind <kbd>C-c C-r</kbd> (to avoid shadowing `tuareg-eval-region`)
      and bind <kbd>C-c C-v</kbd> instead to `merlin-error-check`;
      rebind <kbd>C-c C-d</kbd> to `merlin-document`
      and bind <kbd>C-c M-d</kbd> and <kbd>C-c |</kbd> instead to `merlin-destruct`;
      bind <kbd>C-u C-c C-t</kbd> to `merlin-type-expr`.
      See also <ocaml/merlin#1386 (comment)>
    - emacs: remove use of obsolete `defadvice` macro (ocaml/merlin#1675)
@voodoos voodoos mentioned this pull request Sep 21, 2023
Closed
voodoos added a commit to voodoos/opam-repository that referenced this pull request Sep 21, 2023
@voodoos
[new release] merlin, merlin-lib and dot-merlin-reader (4.11-501)
a3c4615 
CHANGES:

Thu Sep 24 18:01:42 CEST 2023

  + merlin binary
    - Add support for OCaml 5.1
    - Improve error messages for missing configuration reader (ocaml/merlin#1669)
    - Fix regression causing crash when using ppxes under Windows (ocaml/merlin#1673)
    - Fix confusion between aliased modules and module types (ocaml/merlin#1676,
      fixes ocaml/merlin#1667)
    - Ignore hidden branches when listing occurrences (ocaml/merlin#1677, fixes ocaml/merlin#1671)
  + editor modes
    - emacs: fix/improve keybindings (ocaml/merlin#1668, fixes ocaml/merlin#1386):
      Unbind <kbd>C-c C-r</kbd> (to avoid shadowing `tuareg-eval-region`)
      and bind <kbd>C-c C-v</kbd> instead to `merlin-error-check`;
      rebind <kbd>C-c C-d</kbd> to `merlin-document`
      and bind <kbd>C-c M-d</kbd> and <kbd>C-c |</kbd> instead to `merlin-destruct`;
      bind <kbd>C-u C-c C-t</kbd> to `merlin-type-expr`.
      See also <ocaml/merlin#1386 (comment)>
    - emacs: remove use of obsolete `defadvice` macro (ocaml/merlin#1675)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Sep 21, 2023
@voodoos
[new release] merlin, merlin-lib (4.11-414/500/501)
ec4603f 
CHANGES:

Thu Sep 24 18:01:42 CEST 2023

  + merlin binary
    - Improve error messages for missing configuration reader (ocaml/merlin#1669)
    - Fix regression causing crash when using ppxes under Windows (ocaml/merlin#1673)
    - Fix confusion between aliased modules and module types (ocaml/merlin#1676,
      fixes ocaml/merlin#1667)
    - Ignore hidden branches when listing occurrences (ocaml/merlin#1677, fixes ocaml/merlin#1671)
  + editor modes
    - emacs: fix/improve keybindings (ocaml/merlin#1668, fixes ocaml/merlin#1386):
      Unbind <kbd>C-c C-r</kbd> (to avoid shadowing `tuareg-eval-region`)
      and bind <kbd>C-c C-v</kbd> instead to `merlin-error-check`;
      rebind <kbd>C-c C-d</kbd> to `merlin-document`
      and bind <kbd>C-c M-d</kbd> and <kbd>C-c |</kbd> instead to `merlin-destruct`;
      bind <kbd>C-u C-c C-t</kbd> to `merlin-type-expr`.
      See also <ocaml/merlin#1386 (comment)>
    - emacs: remove use of obsolete `defadvice` macro (ocaml/merlin#1675)
@voodoos voodoos mentioned this pull request Sep 21, 2023
Merged
nberth pushed a commit to nberth/opam-repository that referenced this pull request Jun 18, 2024
@voodoos @nberth
[new release] merlin, merlin-lib (4.11-414/500/501)
74897b5 
CHANGES:

Thu Sep 24 18:01:42 CEST 2023

  + merlin binary
    - Improve error messages for missing configuration reader (ocaml/merlin#1669)
    - Fix regression causing crash when using ppxes under Windows (ocaml/merlin#1673)
    - Fix confusion between aliased modules and module types (ocaml/merlin#1676,
      fixes ocaml/merlin#1667)
    - Ignore hidden branches when listing occurrences (ocaml/merlin#1677, fixes ocaml/merlin#1671)
  + editor modes
    - emacs: fix/improve keybindings (ocaml/merlin#1668, fixes ocaml/merlin#1386):
      Unbind <kbd>C-c C-r</kbd> (to avoid shadowing `tuareg-eval-region`)
      and bind <kbd>C-c C-v</kbd> instead to `merlin-error-check`;
      rebind <kbd>C-c C-d</kbd> to `merlin-document`
      and bind <kbd>C-c M-d</kbd> and <kbd>C-c |</kbd> instead to `merlin-destruct`;
      bind <kbd>C-u C-c C-t</kbd> to `merlin-type-expr`.
      See also <ocaml/merlin#1386 (comment)>
    - emacs: remove use of obsolete `defadvice` macro (ocaml/merlin#1675)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
Backport to 501
Status: 4.11-500
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@voodoos