diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2021-11-07 13:12:17 +0000 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2021-12-07 11:34:27 +0000 |
| commit | d6258a9bad10e97d2582a102750e0e931bb9321a (patch) | |
| tree | c1ed2bf7d8ce0e34064cb75f8a533538baa9e395 | |
| parent | c2d0a1041e215634be316c4e824c1b1b2f242e76 (diff) | |
| download | rneovim-d6258a9bad10e97d2582a102750e0e931bb9321a.tar.gz rneovim-d6258a9bad10e97d2582a102750e0e931bb9321a.tar.bz2 rneovim-d6258a9bad10e97d2582a102750e0e931bb9321a.zip | |
vim-patch:8.2.2014: using CTRL-O in a prompt buffer moves cursor to start
Problem: Using CTRL-O in a prompt buffer moves cursor to start of the line.
Solution: Do not move the cursor when restarting edit. (closes vim/vim#7330)
https://github.com/vim/vim/commit/ee8b787bcd15f63a938243770065e704c9b5c85f
Test_prompt_editing is skipped, so edit the Lua test in prompt_buffer_spec.
| -rw-r--r-- | src/nvim/edit.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_prompt_buffer.vim | 5 | ||||
| -rw-r--r-- | test/functional/legacy/prompt_buffer_spec.lua | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index dfdefddc20..9bfb8a9d4a 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -1686,7 +1686,7 @@ static void init_prompt(int cmdchar_todo) if (cmdchar_todo == 'A') { coladvance(MAXCOL); } - if (cmdchar_todo == 'I' || curwin->w_cursor.col <= (int)STRLEN(prompt)) { + if (curwin->w_cursor.col < (colnr_T)STRLEN(prompt)) { curwin->w_cursor.col = STRLEN(prompt); } // Make sure the cursor is in a valid position. diff --git a/src/nvim/testdir/test_prompt_buffer.vim b/src/nvim/testdir/test_prompt_buffer.vim index af7231c9c0..4212dcb36e 100644 --- a/src/nvim/testdir/test_prompt_buffer.vim +++ b/src/nvim/testdir/test_prompt_buffer.vim @@ -89,9 +89,12 @@ func Test_prompt_editing() call term_sendkeys(buf, left . left . left . bs . '-') call WaitForAssert({-> assert_equal('cmd: -hel', term_getline(buf, 1))}) + call term_sendkeys(buf, "\<C-O>lz") + call WaitForAssert({-> assert_equal('cmd: -hzel', term_getline(buf, 1))}) + let end = "\<End>" call term_sendkeys(buf, end . "x") - call WaitForAssert({-> assert_equal('cmd: -helx', term_getline(buf, 1))}) + call WaitForAssert({-> assert_equal('cmd: -hzelx', term_getline(buf, 1))}) call term_sendkeys(buf, "\<C-U>exit\<CR>") call WaitForAssert({-> assert_equal('other buffer', term_getline(buf, 1))}) diff --git a/test/functional/legacy/prompt_buffer_spec.lua b/test/functional/legacy/prompt_buffer_spec.lua index a987eaf12c..5c077e3f7d 100644 --- a/test/functional/legacy/prompt_buffer_spec.lua +++ b/test/functional/legacy/prompt_buffer_spec.lua @@ -125,9 +125,22 @@ describe('prompt buffer', function() ~ | | ]]) + feed("<C-O>lz") + screen:expect([[ + % -hz^el | + ~ | + ~ | + ~ | + [Prompt] [+] | + other buffer | + ~ | + ~ | + ~ | + | + ]]) feed("<End>x") screen:expect([[ - % -helx^ | + % -hzelx^ | ~ | ~ | ~ | |