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

Add a find_command_opt alternative to find_command that does not raise #1778

Merged
merged 2 commits into from
Jun 10, 2024
Merged

Add a find_command_opt alternative to find_command that does not raise #1778

merged 2 commits into from
Jun 10, 2024

Conversation

voodoos
Copy link
Collaborator

@voodoos voodoos commented Jun 10, 2024

No description provided.

@voodoos
merlin-lib.commandsmerlin.commands: Add a find_command_opt
bb54e4c 
Alternative to `find_command_opt` that doesn't raise
@voodoos voodoos requested a review from xvw June 10, 2024 12:13
@voodoos voodoos changed the title Add a find_command_opt alternative ti find_command that does not raise Add a find_command_opt alternative to find_command that does not raise Jun 10, 2024
xvw
xvw approved these changes Jun 10, 2024
View reviewed changes
Copy link
Collaborator

@xvw xvw left a comment

Choose a reason for hiding this comment

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

lgtm

@voodoos voodoos merged commit a5c7b4d into ocaml:master Jun 10, 2024
5 of 6 checks passed
voodoos added a commit to voodoos/merlin that referenced this pull request Jun 10, 2024
@voodoos
[B] Merge pull request ocaml#1778 from voodoos/find-command-opt
060404c 
Add a `find_command_opt` alternative to `find_command` that does not raise
voodoos added a commit to voodoos/merlin that referenced this pull request Jun 10, 2024
@voodoos
[B] Merge pull request ocaml#1778 from voodoos/find-command-opt
4a4a234 
Add a `find_command_opt` alternative to `find_command` that does not raise
voodoos added a commit to voodoos/opam-repository that referenced this pull request Jun 10, 2024
@voodoos
[new release] merlin (3 packages) (4.16-414)
5d95d1c 
CHANGES:

Mon Jun 10 17:35:42 CEST 2024

  + merlin binary
    - Addition of a `merlin-lib.commands` library which disassociates the
      execution of commands from the `new_protocol`, from the binary, allowing
      it to be invoked from other projects (ocaml/merlin#1758)
    - `merlin-lib.commands`: Add a `find_command_opt` alternative to
      `find_command` that does not raise (ocaml/merlin#1778)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Jun 10, 2024
@voodoos
[new release] merlin (3 packages) (4.16-501)
264d2a5 
CHANGES:

Mon Jun 10 17:35:42 CEST 2024

  + merlin binary
    - Addition of a `merlin-lib.commands` library which disassociates the
      execution of commands from the `new_protocol`, from the binary, allowing
      it to be invoked from other projects (ocaml/merlin#1758)
    - `merlin-lib.commands`: Add a `find_command_opt` alternative to
      `find_command` that does not raise (ocaml/merlin#1778)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Jun 10, 2024
@voodoos
[new release] merlin (3 packages) (4.16-414/501)
1580ff8 
CHANGES:

Mon Jun 10 17:35:42 CEST 2024

  + merlin binary
    - Addition of a `merlin-lib.commands` library which disassociates the
      execution of commands from the `new_protocol`, from the binary, allowing
      it to be invoked from other projects (ocaml/merlin#1758)
    - `merlin-lib.commands`: Add a `find_command_opt` alternative to
      `find_command` that does not raise (ocaml/merlin#1778)
@voodoos voodoos mentioned this pull request Jun 10, 2024
Merged
voodoos added a commit to voodoos/opam-repository that referenced this pull request Jun 18, 2024
@voodoos
[new release] merlin (3 packages) (5.1-502)
082c348 
CHANGES:

Tue Jun 18 12:00:42 CEST 2024

  + merlin binary
    - Support project-wide occurrences queries using index files (ocaml/merlin#1766)
      - The file format is described in library `Merlin_lib.index_format`
      - Two new configuration directives are introduced:
        - `SOURCE_ROOT` that is used to resolve relative paths found in the
          indexes.
        - `INDEX` that is used to declare the list of index files Merlin should
          use when looking for occurrences.
    - A new `UNIT_NAME` configuration directive that can be used to tell Merlin
      the correct name of the current unit in the presence of wrapping (ocaml/merlin#1776)
    - Perform incremental indexation of the buffer when typing. (ocaml/merlin#1777)
    - `merlin-lib.commands`: Add a `find_command_opt`` alternative to
      `find_command` that does not raise (ocaml/merlin#1778)
    - Prevent uid clashes by not returning PWO for defs located in the current
      interface file (ocaml/merlin#1781)
    - Reset uid counters when restoring the typer cache so that uids are stable
      across re-typing (ocaml/merlin#1779)
    - Improve the behavior on occurrences when the cursor is on a label /
      constructor declaration (ocaml/merlin#1785)
  + editor modes
    - emacs: add basic support for project-wide occurrences (ocaml/merlin#1766)
    - vim: add basic support for project-wide occurrences (ocaml/merlin#1767, @Julow)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Jun 18, 2024
@voodoos
[new release] merlin (3 packages) (5.1-502)
781742e 
CHANGES:

Tue Jun 18 12:00:42 CEST 2024

  + merlin binary
    - Support project-wide occurrences queries using index files (ocaml/merlin#1766)
      - The file format is described in library `Merlin_lib.index_format`
      - Two new configuration directives are introduced:
        - `SOURCE_ROOT` that is used to resolve relative paths found in the
          indexes.
        - `INDEX` that is used to declare the list of index files Merlin should
          use when looking for occurrences.
    - A new `UNIT_NAME` configuration directive that can be used to tell Merlin
      the correct name of the current unit in the presence of wrapping (ocaml/merlin#1776)
    - Perform incremental indexation of the buffer when typing. (ocaml/merlin#1777)
    - `merlin-lib.commands`: Add a `find_command_opt`` alternative to
      `find_command` that does not raise (ocaml/merlin#1778)
    - Prevent uid clashes by not returning PWO for defs located in the current
      interface file (ocaml/merlin#1781)
    - Reset uid counters when restoring the typer cache so that uids are stable
      across re-typing (ocaml/merlin#1779)
    - Improve the behavior on occurrences when the cursor is on a label /
      constructor declaration (ocaml/merlin#1785)
  + editor modes
    - emacs: add basic support for project-wide occurrences (ocaml/merlin#1766)
    - vim: add basic support for project-wide occurrences (ocaml/merlin#1767, @Julow)

[new release] ocaml-index (1.0)

CHANGES:

### Added

- Initial release.
- The `aggregate`` command that finishes reduction of shapes in cmt files and
  store the output in a single index file.
- The `stats` command that prints information about an index file.
- The `dump` command that prints all locs of an index.
voodoos added a commit to voodoos/opam-repository that referenced this pull request Jun 18, 2024
@voodoos
[new release] merlin (3 packages) (5.1-502)
5937f19 
CHANGES:

Tue Jun 18 12:00:42 CEST 2024

  + merlin binary
    - Support project-wide occurrences queries using index files (ocaml/merlin#1766)
      - The file format is described in library `Merlin_lib.index_format`
      - Two new configuration directives are introduced:
        - `SOURCE_ROOT` that is used to resolve relative paths found in the
          indexes.
        - `INDEX` that is used to declare the list of index files Merlin should
          use when looking for occurrences.
    - A new `UNIT_NAME` configuration directive that can be used to tell Merlin
      the correct name of the current unit in the presence of wrapping (ocaml/merlin#1776)
    - Perform incremental indexation of the buffer when typing. (ocaml/merlin#1777)
    - `merlin-lib.commands`: Add a `find_command_opt`` alternative to
      `find_command` that does not raise (ocaml/merlin#1778)
    - Prevent uid clashes by not returning PWO for defs located in the current
      interface file (ocaml/merlin#1781)
    - Reset uid counters when restoring the typer cache so that uids are stable
      across re-typing (ocaml/merlin#1779)
    - Improve the behavior on occurrences when the cursor is on a label /
      constructor declaration (ocaml/merlin#1785)
  + editor modes
    - emacs: add basic support for project-wide occurrences (ocaml/merlin#1766)
    - vim: add basic support for project-wide occurrences (ocaml/merlin#1767, @Julow)

[new release] ocaml-index (1.0)

CHANGES:

### Added

- Initial release.
- The `aggregate`` command that finishes reduction of shapes in cmt files and
  store the output in a single index file.
- The `stats` command that prints information about an index file.
- The `dump` command that prints all locs of an index.
@voodoos voodoos mentioned this pull request Jun 18, 2024
Merged
avsm pushed a commit to avsm/opam-repository that referenced this pull request Sep 5, 2024
@voodoos @avsm
[new release] merlin (3 packages) (4.16-414/501)
afce602 
CHANGES:

Mon Jun 10 17:35:42 CEST 2024

  + merlin binary
    - Addition of a `merlin-lib.commands` library which disassociates the
      execution of commands from the `new_protocol`, from the binary, allowing
      it to be invoked from other projects (ocaml/merlin#1758)
    - `merlin-lib.commands`: Add a `find_command_opt` alternative to
      `find_command` that does not raise (ocaml/merlin#1778)
avsm pushed a commit to avsm/opam-repository that referenced this pull request Sep 5, 2024
@voodoos @avsm
[new release] merlin (3 packages) (5.1-502)
279cdd9 
CHANGES:

Tue Jun 18 12:00:42 CEST 2024

  + merlin binary
    - Support project-wide occurrences queries using index files (ocaml/merlin#1766)
      - The file format is described in library `Merlin_lib.index_format`
      - Two new configuration directives are introduced:
        - `SOURCE_ROOT` that is used to resolve relative paths found in the
          indexes.
        - `INDEX` that is used to declare the list of index files Merlin should
          use when looking for occurrences.
    - A new `UNIT_NAME` configuration directive that can be used to tell Merlin
      the correct name of the current unit in the presence of wrapping (ocaml/merlin#1776)
    - Perform incremental indexation of the buffer when typing. (ocaml/merlin#1777)
    - `merlin-lib.commands`: Add a `find_command_opt`` alternative to
      `find_command` that does not raise (ocaml/merlin#1778)
    - Prevent uid clashes by not returning PWO for defs located in the current
      interface file (ocaml/merlin#1781)
    - Reset uid counters when restoring the typer cache so that uids are stable
      across re-typing (ocaml/merlin#1779)
    - Improve the behavior on occurrences when the cursor is on a label /
      constructor declaration (ocaml/merlin#1785)
  + editor modes
    - emacs: add basic support for project-wide occurrences (ocaml/merlin#1766)
    - vim: add basic support for project-wide occurrences (ocaml/merlin#1767, @Julow)

[new release] ocaml-index (1.0)

CHANGES:

### Added

- Initial release.
- The `aggregate`` command that finishes reduction of shapes in cmt files and
  store the output in a single index file.
- The `stats` command that prints information about an index file.
- The `dump` command that prints all locs of an index.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xvw xvw xvw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Backport to 414
Status: 4.16-414
Backport to 501
Status: 4.16-501
Milestone
No milestone
Development

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