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)
https://github.com/vim/vim/commit/27321dbeedf8bb833c48b01bf18536125794f65e

Code is N/A, but this improves tests. Port the improved tests to Lua.

1 files changed, 479 insertions, 141 deletions

diff --git a/test/functional/legacy/excmd_spec.lua b/test/functional/legacy/excmd_spec.lua
index 6b3b265579..549f412e24 100644
--- a/test/functional/legacy/excmd_spec.lua
+++ b/test/functional/legacy/excmd_spec.lua
@@ -2,8 +2,11 @@ local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
 local command = helpers.command
+local exec = helpers.exec
 local exec_lua = helpers.exec_lua
 local feed = helpers.feed
+local funcs = helpers.funcs
+local iswin = helpers.iswin
 local meths = helpers.meths
 local poke_eventloop = helpers.poke_eventloop
 local read_file = helpers.read_file
@@ -37,152 +40,487 @@ describe('Ex command', function()
   end)
 end)
 
-it(':confirm command dialog', function()
+describe(':confirm command dialog', function()
   local screen
 
   local function start_new()
     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()
   end
 
-  write_file('foo', 'foo1\n')
-  write_file('bar', 'bar1\n')
-
-  -- Test for saving all the modified buffers
-  start_new()
-  command("set nomore")
-  command("new foo")
-  command("call setline(1, 'foo2')")
-  command("new bar")
-  command("call setline(1, 'bar2')")
-  command("wincmd b")
-  feed(':confirm qall\n')
-  screen:expect([[
-    bar2                                                        |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    bar [+]                                                     |
-    foo2                                                        |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    foo [+]                                                     |
-                                                                |
-    ~                                                           |
-    ~                                                           |
-                                                                |
-    :confirm qall                                               |
-    Save changes to "bar"?                                      |
-    [Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ^          |
-  ]])
-  feed('A')
-  poke_eventloop()
-
-  eq('foo2\n', read_file('foo'))
-  eq('bar2\n', read_file('bar'))
-
-  -- Test for discarding all the changes to modified buffers
-  start_new()
-  command("set nomore")
-  command("new foo")
-  command("call setline(1, 'foo3')")
-  command("new bar")
-  command("call setline(1, 'bar3')")
-  command("wincmd b")
-  feed(':confirm qall\n')
-  screen:expect([[
-    bar3                                                        |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    bar [+]                                                     |
-    foo3                                                        |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    foo [+]                                                     |
-                                                                |
-    ~                                                           |
-    ~                                                           |
-                                                                |
-    :confirm qall                                               |
-    Save changes to "bar"?                                      |
-    [Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ^          |
-  ]])
-  feed('D')
-  poke_eventloop()
-
-  eq('foo2\n', read_file('foo'))
-  eq('bar2\n', read_file('bar'))
-
-  -- Test for saving and discarding changes to some buffers
-  start_new()
-  command("set nomore")
-  command("new foo")
-  command("call setline(1, 'foo4')")
-  command("new bar")
-  command("call setline(1, 'bar4')")
-  command("wincmd b")
-  feed(':confirm qall\n')
-  screen:expect([[
-    bar4                                                        |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    bar [+]                                                     |
-    foo4                                                        |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    foo [+]                                                     |
-                                                                |
-    ~                                                           |
-    ~                                                           |
-                                                                |
-    :confirm qall                                               |
-    Save changes to "bar"?                                      |
-    [Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ^          |
-  ]])
-  feed('N')
-  screen:expect([[
-    bar4                                                        |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    bar [+]                                                     |
-    foo4                                                        |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    ~                                                           |
-    foo [+]                                                     |
-                                                                |
-                                                                |
-    :confirm qall                                               |
-    Save changes to "bar"?                                      |
-                                                                |
-    Save changes to "foo"?                                      |
-    [Y]es, (N)o, (C)ancel: ^                                     |
-  ]])
-  feed('Y')
-  poke_eventloop()
-
-  eq('foo4\n', read_file('foo'))
-  eq('bar2\n', read_file('bar'))
-
-  os.remove('foo')
-  os.remove('bar')
+  -- Test for the :confirm command dialog
+  -- oldtest: Test_confirm_cmd()
+  it('works', function()
+    write_file('Xfoo', 'foo1\n')
+    write_file('Xbar', 'bar1\n')
+
+    -- Test for saving all the modified buffers
+    start_new()
+    exec([[
+      set nomore
+      new Xfoo
+      call setline(1, 'foo2')
+      new Xbar
+      call setline(1, 'bar2')
+      wincmd b
+    ]])
+    feed(':confirm qall\n')
+    screen:expect([[
+      bar2                                                                       |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:Xbar [+]                                                                   }|
+      foo2                                                                       |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:Xfoo [+]                                                                   }|
+                                                                                 |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {1:                                                                           }|
+      :confirm qall                                                              |
+      {3:Save changes to "Xbar"?}                                                    |
+      {3:[Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: }^                         |
+    ]])
+    feed('A')
+    poke_eventloop()
+
+    eq('foo2\n', read_file('Xfoo'))
+    eq('bar2\n', read_file('Xbar'))
+
+    -- Test for discarding all the changes to modified buffers
+    start_new()
+    exec([[
+      set nomore
+      new Xfoo
+      call setline(1, 'foo3')
+      new Xbar
+      call setline(1, 'bar3')
+      wincmd b
+    ]])
+    feed(':confirm qall\n')
+    screen:expect([[
+      bar3                                                                       |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:Xbar [+]                                                                   }|
+      foo3                                                                       |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:Xfoo [+]                                                                   }|
+                                                                                 |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {1:                                                                           }|
+      :confirm qall                                                              |
+      {3:Save changes to "Xbar"?}                                                    |
+      {3:[Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: }^                         |
+    ]])
+    feed('D')
+    poke_eventloop()
+
+    eq('foo2\n', read_file('Xfoo'))
+    eq('bar2\n', read_file('Xbar'))
+
+    -- Test for saving and discarding changes to some buffers
+    start_new()
+    exec([[
+      set nomore
+      new Xfoo
+      call setline(1, 'foo4')
+      new Xbar
+      call setline(1, 'bar4')
+      wincmd b
+    ]])
+    feed(':confirm qall\n')
+    screen:expect([[
+      bar4                                                                       |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:Xbar [+]                                                                   }|
+      foo4                                                                       |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:Xfoo [+]                                                                   }|
+                                                                                 |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {1:                                                                           }|
+      :confirm qall                                                              |
+      {3:Save changes to "Xbar"?}                                                    |
+      {3:[Y]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: }^                         |
+    ]])
+    feed('N')
+    screen:expect([[
+      bar4                                                                       |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:Xbar [+]                                                                   }|
+      foo4                                                                       |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:Xfoo [+]                                                                   }|
+                                                                                 |
+      {1:                                                                           }|
+      :confirm qall                                                              |
+      {3:Save changes to "Xbar"?}                                                    |
+                                                                                 |
+      {3:Save changes to "Xfoo"?}                                                    |
+      {3:[Y]es, (N)o, (C)ancel: }^                                                    |
+    ]])
+    feed('Y')
+    poke_eventloop()
+
+    eq('foo4\n', read_file('Xfoo'))
+    eq('bar2\n', read_file('Xbar'))
+
+    os.remove('Xfoo')
+    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)