Permalink
Browse files

patch 8.1.0032: BS in prompt buffer starts new line

Problem:    BS in prompt buffer starts new line.
Solution:   Do not allows BS over the prompt.  Make term_sendkeys() handle
            special keys. Add a test.
  • Loading branch information...
brammool committed Jun 4, 2018
1 parent c8523e2 commit 6b810d92a9cd9378ab46ea0db07079cb789f9faa
Showing with 68 additions and 9 deletions.
  1. +4 −0 src/option.c
  2. +13 −2 src/terminal.c
  3. +49 −7 src/testdir/test_prompt_buffer.vim
  4. +2 −0 src/version.c
@@ -12439,6 +12439,10 @@ check_opt_wim(void)
can_bs(
int what) /* BS_INDENT, BS_EOL or BS_START */
{
#ifdef FEAT_JOB_CHANNEL
if (what == BS_START && bt_prompt(curbuf))
return FALSE;
#endif
switch (*p_bs)
{
case '2': return TRUE;
@@ -5094,8 +5094,19 @@ f_term_sendkeys(typval_T *argvars, typval_T *rettv)
while (*msg != NUL)
{
send_keys_to_term(term, PTR2CHAR(msg), FALSE);
msg += MB_CPTR2LEN(msg);
int c;
if (*msg == K_SPECIAL && msg[1] != NUL && msg[2] != NUL)
{
c = TO_SPECIAL(msg[1], msg[2]);
msg += 3;
}
else
{
c = PTR2CHAR(msg);
msg += MB_CPTR2LEN(msg);
}
send_keys_to_term(term, c, FALSE);
}
}
@@ -7,16 +7,20 @@ endif
source shared.vim
source screendump.vim
func Test_prompt_basic()
func CanTestPromptBuffer()
" We need to use a terminal window to be able to feed keys without leaving
" Insert mode.
if !has('terminal')
return
return 0
endif
if has('win32')
" TODO: make this work on MS-Windows
return
" TODO: make the tests work on MS-Windows
return 0
endif
return 1
endfunc
func WriteScript(name)
call writefile([
\ 'func TextEntered(text)',
\ ' if a:text == "exit"',
@@ -44,8 +48,17 @@ func Test_prompt_basic()
\ 'set buftype=prompt',
\ 'call prompt_setcallback(bufnr(""), function("TextEntered"))',
\ 'startinsert',
\ ], 'Xpromptscript')
let buf = RunVimInTerminal('-S Xpromptscript', {})
\ ], a:name)
endfunc
func Test_prompt_basic()
if !CanTestPromptBuffer()
return
endif
let scriptName = 'XpromptscriptBasic'
call WriteScript(scriptName)
let buf = RunVimInTerminal('-S ' . scriptName, {})
call WaitForAssert({-> assert_equal('%', term_getline(buf, 1))})
call term_sendkeys(buf, "hello\<CR>")
@@ -57,5 +70,34 @@ func Test_prompt_basic()
call WaitForAssert({-> assert_equal('other buffer', term_getline(buf, 1))})
call StopVimInTerminal(buf)
call delete('Xpromptscript')
call delete(scriptName)
endfunc
func Test_prompt_editing()
if !CanTestPromptBuffer()
return
endif
let scriptName = 'XpromptscriptEditing'
call WriteScript(scriptName)
let buf = RunVimInTerminal('-S ' . scriptName, {})
call WaitForAssert({-> assert_equal('%', term_getline(buf, 1))})
let bs = "\<BS>"
call term_sendkeys(buf, "hello" . bs . bs)
call WaitForAssert({-> assert_equal('% hel', term_getline(buf, 1))})
let left = "\<Left>"
call term_sendkeys(buf, left . left . left . bs . '-')
call WaitForAssert({-> assert_equal('% -hel', term_getline(buf, 1))})
let end = "\<End>"
call term_sendkeys(buf, end . "x")
call WaitForAssert({-> assert_equal('% -helx', term_getline(buf, 1))})
call term_sendkeys(buf, "\<C-U>exit\<CR>")
call WaitForAssert({-> assert_equal('other buffer', term_getline(buf, 1))})
call StopVimInTerminal(buf)
call delete(scriptName)
endfunc
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
32,
/**/
31,
/**/

0 comments on commit 6b810d9

Please sign in to comment.