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

Jump to cases within a Match statement #1726

Merged
merged 1 commit into from
Feb 21, 2024
Merged

Jump to cases within a Match statement #1726

merged 1 commit into from
Feb 21, 2024

Conversation

PizieDust
Copy link
Contributor

@PizieDust PizieDust commented Jan 31, 2024 •
edited
Loading

fixes #1721
This PR allows for one to navigate the source code, particularly match constructs. From any point within the match statement, the command can move to the next case or the previous case.

cc @voodoos

voodoos
voodoos reviewed Feb 1, 2024
View reviewed changes
src/analysis/jump.ml Outdated Show resolved Hide resolved
src/analysis/jump.ml Outdated Show resolved Hide resolved
voodoos
voodoos reviewed Feb 2, 2024
View reviewed changes
src/analysis/jump.ml Outdated Show resolved Hide resolved
src/analysis/jump.mli Outdated Show resolved Hide resolved
src/analysis/jump.ml Show resolved Hide resolved
src/analysis/jump.ml Outdated Show resolved Hide resolved
src/analysis/jump.ml Outdated Show resolved Hide resolved
src/analysis/jump.ml Outdated Show resolved Hide resolved
src/analysis/jump.ml Outdated Show resolved Hide resolved
tests/test-dirs/motion/jump_match.t Outdated Show resolved Hide resolved
voodoos
voodoos approved these changes Feb 2, 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.

I think it mostly looks good. We should have a look at how the editors call the jump command now :-)

src/analysis/jump.ml Outdated Show resolved Hide resolved
src/analysis/jump.ml Outdated
Some pat_loc.loc_start
else
find_pos pos tail direction
in
Copy link
Collaborator

Choose a reason for hiding this comment

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

Indentation is wrong here

Copy link
Collaborator

Choose a reason for hiding this comment

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

You also marked this one resolved without fixing it... After that I will squash and merge !

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it should all be good now

src/analysis/jump.ml Outdated Show resolved Hide resolved
src/analysis/jump.ml Outdated Show resolved Hide resolved
src/analysis/jump.mli Outdated Show resolved Hide resolved
tests/test-dirs/motion/jump_match.t Show resolved Hide resolved
voodoos
voodoos reviewed Feb 20, 2024
View reviewed changes
src/analysis/jump.ml Outdated Show resolved Hide resolved
voodoos
voodoos approved these changes Feb 20, 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.

Thank again for this, do you want to rebase into meaningful commits before I merge ?

Also there is still some unrelated format changes (added white space), can you get rid of them ? It's very useful for reviewers and to keep the history clean to only unclude meaningful changes into PRs.

@PizieDust
Copy link
Contributor Author

Thank again for this, do you want to rebase into meaningful commits before I merge ?

Also there is still some unrelated format changes (added white space), can you get rid of them ? It's very useful for reviewers and to keep the history clean to only unclude meaningful changes into PRs.

Thank you. I think I've fixed the whitespace and indentation issues in the newest commit. Is it possible to rebase all into one commit and merge? I

@voodoos voodoos merged commit 288a4ae into ocaml:master Feb 21, 2024
9 of 10 checks passed
voodoos added a commit to voodoos/merlin that referenced this pull request Feb 22, 2024
@voodoos
[B] Jump to cases within a Match statement (ocaml#1726)
9505b03 
from PizieDust/jump_case
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin (3 packages) (4.14-414)
1e53e68 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin, merlin-lib and dot-merlin-reader (4.14-500)
7905af8 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin (3 packages) (4.14-501)
613d86e 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin-lib, merlin (4.14-501/500/414)
6b881a5 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
@voodoos voodoos mentioned this pull request Feb 22, 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 501
Status: 4.14-500
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Feature: jump to next/previous case
2 participants
@PizieDust @voodoos