diff options
author | WindSoilder | 2021-11-30 07:40:38 +0000 |
---|---|---|
committer | GitHub | 2021-11-30 07:40:38 +0000 |
commit | c08d2fae587a0a5dd2a1e2e44a1f385d142c9d59 (patch) | |
tree | 0a7052e741574f4be11b5e6db957372f6c41e433 /helix-term/src/ui | |
parent | 94296229e72cb9a56fb36d9cc3bc2513df3c54f6 (diff) |
Improve dedent behavior, make kill_to_line_end behave like emacs (#1173)
* restore indent when press esc right after open a new line
* add comment for restore_indent
* fix, and make kill to line end behaves like emacs
* update comment
* fix comment
* adjust cancel restore_indent situation
* check esc logic in mode transaction
* improve comment
* add more check for dedent
* update comment
* use matches to check for last_cmd
* no need to introduct CommandFun type
Diffstat (limited to 'helix-term/src/ui')
-rw-r--r-- | helix-term/src/ui/editor.rs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs index 83be816f..c6d0e71f 100644 --- a/helix-term/src/ui/editor.rs +++ b/helix-term/src/ui/editor.rs @@ -1023,6 +1023,19 @@ impl Component for EditorView { (Mode::Insert, Mode::Normal) => { // if exiting insert mode, remove completion self.completion = None; + + let last_cmd = self.last_insert.0.fun(); + const OPEN_BELOW_FUN: fn(&mut commands::Context) = commands::open_below; + const OPEN_ABOVE_FUN: fn(&mut commands::Context) = commands::open_above; + // For user friendly, + // Remove whitespaces if we go from insert mode(through open below/above) to normal mode without any keys in between. + // Example: `o<esc>`. + if matches!(last_cmd, OPEN_BELOW_FUN | OPEN_ABOVE_FUN) + && self.last_insert.1.len() == 1 + { + commands::Command::goto_line_start.execute(&mut cxt); + commands::Command::kill_to_line_end.execute(&mut cxt); + } } _ => (), } |