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

feat: replace mode and Vim motions (`W`, `E`, `B`, `^`, `_`) for inputs #2143

Merged

sxyazi merged 20 commits into sxyazi:main from dxrcy:main

Jan 8, 2025

Contributor

dxrcy commented Jan 2, 2025 •

edited

Loading

Draft!

Closes #2119

dxrcy commented

View reviewed changes

yazi-core/src/input/commands/type_.rs Outdated

@@ @@ -11,6 +11,18 @@ impl From<CmdCow> for Opt { @@
               impl Input {
               	pub fn type_(&mut self, key: &Key) -> bool {
+              		if self.mode() == InputMode::Replace {
+              			let Some(c) = key.plain() else {

Contributor Author

dxrcy Jan 2, 2025

Don't change back to normal mode for special keys.
Only here to fix <Esc> being handled twice.

dxrcy commented

View reviewed changes

yazi-core/src/input/input.rs Outdated Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

dxrcy commented

View reviewed changes

yazi-config/preset/keymap-default.toml Outdated Show resolved Hide resolved

dxrcy commented

View reviewed changes

yazi-core/src/input/commands/move_.rs Outdated Show resolved Hide resolved

dxrcy commented

View reviewed changes

yazi-core/src/input/commands/move_.rs Outdated Show resolved Hide resolved

dxrcy commented

View reviewed changes

yazi-core/src/input/commands/move_.rs Outdated Show resolved Hide resolved

sxyazi reviewed

View reviewed changes

yazi-config/preset/keymap-default.toml Outdated Show resolved Hide resolved

sxyazi requested changes

View reviewed changes

yazi-core/src/input/commands/replace.rs Outdated Show resolved Hide resolved

Contributor

boydaihungst commented Jan 4, 2025

Can you also improve the way the input component handles deleting characters? I want to be able to see the remaining characters while deleting.

For example, consider a file with a very long name: XXXXX5887_1091036115376980_44076561883236365984_407656188323636598.jpg

After deleting all characters except the file extension, it would be better to display XXXXX.jpg. However, I have to exit Insert Mode and then press the Left Arrow or h key to see the remaining characters.

dxrcy changed the title ~~Implement more keybinds for inputs~~ feat: more keybinds for inputs

dxrcy commented

View reviewed changes

yazi-core/src/input/commands/replace.rs Outdated Show resolved Hide resolved

dxrcy and others added 18 commits

January 8, 2025 17:40


          feat: single-character replace keybind for inputs

873f47d


          fix: change replace keybind description

8c92fa9


          feat: better api to move input cursor to bol/eol

5ce5523


          fix: format default keybinds config

25cc4f0


          fix: make V select entire line including leading whitespace

a53f896

Co-authored-by: 三咲雅 · Misaki Masa <[email protected]>


          refactor: rename move_::Step to move_::OptStep

ab268a8


          feat: use default value for invalid move argument

3f3b500


          refactor: rename single-letter variables

e0cbe78


          feat: add --big parameter to forward and backward commands

90ccc63


          Format

8ca43a5


          <C-a> and <Home> should keep the original behavior

def6a3f


          Refactor the move command

74adbac


          Use first() instead of get(0)

8e9eed4


          Merge the match arms

a652aab


          Move type_str and replace_str to type and replace commands

ca0cdc0


          fix: bracketed paste (Ctrl-v from the terminal) also needs to exit re…

…place mode


          fix: create new snap on replace

14f3ca5


          fix: panic replacing character in empty input

053426a


          Refactor the replace command and rebase

bcf528d

sxyazi force-pushed the main branch from 1c9c96c to bcf528d Compare

January 8, 2025 10:07


          Extract the logic of comparing two CharKind instances into a method…

a058226

… of `CharKind`

sxyazi changed the title ~~feat: more keybinds for inputs~~ feat: replace mode and Vim motions (W, E, B, ^, _) for inputs

Owner

sxyazi commented Jan 8, 2025

Can you also improve the way the input component handles deleting characters? I want to be able to see the remaining characters while deleting.

@boydaihungst There's already another PR handling this, #1198, but there are still some edge cases with Unicode that need further testing before merging.

sxyazi approved these changes

View reviewed changes

Owner

sxyazi left a comment

All looks good to me now, thanks a lot for contributing these awesome features @dxrcy!

sxyazi marked this pull request as ready for review

January 8, 2025 10:38

sxyazi merged commit ba62b40 into sxyazi:main

6 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet