vim-patch:8.2.1147 (#19425)

vim-patch:8.2.1147: :confirm may happen in cooked mode

Problem:    :confirm may happen in cooked mode. (Jason Franklin)
Solution:   Switch to raw mode before prompting. (Brandon Pfeifer)
27321dbeed

Code is N/A, but this improves tests. Port the improved tests to Lua.
This commit is contained in:
zeertzjq
2022-07-19 13:00:22 +08:00
committed by GitHub
parent 1a655b71a8
commit 7b835ba796
2 changed files with 557 additions and 169 deletions

View File

@@ -242,49 +242,58 @@ func Test_confirm_cmd()
CheckNotGui CheckNotGui
CheckRunVimInTerminal CheckRunVimInTerminal
call writefile(['foo1'], 'foo') call writefile(['foo1'], 'Xfoo')
call writefile(['bar1'], 'bar') call writefile(['bar1'], 'Xbar')
" Test for saving all the modified buffers " Test for saving all the modified buffers
let buf = RunVimInTerminal('', {'rows': 20}) let lines =<< trim END
call term_sendkeys(buf, ":set nomore\n") set nomore
call term_sendkeys(buf, ":new foo\n") new Xfoo
call term_sendkeys(buf, ":call setline(1, 'foo2')\n") call setline(1, 'foo2')
call term_sendkeys(buf, ":new bar\n") new Xbar
call term_sendkeys(buf, ":call setline(1, 'bar2')\n") call setline(1, 'bar2')
call term_sendkeys(buf, ":wincmd b\n") wincmd b
END
call writefile(lines, 'Xscript')
let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
call term_sendkeys(buf, ":confirm qall\n") call term_sendkeys(buf, ":confirm qall\n")
call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000) call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000)
call term_sendkeys(buf, "A") call term_sendkeys(buf, "A")
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
call assert_equal(['foo2'], readfile('foo')) call assert_equal(['foo2'], readfile('Xfoo'))
call assert_equal(['bar2'], readfile('bar')) call assert_equal(['bar2'], readfile('Xbar'))
" Test for discarding all the changes to modified buffers " Test for discarding all the changes to modified buffers
let buf = RunVimInTerminal('', {'rows': 20}) let lines =<< trim END
call term_sendkeys(buf, ":set nomore\n") set nomore
call term_sendkeys(buf, ":new foo\n") new Xfoo
call term_sendkeys(buf, ":call setline(1, 'foo3')\n") call setline(1, 'foo3')
call term_sendkeys(buf, ":new bar\n") new Xbar
call term_sendkeys(buf, ":call setline(1, 'bar3')\n") call setline(1, 'bar3')
call term_sendkeys(buf, ":wincmd b\n") wincmd b
END
call writefile(lines, 'Xscript')
let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
call term_sendkeys(buf, ":confirm qall\n") call term_sendkeys(buf, ":confirm qall\n")
call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000) call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000)
call term_sendkeys(buf, "D") call term_sendkeys(buf, "D")
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
call assert_equal(['foo2'], readfile('foo')) call assert_equal(['foo2'], readfile('Xfoo'))
call assert_equal(['bar2'], readfile('bar')) call assert_equal(['bar2'], readfile('Xbar'))
" Test for saving and discarding changes to some buffers " Test for saving and discarding changes to some buffers
let buf = RunVimInTerminal('', {'rows': 20}) let lines =<< trim END
call term_sendkeys(buf, ":set nomore\n") set nomore
call term_sendkeys(buf, ":new foo\n") new Xfoo
call term_sendkeys(buf, ":call setline(1, 'foo4')\n") call setline(1, 'foo4')
call term_sendkeys(buf, ":new bar\n") new Xbar
call term_sendkeys(buf, ":call setline(1, 'bar4')\n") call setline(1, 'bar4')
call term_sendkeys(buf, ":wincmd b\n") wincmd b
END
call writefile(lines, 'Xscript')
let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
call term_sendkeys(buf, ":confirm qall\n") call term_sendkeys(buf, ":confirm qall\n")
call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000) call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000)
call term_sendkeys(buf, "N") call term_sendkeys(buf, "N")
@@ -292,11 +301,12 @@ func Test_confirm_cmd()
call term_sendkeys(buf, "Y") call term_sendkeys(buf, "Y")
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
call assert_equal(['foo4'], readfile('foo')) call assert_equal(['foo4'], readfile('Xfoo'))
call assert_equal(['bar2'], readfile('bar')) call assert_equal(['bar2'], readfile('Xbar'))
call delete('foo') call delete('Xscript')
call delete('bar') call delete('Xfoo')
call delete('Xbar')
endfunc endfunc
func Test_confirm_cmd_cancel() func Test_confirm_cmd_cancel()
@@ -304,10 +314,13 @@ func Test_confirm_cmd_cancel()
CheckRunVimInTerminal CheckRunVimInTerminal
" Test for closing a window with a modified buffer " Test for closing a window with a modified buffer
let buf = RunVimInTerminal('', {'rows': 20}) let lines =<< trim END
call term_sendkeys(buf, ":set nomore\n") set nomore
call term_sendkeys(buf, ":new\n") new
call term_sendkeys(buf, ":call setline(1, 'abc')\n") call setline(1, 'abc')
END
call writefile(lines, 'Xscript')
let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
call term_sendkeys(buf, ":confirm close\n") call term_sendkeys(buf, ":confirm close\n")
call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$', call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
\ term_getline(buf, 20))}, 1000) \ term_getline(buf, 20))}, 1000)
@@ -320,6 +333,43 @@ func Test_confirm_cmd_cancel()
call WaitForAssert({-> assert_match('^ *0,0-1 All$', call WaitForAssert({-> assert_match('^ *0,0-1 All$',
\ term_getline(buf, 20))}, 1000) \ term_getline(buf, 20))}, 1000)
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
call delete('Xscript')
endfunc
" The ":confirm" prompt was sometimes used with the terminal in cooked mode.
" This test verifies that a "\<CR>" character is NOT required to respond to a
" prompt from the ":conf q" and ":conf wq" commands.
func Test_confirm_q_wq()
CheckNotGui
CheckRunVimInTerminal
call writefile(['foo'], 'Xfoo')
let lines =<< trim END
set hidden nomore
call setline(1, 'abc')
edit Xfoo
END
call writefile(lines, 'Xscript')
let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
call term_sendkeys(buf, ":confirm q\n")
call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
\ term_getline(buf, 20))}, 1000)
call term_sendkeys(buf, 'C')
call WaitForAssert({-> assert_notmatch('^\[Y\]es, (N)o, (C)ancel: C*$',
\ term_getline(buf, 20))}, 1000)
call term_sendkeys(buf, ":edit Xfoo\n")
call term_sendkeys(buf, ":confirm wq\n")
call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
\ term_getline(buf, 20))}, 1000)
call term_sendkeys(buf, 'C')
call WaitForAssert({-> assert_notmatch('^\[Y\]es, (N)o, (C)ancel: C*$',
\ term_getline(buf, 20))}, 1000)
call StopVimInTerminal(buf)
call delete('Xscript')
call delete('Xfoo')
endfunc endfunc
func Test_confirm_write_ro() func Test_confirm_write_ro()

View File

@@ -2,8 +2,11 @@ local helpers = require('test.functional.helpers')(after_each)
local Screen = require('test.functional.ui.screen') local Screen = require('test.functional.ui.screen')
local clear = helpers.clear local clear = helpers.clear
local command = helpers.command local command = helpers.command
local exec = helpers.exec
local exec_lua = helpers.exec_lua local exec_lua = helpers.exec_lua
local feed = helpers.feed local feed = helpers.feed
local funcs = helpers.funcs
local iswin = helpers.iswin
local meths = helpers.meths local meths = helpers.meths
local poke_eventloop = helpers.poke_eventloop local poke_eventloop = helpers.poke_eventloop
local read_file = helpers.read_file local read_file = helpers.read_file
@@ -37,152 +40,487 @@ describe('Ex command', function()
end) end)
end) end)
it(':confirm command dialog', function() describe(':confirm command dialog', function()
local screen local screen
local function start_new() local function start_new()
clear() clear()
screen = Screen.new(60, 20) screen = Screen.new(75, 20)
screen:set_default_attr_ids({
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[1] = {bold = true, reverse = true}, -- StatusLine, MsgSeparator
[2] = {reverse = true}, -- StatusLineNC
[3] = {bold = true, foreground = Screen.colors.SeaGreen}, -- MoreMsg
})
screen:attach() screen:attach()
end end
write_file('foo', 'foo1\n') -- Test for the :confirm command dialog
write_file('bar', 'bar1\n') -- oldtest: Test_confirm_cmd()
it('works', function()
write_file('Xfoo', 'foo1\n')
write_file('Xbar', 'bar1\n')
-- Test for saving all the modified buffers -- Test for saving all the modified buffers
start_new() start_new()
command("set nomore") exec([[
command("new foo") set nomore
command("call setline(1, 'foo2')") new Xfoo
command("new bar") call setline(1, 'foo2')
command("call setline(1, 'bar2')") new Xbar
command("wincmd b") call setline(1, 'bar2')
feed(':confirm qall\n') wincmd b
screen:expect([[ ]])
bar2 | feed(':confirm qall\n')
~ | screen:expect([[
~ | bar2 |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
bar [+] | {0:~ }|
foo2 | {0:~ }|
~ | {2:Xbar [+] }|
~ | foo2 |
~ | {0:~ }|
~ | {0:~ }|
foo [+] | {0:~ }|
| {0:~ }|
~ | {2:Xfoo [+] }|
~ | |
| {0:~ }|
:confirm qall | {0:~ }|
Save changes to "bar"? | {1: }|
[Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ^ | :confirm qall |
]]) {3:Save changes to "Xbar"?} |
feed('A') {3:[Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: }^ |
poke_eventloop() ]])
feed('A')
poke_eventloop()
eq('foo2\n', read_file('foo')) eq('foo2\n', read_file('Xfoo'))
eq('bar2\n', read_file('bar')) eq('bar2\n', read_file('Xbar'))
-- Test for discarding all the changes to modified buffers -- Test for discarding all the changes to modified buffers
start_new() start_new()
command("set nomore") exec([[
command("new foo") set nomore
command("call setline(1, 'foo3')") new Xfoo
command("new bar") call setline(1, 'foo3')
command("call setline(1, 'bar3')") new Xbar
command("wincmd b") call setline(1, 'bar3')
feed(':confirm qall\n') wincmd b
screen:expect([[ ]])
bar3 | feed(':confirm qall\n')
~ | screen:expect([[
~ | bar3 |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
bar [+] | {0:~ }|
foo3 | {0:~ }|
~ | {2:Xbar [+] }|
~ | foo3 |
~ | {0:~ }|
~ | {0:~ }|
foo [+] | {0:~ }|
| {0:~ }|
~ | {2:Xfoo [+] }|
~ | |
| {0:~ }|
:confirm qall | {0:~ }|
Save changes to "bar"? | {1: }|
[Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ^ | :confirm qall |
]]) {3:Save changes to "Xbar"?} |
feed('D') {3:[Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: }^ |
poke_eventloop() ]])
feed('D')
poke_eventloop()
eq('foo2\n', read_file('foo')) eq('foo2\n', read_file('Xfoo'))
eq('bar2\n', read_file('bar')) eq('bar2\n', read_file('Xbar'))
-- Test for saving and discarding changes to some buffers -- Test for saving and discarding changes to some buffers
start_new() start_new()
command("set nomore") exec([[
command("new foo") set nomore
command("call setline(1, 'foo4')") new Xfoo
command("new bar") call setline(1, 'foo4')
command("call setline(1, 'bar4')") new Xbar
command("wincmd b") call setline(1, 'bar4')
feed(':confirm qall\n') wincmd b
screen:expect([[ ]])
bar4 | feed(':confirm qall\n')
~ | screen:expect([[
~ | bar4 |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
bar [+] | {0:~ }|
foo4 | {0:~ }|
~ | {2:Xbar [+] }|
~ | foo4 |
~ | {0:~ }|
~ | {0:~ }|
foo [+] | {0:~ }|
| {0:~ }|
~ | {2:Xfoo [+] }|
~ | |
| {0:~ }|
:confirm qall | {0:~ }|
Save changes to "bar"? | {1: }|
[Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ^ | :confirm qall |
]]) {3:Save changes to "Xbar"?} |
feed('N') {3:[Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: }^ |
screen:expect([[ ]])
bar4 | feed('N')
~ | screen:expect([[
~ | bar4 |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
bar [+] | {0:~ }|
foo4 | {0:~ }|
~ | {2:Xbar [+] }|
~ | foo4 |
~ | {0:~ }|
~ | {0:~ }|
foo [+] | {0:~ }|
| {0:~ }|
| {2:Xfoo [+] }|
:confirm qall | |
Save changes to "bar"? | {1: }|
| :confirm qall |
Save changes to "foo"? | {3:Save changes to "Xbar"?} |
[Y]es, (N)o, (C)ancel: ^ | |
]]) {3:Save changes to "Xfoo"?} |
feed('Y') {3:[Y]es, (N)o, (C)ancel: }^ |
poke_eventloop() ]])
feed('Y')
poke_eventloop()
eq('foo4\n', read_file('foo')) eq('foo4\n', read_file('Xfoo'))
eq('bar2\n', read_file('bar')) eq('bar2\n', read_file('Xbar'))
os.remove('foo') os.remove('Xfoo')
os.remove('bar') os.remove('Xbar')
end)
-- oldtest: Test_confirm_cmd_cancel()
it('can be cancelled', function()
-- Test for closing a window with a modified buffer
start_new()
screen:try_resize(75, 10)
exec([[
set nohidden nomore
new
call setline(1, 'abc')
]])
feed(':confirm close\n')
screen:expect([[
abc |
{0:~ }|
{0:~ }|
{0:~ }|
{1:[No Name] [+] }|
|
{1: }|
:confirm close |
{3:Save changes to "Untitled"?} |
{3:[Y]es, (N)o, (C)ancel: }^ |
]])
feed('C')
screen:expect([[
^abc |
{0:~ }|
{0:~ }|
{0:~ }|
{1:[No Name] [+] }|
|
{0:~ }|
{0:~ }|
{2:[No Name] }|
|
]])
feed(':confirm close\n')
screen:expect([[
abc |
{0:~ }|
{0:~ }|
{0:~ }|
{1:[No Name] [+] }|
|
{1: }|
:confirm close |
{3:Save changes to "Untitled"?} |
{3:[Y]es, (N)o, (C)ancel: }^ |
]])
feed('N')
screen:expect([[
^ |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
|
]])
end)
-- oldtest: Test_confirm_q_wq()
it('works with :q and :wq', function()
write_file('Xfoo', 'foo')
start_new()
screen:try_resize(75, 8)
exec([[
set hidden nomore
call setline(1, 'abc')
edit Xfoo
set nofixendofline
]])
feed(':confirm q\n')
screen:expect([[
foo |
{0:~ }|
{0:~ }|
{0:~ }|
{1: }|
:confirm q |
{3:Save changes to "Untitled"?} |
{3:[Y]es, (N)o, (C)ancel: }^ |
]])
feed('C')
screen:expect([[
^abc |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
|
]])
command('edit Xfoo')
feed(':confirm wq\n')
screen:expect([[
foo |
{0:~ }|
{0:~ }|
{0:~ }|
{1: }|
"Xfoo" [noeol] 1L, 3B written |
{3:Save changes to "Untitled"?} |
{3:[Y]es, (N)o, (C)ancel: }^ |
]])
feed('C')
screen:expect([[
^abc |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
"Xfoo" [noeol] 1L, 3B written |
]])
os.remove('Xfoo')
end)
-- oldtest: Test_confirm_write_ro()
it('works when writing a read-only file', function()
write_file('Xconfirm_write_ro', 'foo\n')
start_new()
screen:try_resize(75, 8)
exec([[
set ruler
set nobackup ff=unix cmdheight=2
edit Xconfirm_write_ro
norm Abar
]])
-- Try to write with 'ro' option.
feed(':set ro | confirm w\n')
screen:expect([[
foobar |
{0:~ }|
{0:~ }|
{1: }|
:set ro | confirm w |
{3:'readonly' option is set for "Xconfirm_write_ro".} |
{3:Do you wish to write anyway?} |
{3:(Y)es, [N]o: }^ |
]])
feed('N')
screen:expect([[
fooba^r |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
|
1,6 All |
]])
eq('foo\n', read_file('Xconfirm_write_ro'))
feed(':confirm w\n')
screen:expect([[
foobar |
{0:~ }|
{0:~ }|
{1: }|
:confirm w |
{3:'readonly' option is set for "Xconfirm_write_ro".} |
{3:Do you wish to write anyway?} |
{3:(Y)es, [N]o: }^ |
]])
feed('Y')
if iswin() then
screen:expect([[
foobar |
{0:~ }|
{1: }|
:confirm w |
{3:'readonly' option is set for "Xconfirm_write_ro".} |
{3:Do you wish to write anyway?} |
"Xconfirm_write_ro" [unix] 1L, 7B written |
{3:Press ENTER or type command to continue}^ |
]])
else
screen:expect([[
foobar |
{0:~ }|
{1: }|
:confirm w |
{3:'readonly' option is set for "Xconfirm_write_ro".} |
{3:Do you wish to write anyway?} |
"Xconfirm_write_ro" 1L, 7B written |
{3:Press ENTER or type command to continue}^ |
]])
end
eq('foobar\n', read_file('Xconfirm_write_ro'))
feed('<CR>') -- suppress hit-enter prompt
-- Try to write with read-only file permissions.
funcs.setfperm('Xconfirm_write_ro', 'r--r--r--')
feed(':set noro | undo | confirm w\n')
screen:expect([[
foobar |
{0:~ }|
{1: }|
1 change; before #1 0 seconds ago |
{3:File permissions of "Xconfirm_write_ro" are read-only.} |
{3:It may still be possible to write it.} |
{3:Do you wish to try?} |
{3:(Y)es, [N]o: }^ |
]])
feed('Y')
if iswin() then
screen:expect([[
foobar |
{1: }|
1 change; before #1 0 seconds ago |
{3:File permissions of "Xconfirm_write_ro" are read-only.} |
{3:It may still be possible to write it.} |
{3:Do you wish to try?} |
"Xconfirm_write_ro" [unix] 1L, 4B written |
{3:Press ENTER or type command to continue}^ |
]])
else
screen:expect([[
foobar |
{1: }|
1 change; before #1 0 seconds ago |
{3:File permissions of "Xconfirm_write_ro" are read-only.} |
{3:It may still be possible to write it.} |
{3:Do you wish to try?} |
"Xconfirm_write_ro" 1L, 4B written |
{3:Press ENTER or type command to continue}^ |
]])
end
eq('foo\n', read_file('Xconfirm_write_ro'))
feed('<CR>') -- suppress hit-enter prompt
os.remove('Xconfirm_write_ro')
end)
-- oldtest: Test_confirm_write_partial_file()
it('works when writing a partial file', function()
write_file('Xwrite_partial', 'a\nb\nc\nd\n')
start_new()
screen:try_resize(75, 8)
exec([[
set ruler
set nobackup ff=unix cmdheight=2
edit Xwrite_partial
]])
feed(':confirm 2,3w\n')
screen:expect([[
a |
b |
c |
d |
{1: }|
:confirm 2,3w |
{3:Write partial file?} |
{3:(Y)es, [N]o: }^ |
]])
feed('N')
screen:expect([[
^a |
b |
c |
d |
{0:~ }|
{0:~ }|
|
1,1 All |
]])
eq('a\nb\nc\nd\n', read_file('Xwrite_partial'))
os.remove('Xwrite_partial')
feed(':confirm 2,3w\n')
screen:expect([[
a |
b |
c |
d |
{1: }|
:confirm 2,3w |
{3:Write partial file?} |
{3:(Y)es, [N]o: }^ |
]])
feed('Y')
if iswin() then
screen:expect([[
a |
b |
c |
{1: }|
:confirm 2,3w |
{3:Write partial file?} |
"Xwrite_partial" [New][unix] 2L, 4B written |
{3:Press ENTER or type command to continue}^ |
]])
else
screen:expect([[
a |
b |
c |
{1: }|
:confirm 2,3w |
{3:Write partial file?} |
"Xwrite_partial" [New] 2L, 4B written |
{3:Press ENTER or type command to continue}^ |
]])
end
eq('b\nc\n', read_file('Xwrite_partial'))
os.remove('Xwrite_partial')
end)
end) end)