diff options
| -rw-r--r-- | src/nvim/option.c | 9 | ||||
| -rw-r--r-- | test/functional/legacy/prompt_buffer_spec.lua | 80 |
2 files changed, 80 insertions, 9 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index fa994e24c3..100902897a 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -7092,10 +7092,13 @@ static int check_opt_wim(void) */ bool can_bs(int what) { + if (what == BS_START && bt_prompt(curbuf)) { + return false; + } switch (*p_bs) { - case '2': return true; - case '1': return what != BS_START; - case '0': return false; + case '2': return true; + case '1': return what != BS_START; + case '0': return false; } return vim_strchr(p_bs, what) != NULL; } diff --git a/test/functional/legacy/prompt_buffer_spec.lua b/test/functional/legacy/prompt_buffer_spec.lua index 749e65a985..d494bb5a81 100644 --- a/test/functional/legacy/prompt_buffer_spec.lua +++ b/test/functional/legacy/prompt_buffer_spec.lua @@ -28,6 +28,11 @@ describe('prompt buffer', function() call append(line("$") - 1, 'Result: "' . a:text .'"') endfunc ]]) + feed_command("set noshowmode | set laststatus=0") + feed_command("call setline(1, 'other buffer')") + feed_command("new") + feed_command("set buftype=prompt") + feed_command("call prompt_setcallback(bufnr(''), function('TextEntered'))") end) after_each(function() @@ -35,11 +40,6 @@ describe('prompt buffer', function() end) it('works', function() - feed_command("set noshowmode | set laststatus=0") - feed_command("call setline(1, 'other buffer')") - feed_command("new") - feed_command("set buftype=prompt") - feed_command("call prompt_setcallback(bufnr(''), function('TextEntered'))") screen:expect([[ ^ | ~ | @@ -52,7 +52,7 @@ describe('prompt buffer', function() ~ | | ]]) - feed_command("startinsert") + feed("i") feed("hello\n") screen:expect([[ % hello | @@ -81,4 +81,72 @@ describe('prompt buffer', function() ]]) end) + it('editing', function() + screen:expect([[ + ^ | + ~ | + ~ | + ~ | + [Scratch] | + other buffer | + ~ | + ~ | + ~ | + | + ]]) + feed("i") + feed("hello<BS><BS>") + screen:expect([[ + % hel^ | + ~ | + ~ | + ~ | + [Scratch] | + other buffer | + ~ | + ~ | + ~ | + | + ]]) + feed("<Left><Left><Left><BS>-") + screen:expect([[ + % -^hel | + ~ | + ~ | + ~ | + [Scratch] | + other buffer | + ~ | + ~ | + ~ | + | + ]]) + feed("<End>x") + screen:expect([[ + % -helx^ | + ~ | + ~ | + ~ | + [Scratch] | + other buffer | + ~ | + ~ | + ~ | + | + ]]) + feed("<C-U>exit\n") + screen:expect([[ + ^other buffer | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + | + ]]) + end) + end) |