Merge remote-tracking branch 'upstream/master' into usermarks

4 files changed, 181 insertions, 2 deletions

diff --git a/test/functional/editor/completion_spec.lua b/test/functional/editor/completion_spec.lua
index 6cdac3c079..c503d7ebfb 100644
--- a/test/functional/editor/completion_spec.lua
+++ b/test/functional/editor/completion_spec.lua
@@ -1029,7 +1029,8 @@ describe('completion', function()
     ]])
   end)
 
-  it('TextChangedP autocommand', function()
+  -- oldtest: Test_ChangedP()
+  it('TextChangedI and TextChangedP autocommands', function()
     curbufmeths.set_lines(0, 1, false, { 'foo', 'bar', 'foobar'})
     source([[
       set complete=. completeopt=menuone
@@ -1128,6 +1129,49 @@ describe('completion', function()
       call cursor(4, 1)
     ]])
 
+    -- v:event.size should be set with ext_popupmenu #20646
+    screen:set_option('ext_popupmenu', true)
+    feed('Sf<C-N>')
+    screen:expect({grid = [[
+      foo                                                         |
+      bar                                                         |
+      foobar                                                      |
+      f^                                                           |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {3:-- Keyword completion (^N^P) }{5:Back at original}               |
+    ]], popupmenu = {
+      anchor = { 1, 3, 0 },
+      items = { { "foo", "", "", "" }, { "foobar", "", "", "" } },
+      pos = -1
+    }})
+    eq({completed_item = {}, width = 0,
+      height = 2, size = 2,
+      col = 0, row = 4, scrollbar = false},
+      eval('g:event'))
+    feed('oob')
+    screen:expect({grid = [[
+      foo                                                         |
+      bar                                                         |
+      foobar                                                      |
+      foob^                                                        |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {3:-- Keyword completion (^N^P) }{5:Back at original}               |
+    ]], popupmenu = {
+      anchor = { 1, 3, 0 },
+      items = { { "foobar", "", "", "" } },
+      pos = -1
+    }})
+    eq({completed_item = {}, width = 0,
+      height = 1, size = 1,
+      col = 0, row = 4, scrollbar = false},
+      eval('g:event'))
+    feed('<Esc>')
+    screen:set_option('ext_popupmenu', false)
+
     feed('Sf<C-N>')
     screen:expect([[
       foo                                                         |
diff --git a/test/functional/editor/mark_spec.lua b/test/functional/editor/mark_spec.lua
index 2440867c6e..f300fea3a0 100644
--- a/test/functional/editor/mark_spec.lua
+++ b/test/functional/editor/mark_spec.lua
@@ -330,7 +330,7 @@ describe('named marks view', function()
     os.remove(file2)
   end)
 
-  it('is restored', function()
+  it('is restored in normal mode but not op-pending mode', function()
       local screen = Screen.new(5, 8)
       screen:attach()
       command("edit " .. file1)
@@ -358,6 +358,18 @@ describe('named marks view', function()
       8 line      |
                   |
       ]])
+      -- not in op-pending mode #20886
+      feed("ggj=`a")
+      screen:expect([[
+      1 line      |
+      ^2 line      |
+      3 line      |
+      4 line      |
+      5 line      |
+      6 line      |
+      7 line      |
+                  |
+      ]])
   end)
 
   it('is restored across files', function()
diff --git a/test/functional/editor/tabpage_spec.lua b/test/functional/editor/tabpage_spec.lua
index 849a02c28b..a7f629a76b 100644
--- a/test/functional/editor/tabpage_spec.lua
+++ b/test/functional/editor/tabpage_spec.lua
@@ -9,6 +9,9 @@ local feed = helpers.feed
 local eval = helpers.eval
 local exec = helpers.exec
 local funcs = helpers.funcs
+local meths = helpers.meths
+local curwin = helpers.curwin
+local assert_alive = helpers.assert_alive
 
 describe('tabpage', function()
   before_each(clear)
@@ -54,6 +57,45 @@ describe('tabpage', function()
     neq(999, eval('g:win_closed'))
   end)
 
+  it('no segfault with strange WinClosed autocommand #20290', function()
+    pcall(exec, [[
+      set nohidden
+      edit Xa
+      split Xb
+      tab split
+      new
+      autocmd WinClosed * tabprev | bwipe!
+      close
+    ]])
+    assert_alive()
+  end)
+
+  it('nvim_win_close and nvim_win_hide update tabline #20285', function()
+    eq(1, #meths.list_tabpages())
+    eq({1, 1}, funcs.win_screenpos(0))
+    local win1 = curwin().id
+
+    command('tabnew')
+    eq(2, #meths.list_tabpages())
+    eq({2, 1}, funcs.win_screenpos(0))
+    local win2 = curwin().id
+
+    meths.win_close(win1, true)
+    eq(win2, curwin().id)
+    eq(1, #meths.list_tabpages())
+    eq({1, 1}, funcs.win_screenpos(0))
+
+    command('tabnew')
+    eq(2, #meths.list_tabpages())
+    eq({2, 1}, funcs.win_screenpos(0))
+    local win3 = curwin().id
+
+    meths.win_hide(win2)
+    eq(win3, curwin().id)
+    eq(1, #meths.list_tabpages())
+    eq({1, 1}, funcs.win_screenpos(0))
+  end)
+
   it('switching tabpage after setting laststatus=3 #19591', function()
     local screen = Screen.new(40, 8)
     screen:set_default_attr_ids({
@@ -102,4 +144,10 @@ describe('tabpage', function()
     command('     silent      :keepalt   :: :::    silent!    -2    tabmove')
     eq(1, funcs.nvim_tabpage_get_number(0))
   end)
+
+  it(':tabs does not overflow IObuff with long path with comma #20850', function()
+    meths.buf_set_name(0, ('x'):rep(1024) .. ',' .. ('x'):rep(1024))
+    command('tabs')
+    assert_alive()
+  end)
 end)
diff --git a/test/functional/editor/undo_spec.lua b/test/functional/editor/undo_spec.lua
index a041428cdc..d66ab352ef 100644
--- a/test/functional/editor/undo_spec.lua
+++ b/test/functional/editor/undo_spec.lua
@@ -9,6 +9,8 @@ local feed = helpers.feed
 local feed_command = helpers.feed_command
 local insert = helpers.insert
 local funcs = helpers.funcs
+local exec = helpers.exec
+local exec_lua = helpers.exec_lua
 
 local function lastmessage()
   local messages = funcs.split(funcs.execute('messages'), '\n')
@@ -67,6 +69,79 @@ describe('u CTRL-R g- g+', function()
     undo_and_redo(4, 'u', '<C-r>', '1')
     undo_and_redo(4, 'g-', 'g+', '1')
   end)
+
+  describe('undo works correctly when writing in Insert mode', function()
+    before_each(function()
+      exec([[
+        edit Xtestfile.txt
+        set undolevels=100 undofile
+        write
+      ]])
+    end)
+
+    after_each(function()
+      command('bwipe!')
+      os.remove('Xtestfile.txt')
+      os.remove('Xtestfile.txt.un~')
+    end)
+
+    -- oldtest: Test_undo_after_write()
+    it('using <Cmd> mapping', function()
+      command('imap . <Cmd>write<CR>')
+      feed('Otest.<CR>boo!!!<Esc>')
+      expect([[
+        test
+        boo!!!
+        ]])
+
+      feed('u')
+      expect([[
+        test
+        ]])
+
+      feed('u')
+      expect('')
+    end)
+
+    it('using Lua mapping', function()
+      exec_lua([[
+        vim.api.nvim_set_keymap('i', '.', '', {callback = function()
+          vim.cmd('write')
+        end})
+      ]])
+      feed('Otest.<CR>boo!!!<Esc>')
+      expect([[
+        test
+        boo!!!
+        ]])
+
+      feed('u')
+      expect([[
+        test
+        ]])
+
+      feed('u')
+      expect('')
+    end)
+
+    it('using RPC call', function()
+      feed('Otest')
+      command('write')
+      feed('<CR>boo!!!<Esc>')
+      expect([[
+        test
+        boo!!!
+        ]])
+
+      feed('u')
+      expect([[
+        test
+        ]])
+
+      feed('u')
+      expect('')
+    end)
+  end)
 end)
 
 describe(':undo! command', function()