Make it possible to jump between files when navigate is active #684
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
Thanks @lepotic for the suggestion. Fixes #680
Kr1ss-XD
added a commit
to Kr1ss-XD/delta
that referenced
this pull request
Aug 22, 2021
* upstream/master: Refactor: use Option to model sometimes-null highlighter (dandavison#698) Add some test coverage for truncate_str with a multibyte unicode character Use "syntax theme" terminology in show-syntax-themes output (dandavison#697) Fix deadlock in `git diff` mode (dandavison#695) Fix empty line highlighting (dandavison#642) Revert "Add failing test that gitconfig insteadOf is honored" Add failing test that gitconfig insteadOf is honored Support `insteadOf` replacements in git remote URLs Hold GitConfig in main Config struct Revert "Support `insteadOf` replacements in git remote URLs" Support `insteadOf` replacements in git remote URLs Refactoring for dandavison#693 (dandavison#696) Make it possible to jump between files when navigate is active (dandavison#684) Bump dev version number Compile delta from source in dockerfile Fix computed values to be computed after all set_options (dandavison#690) Remove unnecessary borrows (dandavison#692) Bump bitflags from 1.3.1 to 1.3.2 (dandavison#691) Bump git2 from 0.13.20 to 0.13.21 (dandavison#687)
dandavison
added a commit
that referenced
this pull request
Oct 13, 2021
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.
Fixes #680 cc @tjkirch @lepotic
This changes the labels that delta adds when
navigate = true: we now have an upper-case delta on file boundaries, and a lower-case delta on hunk boundaries:As suggested by @lepotic #680 (comment), this allows us to switch to navigating by file with
/ <up> <left> <backspace> <backspace> <enter>.In other words, using
/ <up>to reveal the current search regex:and then editing this to remove the lower-case delta:
and finally resuming search with
<enter>.The labels can be modified. E.g.
(and it is ok to use something like
*which has special meaning in regular expressions).