Make the prefix argument to merlin-locate optional#1476
Merged
voodoos merged 1 commit intoocaml:masterfrom Jun 28, 2022
Merged
Conversation
Collaborator
|
Looks good to me, thank you @antalsz, could you add a changelog entry ? Also do you have a specific need for this to be backported to 411 ? We dropped official support for this branch this the release of 4.14. |
|
@antalsz This might also be a good time to document what the 2 prefix arguments actually do. :-) Also - it's Emacs convention to use more descriptive names than |
Contributor
Author
bbatsov
reviewed
Jun 23, 2022
|
The PR looks good to me now. I'd only suggest squashing all commits together, although I guess @voodoos can also do this at merge time. |
voodoos
approved these changes
Jun 27, 2022
Improve the docstring for `merlin-locate` and add a changelog entry Delete stray `(provide 'merlin)` line
df922d8 to
c975a26
Compare
antalsz
added a commit
to oxcaml/merlin
that referenced
this pull request
Jun 29, 2022
Improve the docstring for `merlin-locate` and add a changelog entry (Supersedes the prior commit to this effect by pulling in the improvements for the upstream PR)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jun 30, 2022
CHANGES:
Thu Jun 30 14:51:42 CEST 2022
+ merlin binary
- make most library public and split merlin in two packages: the
`merlin-lib` package that exposes merlin's internals and the `merlin`
package with the frontend. (ocaml/merlin#1448, ocaml/merlin#1455, ocaml/merlin#1457, ocaml/merlin#1497, @rgrinberg,
@tmattio, @kit-ty-kate)
- Type printing: use best_module_path for paths from Mty_alias (ocaml/merlin#1470)
- Attempt at finding the 'real' capitalization of files on windows (ocaml/merlin#1462 by
@mlasson)
- Use newer `Seq`-based API of Yojson 2.0, avoiding the need for the
deprecated `Stream` module (ocaml/merlin#1475 by @Leonidas-from-XIV)
- unify parsing of `MERLIN_LOG` (ocaml/merlin#1480 by @ulugbekna)
- Fix type deduplication in `type-enclosing` results (ocaml/merlin#1483, fixes ocaml/merlin#1477)
- Only weakly reduce the shapes to speed up the new Merlin locate
implementation. (ocaml/merlin#1488)
- Ignore unknown configuration tags from dune configuration provider but not
from dot-merlin-reader (ocaml/merlin#1486)
- typing recovery: recover at the granularity of `core_type` (ocaml/merlin#1484)
+ editor modes
- add method imenu items for emacs (ocaml/merlin#1481, @mndrix)
- emacs: Make the prefix argument to `merlin-locate` optional, both for
consistency with Emacs convention and for backwards compatibility. (ocaml/merlin#1476,
@antalsz)
- emacs: fix duplicated prefix path in imenu entries (ocaml/merlin#1495, @bcc32)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 1, 2022
CHANGES:
Fri Jul 1 12:51:42 CEST 2022
+ merlin binary
- Type printing: use `best_module_path` for paths from `Mty_alias` (ocaml/merlin#1470)
- Attempt at finding the 'real' capitalization of files on windows (ocaml/merlin#1462 by
@mlasson)
- Use newer `Seq`-based API of Yojson 2.0, avoiding the need for the
deprecated `Stream` module (ocaml/merlin#1475 by @Leonidas-from-XIV)
- unify parsing of `MERLIN_LOG` (ocaml/merlin#1480 by @ulugbekna)
- Fix type deduplication in `type-enclosing` results (ocaml/merlin#1483, fixes ocaml/merlin#1477)
- Ignore unknown configuration tags from dune configuration provider but not
from dot-merlin-reader (ocaml/merlin#1486)
- typing recovery: recover at the granularity of `core_type` (ocaml/merlin#1484)
+ editor modes
- Fix `merlin-locate-in-new-window` is ignored (ocaml/merlin#1461 by @emturner,
fixes ocaml/merlin#1460)
- add method imenu items for emacs (ocaml/merlin#1481, @mndrix)
- emacs: Make the prefix argument to `merlin-locate` optional, both for
consistency with Emacs convention and for backwards compatibility. (ocaml/merlin#1476,
@antalsz)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 1, 2022
CHANGES:
Fri Jul 1 12:51:42 CEST 2022
+ merlin binary
- Type printing: use `best_module_path` for paths from `Mty_alias` (ocaml/merlin#1470)
- Attempt at finding the 'real' capitalization of files on windows (ocaml/merlin#1462 by
@mlasson)
- Use newer `Seq`-based API of Yojson 2.0, avoiding the need for the
deprecated `Stream` module (ocaml/merlin#1475 by @Leonidas-from-XIV)
- unify parsing of `MERLIN_LOG` (ocaml/merlin#1480 by @ulugbekna)
- Fix type deduplication in `type-enclosing` results (ocaml/merlin#1483, fixes ocaml/merlin#1477)
- Ignore unknown configuration tags from dune configuration provider but not
from dot-merlin-reader (ocaml/merlin#1486)
- typing recovery: recover at the granularity of `core_type` (ocaml/merlin#1484)
+ editor modes
- Fix `merlin-locate-in-new-window` is ignored (ocaml/merlin#1461 by @emturner,
fixes ocaml/merlin#1460)
- add method imenu items for emacs (ocaml/merlin#1481, @mndrix)
- emacs: Make the prefix argument to `merlin-locate` optional, both for
consistency with Emacs convention and for backwards compatibility. (ocaml/merlin#1476,
@antalsz)
- emacs: fix duplicated prefix path in imenu entries (ocaml/merlin#1495, @bcc32)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 1, 2022
CHANGES:
Fri Jul 1 12:51:42 CEST 2022
+ merlin binary
- Type printing: use `best_module_path` for paths from `Mty_alias` (ocaml/merlin#1470)
- Attempt at finding the 'real' capitalization of files on windows (ocaml/merlin#1462 by
@mlasson)
- Use newer `Seq`-based API of Yojson 2.0, avoiding the need for the
deprecated `Stream` module (ocaml/merlin#1475 by @Leonidas-from-XIV)
- unify parsing of `MERLIN_LOG` (ocaml/merlin#1480 by @ulugbekna)
- Fix type deduplication in `type-enclosing` results (ocaml/merlin#1483, fixes ocaml/merlin#1477)
- Ignore unknown configuration tags from dune configuration provider but not
from dot-merlin-reader (ocaml/merlin#1486)
- typing recovery: recover at the granularity of `core_type` (ocaml/merlin#1484)
+ editor modes
- Fix `merlin-locate-in-new-window` is ignored (ocaml/merlin#1461 by @emturner,
fixes ocaml/merlin#1460)
- add method imenu items for emacs (ocaml/merlin#1481, @mndrix)
- emacs: Make the prefix argument to `merlin-locate` optional, both for
consistency with Emacs convention and for backwards compatibility. (ocaml/merlin#1476,
@antalsz)
- emacs: fix duplicated prefix path in imenu entries (ocaml/merlin#1495, @bcc32)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 1, 2022
CHANGES:
Fri Jul 1 12:51:42 CEST 2022
+ merlin binary
- Type printing: use `best_module_path` for paths from `Mty_alias` (ocaml/merlin#1470)
- Attempt at finding the 'real' capitalization of files on windows (ocaml/merlin#1462 by
@mlasson)
- Use newer `Seq`-based API of Yojson 2.0, avoiding the need for the
deprecated `Stream` module (ocaml/merlin#1475 by @Leonidas-from-XIV)
- unify parsing of `MERLIN_LOG` (ocaml/merlin#1480 by @ulugbekna)
- Fix type deduplication in `type-enclosing` results (ocaml/merlin#1483, fixes ocaml/merlin#1477)
- Ignore unknown configuration tags from dune configuration provider but not
from dot-merlin-reader (ocaml/merlin#1486)
- typing recovery: recover at the granularity of `core_type` (ocaml/merlin#1484)
+ editor modes
- Fix `merlin-locate-in-new-window` is ignored (ocaml/merlin#1461 by @emturner,
fixes ocaml/merlin#1460)
- add method imenu items for emacs (ocaml/merlin#1481, @mndrix)
- emacs: Make the prefix argument to `merlin-locate` optional, both for
consistency with Emacs convention and for backwards compatibility. (ocaml/merlin#1476,
@antalsz)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The
merlin-locatecommand had a prefix argument added; it's elisp convention for prefix arguments to be optional, and this is especially helpful as themerlin-locatecommand is user-facing and this provides for backwards compatibility.This change can also be backported to the 412 and 411 branches.