aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Malcomson <hardenedapple@gmail.com>2020-01-13 01:09:39 +0000
committerJustin M. Keyes <justinkz@gmail.com>2020-01-12 17:09:39 -0800
commitdfb676fe0d64c708c0c334b09c947db1bae4736d (patch)
tree450b4ed56cad8c40d983635ff1799351af83bbb8
parent05ea3c1997a5f8c1c28192cb67a1306485c11b9a (diff)
downloadrneovim-dfb676fe0d64c708c0c334b09c947db1bae4736d.tar.gz
rneovim-dfb676fe0d64c708c0c334b09c947db1bae4736d.tar.bz2
rneovim-dfb676fe0d64c708c0c334b09c947db1bae4736d.zip
edit.c: Ensure undo sync when emulating <Esc>x #11706
After PR #8226 an unmapped META key in insert mode behaves like ESC-<key> (:help i_META). The behaviour does not fully match, since if <Esc>-<key> is pressed manually then since it were pressed manually `gotchars` would be called on the second <key> after insert-mode had already been left. This would mean that `may_sync_undo` (called from `gotchars`) would call `u_sync(FALSE)` on the second key (since we would be in normal mode). This overall means that <Meta-[something]> behaves differently with respect to undo than <Esc>[something] when the [something] makes a change. As an example, under `nvim -u NONE`: ihello<M-.>u leaves the buffer empty, while ihello<Esc>.u leaves the buffer with one instance of `hello`. - Fix by calling u_sync() manually in the new clause under `normalchar:` in `insert_handle_key`. - Update test in tui_spec.lua that accidentally relied on the old behaviour.
-rw-r--r--src/nvim/edit.c1
-rw-r--r--test/functional/insert/insert_spec.lua6
-rw-r--r--test/functional/terminal/tui_spec.lua2
3 files changed, 9 insertions, 0 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index cb5c7023d7..d59924cd08 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -1234,6 +1234,7 @@ normalchar:
// Unmapped ALT/META chord behaves like ESC+c. #8213
stuffcharReadbuff(ESC);
stuffcharReadbuff(s->c);
+ u_sync(false);
break;
}
diff --git a/test/functional/insert/insert_spec.lua b/test/functional/insert/insert_spec.lua
index 427954f5a6..330cfbd830 100644
--- a/test/functional/insert/insert_spec.lua
+++ b/test/functional/insert/insert_spec.lua
@@ -37,5 +37,11 @@ describe('insert-mode', function()
command('iunmap <M-l>')
feed('0i<M-l>')
eq({ 0, 1, 2, 0, }, funcs.getpos('.'))
+ -- Unmapped ALT-chord has same `undo` characteristics as ESC+<key>
+ command('0,$d')
+ feed('ahello<M-.>')
+ expect('hellohello')
+ feed('u')
+ expect('hello')
end)
end)
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 077e9dc7d5..5d82037f42 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -299,6 +299,8 @@ describe('TUI', function()
feed_data('u')
expect_child_buf_lines({'"pasted from terminal"'})
feed_data('u')
+ expect_child_buf_lines({'""'})
+ feed_data('u')
expect_child_buf_lines({''})
end)