vim: remove references to MerlinPhrase #1804
Merged
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
MerlinPhrase calls an undefined function, vim_selectphrase, in the python code. This function was removed some years ago in change 8ebe7ff. Remove all references to MerlinPhrase in the help docs, keybindings and vim functions which call it.
voodoos
approved these changes
Jul 23, 2024
There was a problem hiding this comment.
The changes looks good to me. We should document the "new" commands at some point :-)
Thanks @paparodeo
|
Could you add a changelog entry ? |
paparodeo
added a commit
to paparodeo/merlin
that referenced
this pull request
Jul 25, 2024
paparodeo
force-pushed
the
vim-merlin-phrase
branch
from
28558f8
to
754f0e4
Compare
|
Thank you ! |
voodoos
added a commit
to voodoos/merlin
that referenced
this pull request
Sep 25, 2024
voodoos
added a commit
to voodoos/merlin
that referenced
this pull request
Sep 25, 2024
voodoos
added a commit
to voodoos/merlin
that referenced
this pull request
Sep 25, 2024
voodoos
added a commit
that referenced
this pull request
Sep 26, 2024
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Sep 26, 2024
CHANGES:
Thu Sep 26 18:48:42 CEST 2024
+ merlin binary
- A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
what to append to the current unit name in the presence of wrapping (ocaml/merlin#1788)
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (ocaml/merlin#1795, fixes ocaml/merlin#1794)
- destruct: Refinement in the presence of optional arguments (ocaml/merlin#1800 ocaml/merlin#1807, fixes ocaml/merlin#1770)
- Implement new expand-node command for expanding PPX annotations (ocaml/merlin#1745)
- Implement new inlay-hints command for adding hints on a sourcetree (ocaml/merlin#1812)
- Implement new search-by-type command for searching values by types (ocaml/merlin#1828)
- Canonicalize paths in occurrences. This helps deduplicate the results and
show more user-friendly paths. (ocaml/merlin#1840)
- Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
(ocaml/merlin#1839, ocaml/merlin#1803)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (ocaml/merlin#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (ocaml/merlin#1804)
- emacs: Improve the way that result of polarity search is displayed (ocaml/merlin#1814)
- emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
depending on the query (ocaml/merlin#1828)
voodoos
added a commit
that referenced
this pull request
Sep 26, 2024
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Sep 26, 2024
CHANGES:
Thu Sep 26 18:48:42 CEST 2024
+ merlin binary
- A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
what to append to the current unit name in the presence of wrapping (ocaml/merlin#1788)
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (ocaml/merlin#1795, fixes ocaml/merlin#1794)
- destruct: Refinement in the presence of optional arguments (ocaml/merlin#1800 ocaml/merlin#1807, fixes ocaml/merlin#1770)
- Implement new expand-node command for expanding PPX annotations (ocaml/merlin#1745)
- Implement new inlay-hints command for adding hints on a sourcetree (ocaml/merlin#1812)
- Add `signature-help` command (ocaml/merlin#1720)
- Implement new search-by-type command for searching values by types (ocaml/merlin#1828)
- Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
(ocaml/merlin#1839, ocaml/merlin#1803)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (ocaml/merlin#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (ocaml/merlin#1804)
- emacs: Improve the way that result of polarity search is displayed (ocaml/merlin#1814)
- emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
depending on the query (ocaml/merlin#1828)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Sep 26, 2024
CHANGES:
Thu Sep 26 18:48:42 CEST 2024
+ merlin binary
- A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
what to append to the current unit name in the presence of wrapping (ocaml/merlin#1788)
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (ocaml/merlin#1795, fixes ocaml/merlin#1794)
- destruct: Refinement in the presence of optional arguments (ocaml/merlin#1800 ocaml/merlin#1807, fixes ocaml/merlin#1770)
- Implement new expand-node command for expanding PPX annotations (ocaml/merlin#1745)
- Implement new inlay-hints command for adding hints on a sourcetree (ocaml/merlin#1812)
- Add `signature-help` command (ocaml/merlin#1720)
- Implement new search-by-type command for searching values by types (ocaml/merlin#1828)
- Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
(ocaml/merlin#1839, ocaml/merlin#1803)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (ocaml/merlin#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (ocaml/merlin#1804)
- emacs: Improve the way that result of polarity search is displayed (ocaml/merlin#1814)
- emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
depending on the query (ocaml/merlin#1828)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Sep 27, 2024
CHANGES:
Fri Sep 27 12:02:42 CEST 2024
+ merlin binary
- A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
what to append to the current unit name in the presence of wrapping (ocaml/merlin#1788)
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (ocaml/merlin#1795, fixes ocaml/merlin#1794)
- destruct: Refinement in the presence of optional arguments (ocaml/merlin#1800 ocaml/merlin#1807, fixes ocaml/merlin#1770)
- Implement new expand-node command for expanding PPX annotations (ocaml/merlin#1745)
- Implement new inlay-hints command for adding hints on a sourcetree (ocaml/merlin#1812)
- Implement new search-by-type command for searching values by types (ocaml/merlin#1828)
- Canonicalize paths in occurrences. This helps deduplicate the results and
show more user-friendly paths. (ocaml/merlin#1840)
- Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
(ocaml/merlin#1839, ocaml/merlin#1803)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (ocaml/merlin#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (ocaml/merlin#1804)
- emacs: Improve the way that result of polarity search is displayed (ocaml/merlin#1814)
- emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
depending on the query (ocaml/merlin#1828)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Sep 27, 2024
CHANGES:
Fri Sep 27 12:02:42 CEST 2024
+ merlin binary
- A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
what to append to the current unit name in the presence of wrapping (ocaml/merlin#1788)
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (ocaml/merlin#1795, fixes ocaml/merlin#1794)
- destruct: Refinement in the presence of optional arguments (ocaml/merlin#1800 ocaml/merlin#1807, fixes ocaml/merlin#1770)
- Implement new expand-node command for expanding PPX annotations (ocaml/merlin#1745)
- Implement new inlay-hints command for adding hints on a sourcetree (ocaml/merlin#1812)
- Add `signature-help` command (ocaml/merlin#1720)
- Implement new search-by-type command for searching values by types (ocaml/merlin#1828)
- Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
(ocaml/merlin#1839, ocaml/merlin#1803)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (ocaml/merlin#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (ocaml/merlin#1804)
- emacs: Improve the way that result of polarity search is displayed (ocaml/merlin#1814)
- emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
depending on the query (ocaml/merlin#1828)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Sep 27, 2024
CHANGES:
Fri Sep 27 12:02:42 CEST 2024
+ merlin binary
- A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
what to append to the current unit name in the presence of wrapping (ocaml/merlin#1788)
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (ocaml/merlin#1795, fixes ocaml/merlin#1794)
- destruct: Refinement in the presence of optional arguments (ocaml/merlin#1800 ocaml/merlin#1807, fixes ocaml/merlin#1770)
- Implement new expand-node command for expanding PPX annotations (ocaml/merlin#1745)
- Implement new inlay-hints command for adding hints on a sourcetree (ocaml/merlin#1812)
- Add `signature-help` command (ocaml/merlin#1720)
- Implement new search-by-type command for searching values by types (ocaml/merlin#1828)
- Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
(ocaml/merlin#1839, ocaml/merlin#1803)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (ocaml/merlin#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (ocaml/merlin#1804)
- emacs: Improve the way that result of polarity search is displayed (ocaml/merlin#1814)
- emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
depending on the query (ocaml/merlin#1828)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Sep 27, 2024
CHANGES:
Fri Sep 27 12:02:42 CEST 2024
+ merlin binary
- A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
what to append to the current unit name in the presence of wrapping (ocaml/merlin#1788)
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (ocaml/merlin#1795, fixes ocaml/merlin#1794)
- destruct: Refinement in the presence of optional arguments (ocaml/merlin#1800 ocaml/merlin#1807, fixes ocaml/merlin#1770)
- Implement new expand-node command for expanding PPX annotations (ocaml/merlin#1745)
- Implement new inlay-hints command for adding hints on a sourcetree (ocaml/merlin#1812)
- Implement new search-by-type command for searching values by types (ocaml/merlin#1828)
- Canonicalize paths in occurrences. This helps deduplicate the results and
show more user-friendly paths. (ocaml/merlin#1840)
- Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
(ocaml/merlin#1839, ocaml/merlin#1803)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (ocaml/merlin#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (ocaml/merlin#1804)
- emacs: Improve the way that result of polarity search is displayed (ocaml/merlin#1814)
- emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
depending on the query (ocaml/merlin#1828)
[new release] merlin (3 packages) (4.17.1-501)
CHANGES:
Fri Sep 27 12:02:42 CEST 2024
+ merlin binary
- A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
what to append to the current unit name in the presence of wrapping (ocaml/merlin#1788)
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (ocaml/merlin#1795, fixes ocaml/merlin#1794)
- destruct: Refinement in the presence of optional arguments (ocaml/merlin#1800 ocaml/merlin#1807, fixes ocaml/merlin#1770)
- Implement new expand-node command for expanding PPX annotations (ocaml/merlin#1745)
- Implement new inlay-hints command for adding hints on a sourcetree (ocaml/merlin#1812)
- Add `signature-help` command (ocaml/merlin#1720)
- Implement new search-by-type command for searching values by types (ocaml/merlin#1828)
- Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
(ocaml/merlin#1839, ocaml/merlin#1803)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (ocaml/merlin#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (ocaml/merlin#1804)
- emacs: Improve the way that result of polarity search is displayed (ocaml/merlin#1814)
- emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
depending on the query (ocaml/merlin#1828)
[new release] merlin (3 packages) (4.17.1-414)
CHANGES:
Fri Sep 27 12:02:42 CEST 2024
+ merlin binary
- A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
what to append to the current unit name in the presence of wrapping (ocaml/merlin#1788)
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (ocaml/merlin#1795, fixes ocaml/merlin#1794)
- destruct: Refinement in the presence of optional arguments (ocaml/merlin#1800 ocaml/merlin#1807, fixes ocaml/merlin#1770)
- Implement new expand-node command for expanding PPX annotations (ocaml/merlin#1745)
- Implement new inlay-hints command for adding hints on a sourcetree (ocaml/merlin#1812)
- Add `signature-help` command (ocaml/merlin#1720)
- Implement new search-by-type command for searching values by types (ocaml/merlin#1828)
- Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
(ocaml/merlin#1839, ocaml/merlin#1803)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (ocaml/merlin#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (ocaml/merlin#1804)
- emacs: Improve the way that result of polarity search is displayed (ocaml/merlin#1814)
- emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
depending on the query (ocaml/merlin#1828)
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.
MerlinPhrase calls an undefined function, vim_selectphrase, in the python code. This function was removed some years ago in change 8ebe7ff. Remove all references to MerlinPhrase in the help docs, keybindings and vim functions which call it.
8ebe7ff#diff-836f8a63886b2c63a113a107540d42a0b3a6272b016b2d45fb5bcffd99a708b4L754
it looks like it was re-implemented by 89526e8 with new (undocumented) vim bindings to
merlin#PhrasePrevandmerlin#PhraseNext