From d4d27c41b3298c25ae62bc067472bef37bc61c99 Mon Sep 17 00:00:00 2001
From: Axel Forsman <axelsfor@gmail.com>
Date: Mon, 22 Aug 2022 06:48:18 +0200
Subject: fix(edit.c): indentkeys double indent after "!" #12894

which is both unexpected and different from the Vim behaviour.

Indent was triggered once by the '!' check in insert_execute(), and
inserting the char was correctly skipped, but then triggered again in
insert_check() (provided that cindent was not being ignored after manual
indentation, i.e. `can_cindent == true`).

While this is the smallest fix, another solution would be to remove
VimState#check and instead move that to *_enter()/-_execute(), since the
control flow is pretty unnecessarily convoluted as is. That would also
have the benefit of differing less from the Vim source code.
---
 test/functional/editor/mode_insert_spec.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'test')

diff --git a/test/functional/editor/mode_insert_spec.lua b/test/functional/editor/mode_insert_spec.lua
index e3d3cdbd85..cd51a65be3 100644
--- a/test/functional/editor/mode_insert_spec.lua
+++ b/test/functional/editor/mode_insert_spec.lua
@@ -6,12 +6,20 @@ local expect = helpers.expect
 local command = helpers.command
 local eq = helpers.eq
 local eval = helpers.eval
+local curbuf_contents = helpers.curbuf_contents
 
 describe('insert-mode', function()
   before_each(function()
     clear()
   end)
 
+  it('indents only once after "!" keys #12894', function()
+    command('let counter = []')
+    command('set indentexpr=len(add(counter,0))')
+    feed('i<C-F>x')
+    eq(' x', curbuf_contents())
+  end)
+
   it('CTRL-@', function()
     -- Inserts last-inserted text, leaves insert-mode.
     insert('hello')
-- 
cgit 


From 15a768eeb02e2af39eead1ea1eb4a5a60710d6fb Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 22 Aug 2022 18:06:18 +0800
Subject: fix(api): avoid side effects with nvim_parse_cmd (#19890)

Save and restore the cursor and last search pattern and do not change
search history.
---
 test/functional/api/vim_spec.lua | 49 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'test')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 72a03c409a..24d0b6da45 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -3668,6 +3668,55 @@ describe('API', function()
         :^                                                           |
       ]])
     end)
+    it('does not move cursor or change search history/pattern #19878 #19890', function()
+      meths.buf_set_lines(0, 0, -1, true, {'foo', 'bar', 'foo', 'bar'})
+      eq({1, 0}, meths.win_get_cursor(0))
+      eq('', funcs.getreg('/'))
+      eq('', funcs.histget('search'))
+      feed(':')  -- call the API in cmdline mode to test whether it changes search history
+      eq({
+        cmd = 'normal',
+        args = {'x'},
+        bang = true,
+        range = {3, 4},
+        count = -1,
+        reg = '',
+        addr = 'line',
+        magic = {
+          file = false,
+          bar = false,
+        },
+        nargs = '+',
+        nextcmd = '',
+        mods = {
+          browse = false,
+          confirm = false,
+          emsg_silent = false,
+          filter = {
+            pattern = "",
+            force = false,
+          },
+          hide = false,
+          keepalt = false,
+          keepjumps = false,
+          keepmarks = false,
+          keeppatterns = false,
+          lockmarks = false,
+          noautocmd = false,
+          noswapfile = false,
+          sandbox = false,
+          silent = false,
+          split = "",
+          tab = 0,
+          unsilent = false,
+          verbose = -1,
+          vertical = false,
+        }
+      }, meths.parse_cmd('+2;/bar/normal! x', {}))
+      eq({1, 0}, meths.win_get_cursor(0))
+      eq('', funcs.getreg('/'))
+      eq('', funcs.histget('search'))
+    end)
   end)
   describe('nvim_cmd', function()
     it('works', function ()
-- 
cgit 


From 3c1d70f20b5d5bad3bec121e589187d15f325a9b Mon Sep 17 00:00:00 2001
From: Thomas Vigouroux <thomas.vigouroux@protonmail.com>
Date: Mon, 25 Jul 2022 12:23:04 +0200
Subject: feat(treesitter): allow customizing language symbol name

---
 test/functional/treesitter/language_spec.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/treesitter/language_spec.lua b/test/functional/treesitter/language_spec.lua
index 30585be328..5eb72471c3 100644
--- a/test/functional/treesitter/language_spec.lua
+++ b/test/functional/treesitter/language_spec.lua
@@ -10,7 +10,7 @@ local pending_c_parser = helpers.pending_c_parser
 
 before_each(clear)
 
-describe('treesitter API', function()
+describe('treesitter language API', function()
   -- error tests not requiring a parser library
   it('handles missing language', function()
     eq("Error executing lua: .../language.lua:0: no parser for 'borklang' language, see :help treesitter-parsers",
@@ -26,6 +26,9 @@ describe('treesitter API', function()
 
     eq("Error executing lua: .../language.lua:0: no parser for 'borklang' language, see :help treesitter-parsers",
        pcall_err(exec_lua, "parser = vim.treesitter.inspect_language('borklang')"))
+
+    matches("Error executing lua: Failed to load parser: uv_dlsym: .+",
+       pcall_err(exec_lua, "parser = vim.treesitter.require_language('c', nil, false, 'borklang')"))
   end)
 
   it('inspects language', function()
-- 
cgit 


From 2fd25fb909fd4472c46c8c3c652b21d70bac9e77 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 23 Aug 2022 07:20:23 +0800
Subject: vim-patch:8.1.0832: confirm() is not tested (#19896)

Problem:    confirm() is not tested.
Solution:   Add a test. (Dominique Pelle, closes vim/vim#3868)
https://github.com/vim/vim/commit/2e0500921891e4fec57e97d3c0021aa2d2b4d7ae
---
 test/functional/vimscript/input_spec.lua | 77 +++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/vimscript/input_spec.lua b/test/functional/vimscript/input_spec.lua
index 554d15e550..d6ab71b7d5 100644
--- a/test/functional/vimscript/input_spec.lua
+++ b/test/functional/vimscript/input_spec.lua
@@ -8,7 +8,8 @@ local clear = helpers.clear
 local source = helpers.source
 local command = helpers.command
 local exc_exec = helpers.exc_exec
-local nvim_async = helpers.nvim_async
+local pcall_err = helpers.pcall_err
+local async_meths = helpers.async_meths
 local NIL = helpers.NIL
 
 local screen
@@ -449,6 +450,78 @@ describe('inputdialog()', function()
 end)
 
 describe('confirm()', function()
+  -- oldtest: Test_confirm()
+  it('works', function()
+    meths.set_option('more', false)  -- Avoid hit-enter prompt
+    meths.set_option('laststatus', 2)
+    -- screen:expect() calls are needed to avoid feeding input too early
+    screen:expect({any = 'No Name'})
+
+    async_meths.command([[let a = confirm('Press O to proceed')]])
+    screen:expect({any = '{CONFIRM:.+: }'})
+    feed('o')
+    screen:expect({any = 'No Name'})
+    eq(1, meths.get_var('a'))
+
+    async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
+    screen:expect({any = '{CONFIRM:.+: }'})
+    feed('y')
+    screen:expect({any = 'No Name'})
+    eq(1, meths.get_var('a'))
+
+    async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
+    screen:expect({any = '{CONFIRM:.+: }'})
+    feed('n')
+    screen:expect({any = 'No Name'})
+    eq(2, meths.get_var('a'))
+
+    -- Not possible to match Vim's CTRL-C test here as CTRL-C always sets got_int in Nvim.
+
+    -- confirm() should return 0 when pressing ESC.
+    async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
+    screen:expect({any = '{CONFIRM:.+: }'})
+    feed('<Esc>')
+    screen:expect({any = 'No Name'})
+    eq(0, meths.get_var('a'))
+
+    -- Default choice is returned when pressing <CR>.
+    async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
+    screen:expect({any = '{CONFIRM:.+: }'})
+    feed('<CR>')
+    screen:expect({any = 'No Name'})
+    eq(1, meths.get_var('a'))
+
+    async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No", 2)]])
+    screen:expect({any = '{CONFIRM:.+: }'})
+    feed('<CR>')
+    screen:expect({any = 'No Name'})
+    eq(2, meths.get_var('a'))
+
+    async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No", 0)]])
+    screen:expect({any = '{CONFIRM:.+: }'})
+    feed('<CR>')
+    screen:expect({any = 'No Name'})
+    eq(0, meths.get_var('a'))
+
+    -- Test with the {type} 4th argument
+    for _, type in ipairs({'Error', 'Question', 'Info', 'Warning', 'Generic'}) do
+      async_meths.command(([[let a = confirm('Are you sure?', "&Yes\n&No", 1, '%s')]]):format(type))
+      screen:expect({any = '{CONFIRM:.+: }'})
+      feed('y')
+      screen:expect({any = 'No Name'})
+      eq(1, meths.get_var('a'))
+    end
+
+    eq('Vim(call):E730: using List as a String',
+       pcall_err(command, 'call confirm([])'))
+    eq('Vim(call):E730: using List as a String',
+       pcall_err(command, 'call confirm("Are you sure?", [])'))
+    eq('Vim(call):E745: Using a List as a Number',
+       pcall_err(command, 'call confirm("Are you sure?", "&Yes\n&No\n", [])'))
+    eq('Vim(call):E730: using List as a String',
+       pcall_err(command, 'call confirm("Are you sure?", "&Yes\n&No\n", 0, [])'))
+  end)
+
   it("shows dialog even if :silent #8788", function()
     command("autocmd BufNewFile * call confirm('test')")
 
@@ -483,7 +556,7 @@ describe('confirm()', function()
     feed(':call nvim_command("edit x")<cr>')
     check_and_clear(':call nvim_command("edit |\n')
 
-    nvim_async('command', 'edit x')
+    async_meths.command('edit x')
     check_and_clear('                         |\n')
   end)
 end)
-- 
cgit 


From d5328ea408d93d53b46417a65ca3b2fc99ab64b6 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 23 Aug 2022 10:38:53 +0800
Subject: vim-patch:8.2.0522: several errors are not tested for (#19901)

Problem:    Several errors are not tested for.
Solution:   Add tests. (Yegappan Lakshmanan, closes vim/vim#5892)
https://github.com/vim/vim/commit/ee4e0c1e9a81cb5d96e0060203a9033c2f28588e

Omit Test_range() change: reverted in patch 8.2.0615.
Cherry-pick Test_z_no_space_before_xxx() from patch 8.2.0195.
Cherry-pick Test_reverse_sort_uniq() change from patch 8.2.0183.
Make uniq() error behavior consistent with sort().
Cherry-pick Test_set_ttytype() change from patch 8.1.1826.
Cherry-pick quickfix checks from patch 8.1.2373 to test_preview.vim.
Test_viminfo_error() is applicable.
Cherry-pick E1058 from patch 8.2.0149 and port Test_deep_nest() to Lua.
---
 test/functional/vimscript/eval_spec.lua  | 75 ++++++++++++++++++++++++++++++++
 test/functional/vimscript/input_spec.lua | 20 ++++-----
 2 files changed, 85 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/functional/vimscript/eval_spec.lua b/test/functional/vimscript/eval_spec.lua
index 0c2ca8de78..65ac5b8c80 100644
--- a/test/functional/vimscript/eval_spec.lua
+++ b/test/functional/vimscript/eval_spec.lua
@@ -10,11 +10,13 @@
 --    test/functional/vimscript/functions_spec.lua
 
 local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
 
 local lfs = require('lfs')
 local clear = helpers.clear
 local eq = helpers.eq
 local exc_exec = helpers.exc_exec
+local exec = helpers.exec
 local eval = helpers.eval
 local command = helpers.command
 local write_file = helpers.write_file
@@ -144,3 +146,76 @@ describe('List support code', function()
     end
   end)
 end)
+
+-- oldtest: Test_deep_nest()
+it('Error when if/for/while/try/function is nested too deep',function()
+  clear()
+  local screen = Screen.new(80, 24)
+  screen:attach()
+  meths.set_option('laststatus', 2)
+  exec([[
+    " Deep nesting of if ... endif
+    func Test1()
+      let @a = join(repeat(['if v:true'], 51), "\n")
+      let @a ..= "\n"
+      let @a ..= join(repeat(['endif'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+
+    " Deep nesting of for ... endfor
+    func Test2()
+      let @a = join(repeat(['for i in [1]'], 51), "\n")
+      let @a ..= "\n"
+      let @a ..= join(repeat(['endfor'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+
+    " Deep nesting of while ... endwhile
+    func Test3()
+      let @a = join(repeat(['while v:true'], 51), "\n")
+      let @a ..= "\n"
+      let @a ..= join(repeat(['endwhile'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+
+    " Deep nesting of try ... endtry
+    func Test4()
+      let @a = join(repeat(['try'], 51), "\n")
+      let @a ..= "\necho v:true\n"
+      let @a ..= join(repeat(['endtry'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+
+    " Deep nesting of function ... endfunction
+    func Test5()
+      let @a = join(repeat(['function X()'], 51), "\n")
+      let @a ..= "\necho v:true\n"
+      let @a ..= join(repeat(['endfunction'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+  ]])
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test1()<CR>')
+  screen:expect({any = 'E579: '})
+  feed('<C-C>')
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test2()<CR>')
+  screen:expect({any = 'E585: '})
+  feed('<C-C>')
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test3()<CR>')
+  screen:expect({any = 'E585: '})
+  feed('<C-C>')
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test4()<CR>')
+  screen:expect({any = 'E601: '})
+  feed('<C-C>')
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test5()<CR>')
+  screen:expect({any = 'E1058: '})
+end)
diff --git a/test/functional/vimscript/input_spec.lua b/test/functional/vimscript/input_spec.lua
index d6ab71b7d5..f50b39c2c5 100644
--- a/test/functional/vimscript/input_spec.lua
+++ b/test/functional/vimscript/input_spec.lua
@@ -455,24 +455,24 @@ describe('confirm()', function()
     meths.set_option('more', false)  -- Avoid hit-enter prompt
     meths.set_option('laststatus', 2)
     -- screen:expect() calls are needed to avoid feeding input too early
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
 
     async_meths.command([[let a = confirm('Press O to proceed')]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('o')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(1, meths.get_var('a'))
 
-    async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
+    async_meths.command([[let a = 'Are you sure?'->confirm("&Yes\n&No")]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('y')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(1, meths.get_var('a'))
 
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('n')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(2, meths.get_var('a'))
 
     -- Not possible to match Vim's CTRL-C test here as CTRL-C always sets got_int in Nvim.
@@ -481,26 +481,26 @@ describe('confirm()', function()
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('<Esc>')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(0, meths.get_var('a'))
 
     -- Default choice is returned when pressing <CR>.
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('<CR>')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(1, meths.get_var('a'))
 
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No", 2)]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('<CR>')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(2, meths.get_var('a'))
 
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No", 0)]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('<CR>')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(0, meths.get_var('a'))
 
     -- Test with the {type} 4th argument
@@ -508,7 +508,7 @@ describe('confirm()', function()
       async_meths.command(([[let a = confirm('Are you sure?', "&Yes\n&No", 1, '%s')]]):format(type))
       screen:expect({any = '{CONFIRM:.+: }'})
       feed('y')
-      screen:expect({any = 'No Name'})
+      screen:expect({any = '%[No Name%]'})
       eq(1, meths.get_var('a'))
     end
 
-- 
cgit 


From 63df91c10a7ec492adae91c78cb51eb231c77d89 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 23 Aug 2022 11:24:46 +0800
Subject: vim-patch:8.2.1046: insufficient tests for src/buffer.c (#19903)

Problem:    Insufficient tests for src/buffer.c.
Solution:   Add more tests.  Move comments related tests to a separate file.
            (Yegappan Lakshmanan, closes vim/vim#6325)
https://github.com/vim/vim/commit/b7e2483655d9b68df0c7349918027d800051a28a
---
 test/functional/legacy/buffer_spec.lua | 59 ++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 test/functional/legacy/buffer_spec.lua

(limited to 'test')

diff --git a/test/functional/legacy/buffer_spec.lua b/test/functional/legacy/buffer_spec.lua
new file mode 100644
index 0000000000..acaa9a51f1
--- /dev/null
+++ b/test/functional/legacy/buffer_spec.lua
@@ -0,0 +1,59 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear, source = helpers.clear, helpers.source
+local call, eq, meths = helpers.call, helpers.eq, helpers.meths
+
+local function expected_empty()
+  eq({}, meths.get_vvar('errors'))
+end
+
+describe('buffer', function()
+  before_each(function()
+    clear()
+    meths.ui_attach(80, 24, {})
+    meths.set_option('hidden', false)
+  end)
+
+  it('deleting a modified buffer with :confirm', function()
+    source([[
+      func Test_bdel_with_confirm()
+        new
+        call setline(1, 'test')
+        call assert_fails('bdel', 'E89:')
+        call nvim_input('c')
+        confirm bdel
+        call assert_equal(2, winnr('$'))
+        call assert_equal(1, &modified)
+        call nvim_input('n')
+        confirm bdel
+        call assert_equal(1, winnr('$'))
+      endfunc
+    ]])
+    call('Test_bdel_with_confirm')
+    expected_empty()
+  end)
+
+  it('editing another buffer from a modified buffer with :confirm', function()
+    source([[
+      func Test_goto_buf_with_confirm()
+        new Xfile
+        enew
+        call setline(1, 'test')
+        call assert_fails('b Xfile', 'E37:')
+        call nvim_input('c')
+        call assert_fails('confirm b Xfile', 'E37:')
+        call assert_equal(1, &modified)
+        call assert_equal('', @%)
+        call nvim_input('y')
+        call assert_fails('confirm b Xfile', 'E37:')
+        call assert_equal(1, &modified)
+        call assert_equal('', @%)
+        call nvim_input('n')
+        confirm b Xfile
+        call assert_equal('Xfile', @%)
+        close!
+      endfunc
+    ]])
+    call('Test_goto_buf_with_confirm')
+    expected_empty()
+  end)
+end)
-- 
cgit 


From 42e9fe7d958e0ba025034c330d8e29293d828b60 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 23 Aug 2022 11:39:25 +0800
Subject: test: add test for using :normal to stop Visual mode in cmdwin
 (#19904)

---
 test/functional/ex_cmds/normal_spec.lua | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/ex_cmds/normal_spec.lua b/test/functional/ex_cmds/normal_spec.lua
index f6e7dd2b3a..009f1d6516 100644
--- a/test/functional/ex_cmds/normal_spec.lua
+++ b/test/functional/ex_cmds/normal_spec.lua
@@ -1,6 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local command = helpers.command
+local funcs = helpers.funcs
 local feed = helpers.feed
 local expect = helpers.expect
 local eq = helpers.eq
@@ -8,20 +9,30 @@ local eval = helpers.eval
 
 before_each(clear)
 
-describe(':normal', function()
+describe(':normal!', function()
   it('can get out of Insert mode if called from Ex mode #17924', function()
     feed('gQnormal! Ifoo<CR>')
     expect('foo')
   end)
 
-  it('normal! does not execute command in Ex mode when running out of characters', function()
+  it('does not execute command in Ex mode when running out of characters', function()
     command('let g:var = 0')
     command('normal! gQlet g:var = 1')
     eq(0, eval('g:var'))
   end)
 
-  it('normal! gQinsert does not hang #17980', function()
+  it('gQinsert does not hang #17980', function()
     command('normal! gQinsert')
     expect('')
   end)
+
+  it('can stop Visual mode without closing cmdwin vim-patch:9.0.0234', function()
+    feed('q:')
+    feed('v')
+    eq('v', funcs.mode(1))
+    eq(':', funcs.getcmdwintype())
+    command('normal! \027')
+    eq('n', funcs.mode(1))
+    eq(':', funcs.getcmdwintype())
+  end)
 end)
-- 
cgit 


From ffa1335047047ac00280ac742bcc6dfcc7fa3589 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 20 Aug 2022 07:54:14 +0800
Subject: vim-patch:8.2.4726: cannot use expand() to get the script name

Problem:    Cannot use expand() to get the script name.
Solution:   Support expand('<script>'). (closes vim/vim#10121)
https://github.com/vim/vim/commit/6013d0045dec7ca7c0068fbe186c42d754a7368b

Use `.sn_name` instead of `->sn_name` as v8.2.0154 hasn't been ported.
Cherry-pick builtin.txt expand() doc from latest Vim.
---
 test/functional/ex_cmds/source_spec.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'test')

diff --git a/test/functional/ex_cmds/source_spec.lua b/test/functional/ex_cmds/source_spec.lua
index 163ded43f9..cd1f43f9fd 100644
--- a/test/functional/ex_cmds/source_spec.lua
+++ b/test/functional/ex_cmds/source_spec.lua
@@ -166,6 +166,7 @@ describe(':source', function()
       vim.g.sourced_lua = 1
       vim.g.sfile_value = vim.fn.expand('<sfile>')
       vim.g.stack_value = vim.fn.expand('<stack>')
+      vim.g.script_value = vim.fn.expand('<script>')
     ]])
 
     command('set shellslash')
@@ -173,6 +174,7 @@ describe(':source', function()
     eq(1, eval('g:sourced_lua'))
     matches([[/test%.lua$]], meths.get_var('sfile_value'))
     matches([[/test%.lua$]], meths.get_var('stack_value'))
+    matches([[/test%.lua$]], meths.get_var('script_value'))
 
     os.remove(test_file)
   end)
@@ -214,6 +216,7 @@ describe(':source', function()
        "\ 2]=]
       vim.g.sfile_value = vim.fn.expand('<sfile>')
       vim.g.stack_value = vim.fn.expand('<stack>')
+      vim.g.script_value = vim.fn.expand('<script>')
     ]])
 
     command('edit '..test_file)
@@ -223,6 +226,7 @@ describe(':source', function()
     eq('    \\ 1\n   "\\ 2', exec_lua('return _G.a'))
     eq(':source (no file)', meths.get_var('sfile_value'))
     eq(':source (no file)', meths.get_var('stack_value'))
+    eq(':source (no file)', meths.get_var('script_value'))
 
     os.remove(test_file)
   end)
-- 
cgit 


From 6cc6e11929ad76a2dc5204aed95cb9ed1dafde23 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 23 Aug 2022 22:00:19 +0800
Subject: vim-patch:9.0.0206: redraw flags are not named specifically (#19913)

Problem:    Redraw flags are not named specifically.
Solution:   Prefix "UPD_" to the flags, for UPDate_screen().
https://github.com/vim/vim/commit/a4d158b3c839e96ed98ff87c7b7124ff4518c4ff
---
 test/functional/ui/messages_spec.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 2cff7c1cf4..522c9ccba2 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -1077,10 +1077,10 @@ vimComment     xxx match /\s"[^\-:.%#=*].*$/ms=s+1,lc=1  excludenl contains=@vim
     ]]}
   end)
 
-  it('redraws NOT_VALID correctly after message', function()
-    -- edge case: only one window was set NOT_VALID. Original report
+  it('redraws UPD_NOT_VALID correctly after message', function()
+    -- edge case: only one window was set UPD_NOT_VALID. Original report
     -- used :make, but fake it using one command to set the current
-    -- window NOT_VALID and another to show a long message.
+    -- window UPD_NOT_VALID and another to show a long message.
     command("set more")
     feed(':new<cr><c-w><c-w>')
     screen:expect{grid=[[
-- 
cgit 


From 9a100ee169f80cbfe45872939ed9b4f70f6bfe3f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 24 Aug 2022 10:28:32 +0800
Subject: fix(cmdline): do not trigger completion at wrong time (#19920)

Cherry-picked from Vim patches 8.2.4339, 9.0.0238.
---
 test/functional/ui/popupmenu_spec.lua | 16 ++++++++++
 test/functional/ui/wildmode_spec.lua  | 58 ++++++++++++++++++++++++++++++++---
 2 files changed, 70 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
index e11cd1e859..dcd4ad3d9a 100644
--- a/test/functional/ui/popupmenu_spec.lua
+++ b/test/functional/ui/popupmenu_spec.lua
@@ -1990,6 +1990,22 @@ describe('builtin popupmenu', function()
       efine unplace^                   |
     ]])
 
+    -- Pressing <Left> after that should move the cursor
+    feed('<Left>')
+    screen:expect([[
+                                      |
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {4:                                }|
+      :sign define jump list place und|
+      efine unplac^e                   |
+    ]])
+    feed('<End>')
+
     -- Pressing <C-D> when the popup menu is displayed should remove the popup
     -- menu
     feed('<C-U>sign <Tab><C-D>')
diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua
index 98398bc7a1..58ffa3bda8 100644
--- a/test/functional/ui/wildmode_spec.lua
+++ b/test/functional/ui/wildmode_spec.lua
@@ -461,20 +461,20 @@ end)
 describe('command line completion', function()
   local screen
   before_each(function()
+    clear()
     screen = Screen.new(40, 5)
     screen:set_default_attr_ids({
      [1] = {bold = true, foreground = Screen.colors.Blue1},
      [2] = {foreground = Screen.colors.Grey0, background = Screen.colors.Yellow},
      [3] = {bold = true, reverse = true},
     })
+    screen:attach()
   end)
   after_each(function()
     os.remove('Xtest-functional-viml-compl-dir')
   end)
 
   it('lists directories with empty PATH', function()
-    clear()
-    screen:attach()
     local tmp = funcs.tempname()
     command('e '.. tmp)
     command('cd %:h')
@@ -491,8 +491,6 @@ describe('command line completion', function()
   end)
 
   it('completes env var names #9681', function()
-    clear()
-    screen:attach()
     command('let $XTEST_1 = "foo" | let $XTEST_2 = "bar"')
     command('set wildmenu wildmode=full')
     feed(':!echo $XTEST_<tab>')
@@ -521,6 +519,58 @@ describe('command line completion', function()
       :!echo $XTEST_1AaあB^                    |
     ]])
   end)
+
+  it('does not leak memory with <S-Tab> with wildmenu and only one match #19874', function()
+    meths.set_option('wildmenu', true)
+    meths.set_option('wildmode', 'full')
+    meths.set_option('wildoptions', 'pum')
+
+    feed(':sign unpla<S-Tab>')
+    screen:expect([[
+                                              |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      :sign unplace^                           |
+    ]])
+
+    feed('<Space>buff<Tab>')
+    screen:expect([[
+                                              |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      :sign unplace buffer=^                   |
+    ]])
+  end)
+
+  it('does not show matches with <S-Tab> without wildmenu with wildmode=full', function()
+    meths.set_option('wildmenu', false)
+    meths.set_option('wildmode', 'full')
+
+    feed(':sign <S-Tab>')
+    screen:expect([[
+                                              |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      :sign unplace^                           |
+    ]])
+  end)
+
+  it('shows matches with <S-Tab> without wildmenu with wildmode=list', function()
+    meths.set_option('wildmenu', false)
+    meths.set_option('wildmode', 'list')
+
+    feed(':sign <S-Tab>')
+    screen:expect([[
+      {3:                                        }|
+      :sign define                            |
+      define    list      undefine            |
+      jump      place     unplace             |
+      :sign unplace^                           |
+    ]])
+  end)
 end)
 
 describe('ui/ext_wildmenu', function()
-- 
cgit 


From a4e4609d62c38b7b949e5c8079dfa5f10803bdcd Mon Sep 17 00:00:00 2001
From: sigmaSd <bedisnbiba@gmail.com>
Date: Wed, 24 Aug 2022 07:38:06 +0100
Subject: fix(path): path_is_url returns false for "foo:/" #19797

Problem:
path_to_url() returns false for single-slash URIs ("foo:/" vs "foo://").
This is not compliant with the URI spec. https://url.spec.whatwg.org/#url-representation
LSP in particular allows single-slash URIs.

Solution:
Relax path_to_url() to accept single-slash URIs. This is not fully
compliant (only ":" is required by the spec), but it is hopefully good
enough without causing false-positives in typical text files.

ref https://url.spec.whatwg.org/#windows-drive-letter
ref https://github.com/neovim/neovim/pull/19773
ref https://github.com/neovim/neovim/pull/19773#issuecomment-1214763769
---
 test/unit/path_spec.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'test')

diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index fb476397e6..eb23a3cff1 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -640,6 +640,10 @@ describe('path.c', function()
       eq(2, path_with_url([[test-abc:\\xyz\foo\b3]]))
       eq(0, path_with_url([[-test://xyz/foo/b4]]))
       eq(0, path_with_url([[test-://xyz/foo/b5]]))
+      eq(1, path_with_url([[test-C:/xyz/foo/b5]]))
+      eq(1, path_with_url([[test-custom:/xyz/foo/b5]]))
+      eq(0, path_with_url([[c:/xyz/foo/b5]]))
+      eq(0, path_with_url([[C:/xyz/foo/b5]]))
     end)
   end)
 end)
-- 
cgit 


From f91b1885ddeaf971e17afe49b80f1b1412ecc8a2 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 24 Aug 2022 21:02:45 +0800
Subject: feat(eval)!: make Vim functions return inner window width and height
 (#19743)

In non-multigrid UI the only change is that the returned height now
excludes winbar, and this is compatible with Vim.

In multigrid UI this means the return value of these functions now
reflect the space available for buffer lines in a window.

No change in nvim_win_get_height() and nvim_win_get_width().
---
 test/functional/ui/multigrid_spec.lua | 11 +++++++++++
 test/functional/ui/winbar_spec.lua    |  7 +++++++
 2 files changed, 18 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/multigrid_spec.lua b/test/functional/ui/multigrid_spec.lua
index b30aa67fd3..78a1e8c677 100644
--- a/test/functional/ui/multigrid_spec.lua
+++ b/test/functional/ui/multigrid_spec.lua
@@ -3,7 +3,9 @@ local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
 local feed, command, insert = helpers.feed, helpers.command, helpers.insert
 local eq = helpers.eq
+local funcs = helpers.funcs
 local meths = helpers.meths
+local curwin = helpers.curwin
 local poke_eventloop = helpers.poke_eventloop
 
 
@@ -871,6 +873,15 @@ describe('ext_multigrid', function()
     before_each(function()
       screen:try_resize_grid(2, 60, 20)
     end)
+
+    it('winwidth() winheight() getwininfo() return inner width and height #19743', function()
+      eq(60, funcs.winwidth(0))
+      eq(20, funcs.winheight(0))
+      local win_info = funcs.getwininfo(curwin().id)[1]
+      eq(60, win_info.width)
+      eq(20, win_info.height)
+    end)
+
     it('gets written till grid width', function()
       insert(('a'):rep(60).."\n")
 
diff --git a/test/functional/ui/winbar_spec.lua b/test/functional/ui/winbar_spec.lua
index 8976c4371f..ece27ec3ff 100644
--- a/test/functional/ui/winbar_spec.lua
+++ b/test/functional/ui/winbar_spec.lua
@@ -7,6 +7,8 @@ local meths = helpers.meths
 local eq = helpers.eq
 local poke_eventloop = helpers.poke_eventloop
 local feed = helpers.feed
+local funcs = helpers.funcs
+local curwin = helpers.curwin
 local pcall_err = helpers.pcall_err
 
 describe('winbar', function()
@@ -48,6 +50,11 @@ describe('winbar', function()
       {3:~                                                           }|
                                                                   |
     ]])
+    -- winbar is excluded from the heights returned by winheight() and getwininfo()
+    eq(11, funcs.winheight(0))
+    local win_info = funcs.getwininfo(curwin().id)[1]
+    eq(11, win_info.height)
+    eq(1, win_info.winbar)
   end)
 
   it('works with custom \'fillchars\' value', function()
-- 
cgit 


From b1eaa2b9a3bae46f6dcbab8dc3a84e0044b11317 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 24 Aug 2022 14:41:31 +0100
Subject: feat(lua): add vim.iconv (#18286)

Co-authored-by: Justin M. Keyes <justinkz@gmail.com>
---
 test/functional/lua/vim_spec.lua | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index 2b249b7a69..f2fb661b70 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -2721,6 +2721,39 @@ describe('lua stdlib', function()
       ]]
     end)
   end)
+
+  describe('vim.iconv', function()
+    it('can convert strings', function()
+      eq('hello', exec_lua[[
+        return vim.iconv('hello', 'latin1', 'utf-8')
+      ]])
+    end)
+
+    it('can validate arguments', function()
+      eq({false, 'Expected at least 3 arguments'}, exec_lua[[
+        return {pcall(vim.iconv, 'hello')}
+      ]])
+
+      eq({false, 'bad argument #3 to \'?\' (expected string)'}, exec_lua[[
+        return {pcall(vim.iconv, 'hello', 'utf-8', true)}
+      ]])
+    end)
+
+    it('can handle bad encodings', function()
+      eq(NIL, exec_lua[[
+        return vim.iconv('hello', 'foo', 'bar')
+      ]])
+    end)
+
+    it('can handle strings with NUL bytes', function()
+      eq(7, exec_lua[[
+        local a = string.char(97, 98, 99, 0, 100, 101, 102) -- abc\0def
+        return string.len(vim.iconv(a, 'latin1', 'utf-8'))
+      ]])
+    end)
+
+  end)
+
 end)
 
 describe('lua: builtin modules', function()
-- 
cgit 


From 26ebf67c39d3776095706fafe34eea2e37013579 Mon Sep 17 00:00:00 2001
From: Thomas Vigouroux <thomas.vigouroux@protonmail.com>
Date: Wed, 24 Aug 2022 16:22:50 +0200
Subject: test(treesitter): make internal lang test pending when necessary

---
 test/functional/helpers.lua                  | 1 +
 test/functional/treesitter/language_spec.lua | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 981cfc306e..93fb0f245e 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -761,6 +761,7 @@ function module.pending_c_parser(pending_fn)
     pending_fn 'no C parser, skipping'
     return true
   end
+  module.exec_lua [[vim._ts_remove_language 'c']]
   return false
 end
 
diff --git a/test/functional/treesitter/language_spec.lua b/test/functional/treesitter/language_spec.lua
index 5eb72471c3..8aa8524a26 100644
--- a/test/functional/treesitter/language_spec.lua
+++ b/test/functional/treesitter/language_spec.lua
@@ -27,8 +27,10 @@ describe('treesitter language API', function()
     eq("Error executing lua: .../language.lua:0: no parser for 'borklang' language, see :help treesitter-parsers",
        pcall_err(exec_lua, "parser = vim.treesitter.inspect_language('borklang')"))
 
-    matches("Error executing lua: Failed to load parser: uv_dlsym: .+",
-       pcall_err(exec_lua, "parser = vim.treesitter.require_language('c', nil, false, 'borklang')"))
+    if not pending_c_parser(pending) then
+      matches("Error executing lua: Failed to load parser: uv_dlsym: .+",
+         pcall_err(exec_lua, 'vim.treesitter.require_language("c", nil, false, "borklang")'))
+   end
   end)
 
   it('inspects language', function()
-- 
cgit 


From 274e1122ade42095cd5b6416e70bda3aa0cb0423 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 25 Aug 2022 17:57:32 +0800
Subject: fix(usercmd): also check for whitespace after escaped character
 (#19942)

---
 test/functional/api/command_spec.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/command_spec.lua b/test/functional/api/command_spec.lua
index 890710b6e6..440e93da0e 100644
--- a/test/functional/api/command_spec.lua
+++ b/test/functional/api/command_spec.lua
@@ -114,8 +114,8 @@ describe('nvim_create_user_command', function()
     ]]
 
     eq({
-      args = [[this is    a\ test]],
-      fargs = {"this", "is", "a test"},
+      args = [[this\  is    a\ test]],
+      fargs = {"this ", "is", "a test"},
       bang = false,
       line1 = 1,
       line2 = 1,
@@ -144,7 +144,7 @@ describe('nvim_create_user_command', function()
       count = 2,
       reg = "",
     }, exec_lua [=[
-      vim.api.nvim_command([[CommandWithLuaCallback this is    a\ test]])
+      vim.api.nvim_command([[CommandWithLuaCallback this\  is    a\ test]])
       return result
     ]=])
 
-- 
cgit 


From 4ecea0e001533d68f3032fe0512fc55360f295c0 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 25 Aug 2022 19:35:17 +0800
Subject: vim-patch:8.2.0911: crash when opening a buffer for the cmdline
 window fails

Problem:    Crash when opening a buffer for the cmdline window fails. (Chris
            Barber)
Solution:   Check do_ecmd() succeeds.  Reset got_int if "q" was used at the
            more prompt. (closes vim/vim#6211)
https://github.com/vim/vim/commit/9b7cce28d568f0622d77c6c9878c2d4770c3b164

Make code match latest Vim instead.
---
 test/functional/legacy/cmdline_spec.lua | 79 +++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

(limited to 'test')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index cf02636890..fb054eed9a 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -1,6 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
+local command = helpers.command
 local feed = helpers.feed
 local feed_command = helpers.feed_command
 local exec = helpers.exec
@@ -141,3 +142,81 @@ describe('cmdline', function()
     ]])
   end)
 end)
+
+describe('cmdwin', function()
+  before_each(clear)
+
+  -- oldtest: Test_cmdwin_interrupted()
+  it('still uses a new buffer when interrupting more prompt on open', function()
+    local screen = Screen.new(30, 16)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {bold = true, reverse = true},  -- StatusLine
+      [2] = {reverse = true},  -- StatusLineNC
+      [3] = {bold = true, foreground = Screen.colors.SeaGreen},  -- MoreMsg
+      [4] = {bold = true},  -- ModeMsg
+    })
+    screen:attach()
+    command('set more')
+    command('autocmd WinNew * highlight')
+    feed('q:')
+    screen:expect({any = '{3:%-%- More %-%-}^'})
+    feed('q')
+    screen:expect([[
+                                    |
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {2:[No Name]                     }|
+      {0::}^                             |
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {1:[Command Line]                }|
+                                    |
+    ]])
+    feed([[aecho 'done']])
+    screen:expect([[
+                                    |
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {2:[No Name]                     }|
+      {0::}echo 'done'^                  |
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {1:[Command Line]                }|
+      {4:-- INSERT --}                  |
+    ]])
+    feed('<CR>')
+    screen:expect([[
+      ^                              |
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      done                          |
+    ]])
+  end)
+end)
-- 
cgit 


From 3aba4ba37859e4407eff2bb3f4d99c44b108ed79 Mon Sep 17 00:00:00 2001
From: Quentin Rasmont <qrasmont@gmail.com>
Date: Fri, 22 Apr 2022 21:50:52 +0200
Subject: feat(treesitter): upstream is_parent()

Util from the nvim-treesitter project.
Renamed is_parent to is_ancestor for clarity.
---
 test/functional/treesitter/utils_spec.lua | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 test/functional/treesitter/utils_spec.lua

(limited to 'test')

diff --git a/test/functional/treesitter/utils_spec.lua b/test/functional/treesitter/utils_spec.lua
new file mode 100644
index 0000000000..c5609501a7
--- /dev/null
+++ b/test/functional/treesitter/utils_spec.lua
@@ -0,0 +1,29 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local insert = helpers.insert
+local eq = helpers.eq
+local exec_lua = helpers.exec_lua
+
+before_each(clear)
+
+describe('treesitter utils', function()
+  clear()
+  it('can find an ancestor', function()
+    insert([[
+      int main() {
+        int x = 3;
+      }]])
+
+    exec_lua([[
+      parser = vim.treesitter.get_parser(0, "c")
+      tree = parser:parse()[1]
+      root = tree:root()
+      ancestor = root:child(0)
+      child = ancestor:child(0)
+    ]])
+
+    eq(true, exec_lua('return vim.treesitter.is_ancestor(ancestor, child)'))
+    eq(false, exec_lua('return vim.treesitter.is_ancestor(child, ancestor)'))
+  end)
+end)
-- 
cgit 


From 6b2d42eb0352d01923e4bf2e3ce0824c662b7be4 Mon Sep 17 00:00:00 2001
From: Quentin Rasmont <qrasmont@gmail.com>
Date: Sat, 30 Apr 2022 10:43:26 +0200
Subject: feat(treesitter): add ability to retreive a tree/node given a range

---
 test/functional/treesitter/language_spec.lua | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'test')

diff --git a/test/functional/treesitter/language_spec.lua b/test/functional/treesitter/language_spec.lua
index 8aa8524a26..b66a56264f 100644
--- a/test/functional/treesitter/language_spec.lua
+++ b/test/functional/treesitter/language_spec.lua
@@ -7,6 +7,7 @@ local exec_lua = helpers.exec_lua
 local pcall_err = helpers.pcall_err
 local matches = helpers.matches
 local pending_c_parser = helpers.pending_c_parser
+local insert = helpers.insert
 
 before_each(clear)
 
@@ -84,5 +85,33 @@ describe('treesitter language API', function()
     eq("Error executing lua: .../language.lua:0: no parser for 'borklang' language, see :help treesitter-parsers",
        pcall_err(exec_lua, "new_parser = vim.treesitter.get_parser(0)"))
   end)
+
+  it('retrieve the tree given a range', function ()
+    insert([[
+      int main() {
+        int x = 3;
+      }]])
+
+    exec_lua([[
+      langtree = vim.treesitter.get_parser(0, "c")
+      tree = langtree:tree_for_range({1, 3, 1, 3})
+    ]])
+
+    eq('<node translation_unit>', exec_lua('return tostring(tree:root())'))
+  end)
+
+  it('retrieve the node given a range', function ()
+    insert([[
+      int main() {
+        int x = 3;
+      }]])
+
+    exec_lua([[
+      langtree = vim.treesitter.get_parser(0, "c")
+      node = langtree:named_node_for_range({1, 3, 1, 3})
+    ]])
+
+    eq('<node primitive_type>', exec_lua('return tostring(node)'))
+  end)
 end)
 
-- 
cgit 


From a577fb778addb6eb305ade82a229b52673ced234 Mon Sep 17 00:00:00 2001
From: Quentin Rasmont <qrasmont@gmail.com>
Date: Sat, 30 Apr 2022 20:54:25 +0200
Subject: feat(treesitter): upstream get_named_children() as a node method

Util from the nvim-treesitter project.
---
 test/functional/treesitter/node_spec.lua | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'test')

diff --git a/test/functional/treesitter/node_spec.lua b/test/functional/treesitter/node_spec.lua
index 21c287644e..b9ad4925c9 100644
--- a/test/functional/treesitter/node_spec.lua
+++ b/test/functional/treesitter/node_spec.lua
@@ -59,4 +59,22 @@ describe('treesitter node API', function()
     exec_lua 'node = node:prev_named_sibling()'
     eq('int x', lua_eval('node_text(node)'))
   end)
+
+  it('can retrieve the children of a node', function()
+    insert([[
+      int main() {
+        int x = 3;
+      }]])
+
+    local len = exec_lua([[
+      tree = vim.treesitter.get_parser(0, "c"):parse()[1]
+      node = tree:root():child(0)
+      children = node:named_children()
+
+      return #children
+    ]])
+
+    eq(3, len)
+    eq('<node compound_statement>', lua_eval('tostring(children[3])'))
+  end)
 end)
-- 
cgit 


From baba43681e792db30318bdedc3e73e4fe12482a6 Mon Sep 17 00:00:00 2001
From: Quentin Rasmont <qrasmont@gmail.com>
Date: Sun, 1 May 2022 11:35:12 +0200
Subject: feat(treesitter): upstream get_root_for_node() as a node method

Util from the nvim-treesitter project.
---
 test/functional/treesitter/node_spec.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'test')

diff --git a/test/functional/treesitter/node_spec.lua b/test/functional/treesitter/node_spec.lua
index b9ad4925c9..9450526257 100644
--- a/test/functional/treesitter/node_spec.lua
+++ b/test/functional/treesitter/node_spec.lua
@@ -77,4 +77,19 @@ describe('treesitter node API', function()
     eq(3, len)
     eq('<node compound_statement>', lua_eval('tostring(children[3])'))
   end)
+
+  it('can retrieve the tree root given a node', function()
+    insert([[
+      int main() {
+        int x = 3;
+      }]])
+
+    exec_lua([[
+      tree = vim.treesitter.get_parser(0, "c"):parse()[1]
+      root = tree:root()
+      node = root:child(0):child(2)
+    ]])
+
+    eq(lua_eval('tostring(root)'), lua_eval('tostring(node:root())'))
+  end)
 end)
-- 
cgit 


From f57341a4b69398ff0c58686e66c2f4138be164aa Mon Sep 17 00:00:00 2001
From: Quentin Rasmont <qrasmont@gmail.com>
Date: Sun, 1 May 2022 21:13:47 +0200
Subject: feat(treesitter): upstream node_length() as a node method

Util from the nvim-treesitter project.
---
 test/functional/treesitter/node_spec.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'test')

diff --git a/test/functional/treesitter/node_spec.lua b/test/functional/treesitter/node_spec.lua
index 9450526257..87ce1b973c 100644
--- a/test/functional/treesitter/node_spec.lua
+++ b/test/functional/treesitter/node_spec.lua
@@ -92,4 +92,20 @@ describe('treesitter node API', function()
 
     eq(lua_eval('tostring(root)'), lua_eval('tostring(node:root())'))
   end)
+
+  it('can compute the byte length of a node', function()
+    insert([[
+      int main() {
+        int x = 3;
+      }]])
+
+    exec_lua([[
+      tree = vim.treesitter.get_parser(0, "c"):parse()[1]
+      root = tree:root()
+      child = root:child(0):child(0)
+    ]])
+
+    eq(28, lua_eval('root:byte_length()'))
+    eq(3, lua_eval('child:byte_length()'))
+  end)
 end)
-- 
cgit 


From 73ee2b35d1fc738be9bd4b99f49ce8f84351fbe6 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Thu, 25 Aug 2022 20:49:27 +0200
Subject: fix(tests): use pending_c_parser when needed

---
 test/functional/treesitter/language_spec.lua | 2 ++
 test/functional/treesitter/utils_spec.lua    | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/treesitter/language_spec.lua b/test/functional/treesitter/language_spec.lua
index b66a56264f..8e9941d797 100644
--- a/test/functional/treesitter/language_spec.lua
+++ b/test/functional/treesitter/language_spec.lua
@@ -87,6 +87,7 @@ describe('treesitter language API', function()
   end)
 
   it('retrieve the tree given a range', function ()
+    if pending_c_parser(pending) then return end
     insert([[
       int main() {
         int x = 3;
@@ -101,6 +102,7 @@ describe('treesitter language API', function()
   end)
 
   it('retrieve the node given a range', function ()
+    if pending_c_parser(pending) then return end
     insert([[
       int main() {
         int x = 3;
diff --git a/test/functional/treesitter/utils_spec.lua b/test/functional/treesitter/utils_spec.lua
index c5609501a7..4f4c18a748 100644
--- a/test/functional/treesitter/utils_spec.lua
+++ b/test/functional/treesitter/utils_spec.lua
@@ -4,12 +4,16 @@ local clear = helpers.clear
 local insert = helpers.insert
 local eq = helpers.eq
 local exec_lua = helpers.exec_lua
+local pending_c_parser = helpers.pending_c_parser
 
 before_each(clear)
 
 describe('treesitter utils', function()
-  clear()
+  before_each(clear)
+
   it('can find an ancestor', function()
+    if pending_c_parser(pending) then return end
+
     insert([[
       int main() {
         int x = 3;
-- 
cgit 


From 030b422d1e9517ed1b1c70fd8002b74881c80650 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Wed, 24 Aug 2022 23:48:52 +0200
Subject: feat(treesitter)!: use @foo.bar style highlight groups

This removes the support for defining links via
vim.treesitter.highlighter.hl_map (never documented, but plugins did
anyway), or the uppercase-only `@FooGroup.Bar` to `FooGroup` rule.

The fallback is now strictly `@foo.bar.lang` to `@foo.bar` to `@foo`,
and casing is irrelevant (as it already was outside of treesitter)

For compatibility, define default links to builting syntax groups
as defined by pre-existing color schemes
---
 test/functional/treesitter/highlight_spec.lua | 96 +++++++++++++++++----------
 1 file changed, 60 insertions(+), 36 deletions(-)

(limited to 'test')

diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua
index 5ec0a8a060..e4ef975d34 100644
--- a/test/functional/treesitter/highlight_spec.lua
+++ b/test/functional/treesitter/highlight_spec.lua
@@ -6,11 +6,14 @@ local insert = helpers.insert
 local exec_lua = helpers.exec_lua
 local feed = helpers.feed
 local pending_c_parser = helpers.pending_c_parser
+local command = helpers.command
+local meths = helpers.meths
+local eq = helpers.eq
 
 before_each(clear)
 
 local hl_query = [[
-  (ERROR) @ErrorMsg
+  (ERROR) @error
 
   "if" @keyword
   "else" @keyword
@@ -23,23 +26,24 @@ local hl_query = [[
   "enum" @type
   "extern" @type
 
-  (string_literal) @string.nonexistent-specializer-for-string.should-fallback-to-string
+  ; nonexistent specializer for string should fallback to string
+  (string_literal) @string.nonexistent_specializer
 
   (number_literal) @number
   (char_literal) @string
 
   (type_identifier) @type
-  ((type_identifier) @Special (#eq? @Special "LuaRef"))
+  ((type_identifier) @constant.builtin (#eq? @constant.builtin "LuaRef"))
 
   (primitive_type) @type
   (sized_type_specifier) @type
 
   ; Use lua regexes
-  ((identifier) @Identifier (#contains? @Identifier "lua_"))
+  ((identifier) @function (#contains? @function "lua_"))
   ((identifier) @Constant (#lua-match? @Constant "^[A-Z_]+$"))
-  ((identifier) @Normal (#vim-match? @Constant "^lstate$"))
+  ((identifier) @Normal (#vim-match? @Normal "^lstate$"))
 
-  ((binary_expression left: (identifier) @WarningMsg.left right: (identifier) @WarningMsg.right) (#eq? @WarningMsg.left @WarningMsg.right))
+  ((binary_expression left: (identifier) @warning.left right: (identifier) @warning.right) (#eq? @warning.left @warning.right))
 
   (comment) @comment
 ]]
@@ -103,6 +107,7 @@ describe('treesitter highlighting', function()
     }
 
     exec_lua([[ hl_query = ... ]], hl_query)
+    command [[ hi link @warning WarningMsg ]]
   end)
 
   it('is updated with edits', function()
@@ -547,7 +552,7 @@ describe('treesitter highlighting', function()
 
     -- This will change ONLY the literal strings to look like comments
     -- The only literal string is the "vim.schedule: expected function" in this test.
-    exec_lua [[vim.cmd("highlight link cString comment")]]
+    exec_lua [[vim.cmd("highlight link @string.nonexistent_specializer comment")]]
     screen:expect{grid=[[
       {2:/// Schedule Lua callback on main loop's event queue}             |
       {3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate)                |
@@ -642,11 +647,13 @@ describe('treesitter highlighting', function()
                                                                        |
     ]]}
 
+    command [[
+      hi link @foo.bar Type
+      hi link @foo String
+    ]]
     exec_lua [[
       local parser = vim.treesitter.get_parser(0, "c", {})
       local highlighter = vim.treesitter.highlighter
-      highlighter.hl_map['foo.bar'] = 'Type'
-      highlighter.hl_map['foo'] = 'String'
       test_hl = highlighter.new(parser, {queries = {c = "(primitive_type) @foo.bar (string_literal) @foo"}})
     ]]
 
@@ -670,6 +677,29 @@ describe('treesitter highlighting', function()
       {1:~                                                                }|
                                                                        |
     ]]}
+
+    -- clearing specialization reactivates fallback
+    command [[ hi clear @foo.bar ]]
+    screen:expect{grid=[[
+      {5:char}* x = {5:"Will somebody ever read this?"};                       |
+      ^                                                                 |
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+      {1:~                                                                }|
+                                                                       |
+    ]]}
   end)
 
   it("supports conceal attribute", function()
@@ -712,32 +742,26 @@ describe('treesitter highlighting', function()
     ]]}
   end)
 
-  it("hl_map has the correct fallback behavior", function()
-    exec_lua [[
-      local hl_map = vim.treesitter.highlighter.hl_map
-      hl_map["foo"] = 1
-      hl_map["foo.bar"] = 2
-      hl_map["foo.bar.baz"] = 3
-
-      assert(hl_map["foo"] == 1)
-      assert(hl_map["foo.a.b.c.d"] == 1)
-      assert(hl_map["foo.bar"] == 2)
-      assert(hl_map["foo.bar.a.b.c.d"] == 2)
-      assert(hl_map["foo.bar.baz"] == 3)
-      assert(hl_map["foo.bar.baz.d"] == 3)
-
-      hl_map["FOO"] = 1
-      hl_map["FOO.BAR"] = 2
-      assert(hl_map["FOO.BAR.BAZ"] == 2)
-
-      hl_map["foo.missing.exists"] = 3
-      assert(hl_map["foo.missing"] == 1)
-      assert(hl_map["foo.missing.exists"] == 3)
-      assert(hl_map["foo.missing.exists.bar"] == 3)
-      assert(hl_map["total.nonsense.but.a.lot.of.dots"] == nil)
-      -- It will not perform a second look up of this variable but return a sentinel value
-      assert(hl_map["total.nonsense.but.a.lot.of.dots"] == "__notfound")
-    ]]
-
+  it("@foo.bar groups has the correct fallback behavior", function()
+    local get_hl = function(name) return meths.get_hl_by_name(name,1).foreground end
+    meths.set_hl(0, "@foo", {fg = 1})
+    meths.set_hl(0, "@foo.bar", {fg = 2})
+    meths.set_hl(0, "@foo.bar.baz", {fg = 3})
+
+    eq(1, get_hl"@foo")
+    eq(1, get_hl"@foo.a.b.c.d")
+    eq(2, get_hl"@foo.bar")
+    eq(2, get_hl"@foo.bar.a.b.c.d")
+    eq(3, get_hl"@foo.bar.baz")
+    eq(3, get_hl"@foo.bar.baz.d")
+
+    -- lookup is case insensitive
+    eq(2, get_hl"@FOO.BAR.SPAM")
+
+    meths.set_hl(0, "@foo.missing.exists", {fg = 3})
+    eq(1, get_hl"@foo.missing")
+    eq(3, get_hl"@foo.missing.exists")
+    eq(3, get_hl"@foo.missing.exists.bar")
+    eq(nil, get_hl"@total.nonsense.but.a.lot.of.dots")
   end)
 end)
-- 
cgit 


From b04ef7f6b966c44b12dbc65b17a761ae9313d6c4 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Thu, 25 Aug 2022 21:41:52 +0200
Subject: fix(treesitter): make it get_captures_at_position

---
 test/functional/treesitter/highlight_spec.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'test')

diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua
index e4ef975d34..4b0bd1eb50 100644
--- a/test/functional/treesitter/highlight_spec.lua
+++ b/test/functional/treesitter/highlight_spec.lua
@@ -617,6 +617,11 @@ describe('treesitter highlighting', function()
       -- bold will not be overwritten at the moment
       [12] = {background = Screen.colors.Red, bold = true, foreground = Screen.colors.Grey100};
     }}
+
+    eq({
+      {capture='Error', priority='101'};
+      {capture='type'};
+    }, exec_lua [[ return vim.treesitter.get_captures_at_position(0, 0, 2) ]])
     end)
 
   it("allows to use captures with dots (don't use fallback when specialization of foo exists)", function()
-- 
cgit 


From 60ec6e34d585a7f633d49aab790066c1740885e1 Mon Sep 17 00:00:00 2001
From: Mathias Fussenegger <f.mathias@zignar.net>
Date: Wed, 24 Aug 2022 20:25:34 +0200
Subject: feat(lsp): add tcp support

---
 test/functional/plugin/lsp_spec.lua | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'test')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index cd7415de90..fa731f6faf 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -3181,4 +3181,32 @@ describe('LSP', function()
       }
     end)
   end)
+
+  describe('cmd', function()
+    it('can connect to lsp server via rpc.connect', function()
+      local result = exec_lua [[
+        local uv = vim.loop
+        local server = uv.new_tcp()
+        local init = nil
+        server:bind('127.0.0.1', 0)
+        server:listen(127, function(err)
+          assert(not err, err)
+          local socket = uv.new_tcp()
+          server:accept(socket)
+          socket:read_start(require('vim.lsp.rpc').create_read_loop(function(body)
+            init = body
+            socket:close()
+          end))
+        end)
+        local port = server:getsockname().port
+        vim.lsp.start({ name = 'dummy', cmd = vim.lsp.rpc.connect('127.0.0.1', port) })
+        vim.wait(1000, function() return init ~= nil end)
+        assert(init, "server must receive `initialize` request")
+        server:close()
+        server:shutdown()
+        return vim.json.decode(init)
+      ]]
+      eq(result.method, "initialize")
+    end)
+  end)
 end)
-- 
cgit 


From b21980bd607e952fe52957aec3214367bd48527b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 29 Aug 2022 05:58:32 +0800
Subject: fix(keywordprg): default to :help if set to empty string (#19983)

---
 test/functional/editor/K_spec.lua | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/editor/K_spec.lua b/test/functional/editor/K_spec.lua
index 8ad81ac3d6..3b5580540f 100644
--- a/test/functional/editor/K_spec.lua
+++ b/test/functional/editor/K_spec.lua
@@ -1,6 +1,6 @@
 local helpers = require('test.functional.helpers')(after_each)
-local eq, clear, eval, feed, retry =
-  helpers.eq, helpers.clear, helpers.eval, helpers.feed, helpers.retry
+local eq, clear, eval, feed, meths, retry =
+  helpers.eq, helpers.clear, helpers.eval, helpers.feed, helpers.meths, helpers.retry
 
 describe('K', function()
   local test_file = 'K_spec_out'
@@ -58,4 +58,11 @@ describe('K', function()
     helpers.neq(bufnr, eval('bufnr()'))
   end)
 
+  it('empty string falls back to :help #19298', function()
+    meths.set_option('keywordprg', '')
+    meths.buf_set_lines(0, 0, -1, true, {'doesnotexist'})
+    feed('K')
+    eq('E149: Sorry, no help for doesnotexist', meths.get_vvar('errmsg'))
+  end)
+
 end)
-- 
cgit 


From 1dcaa75a6564b8a90e74a96e242803c6aa3f59cf Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 29 Aug 2022 06:16:20 +0800
Subject: fix(events): triggered WinScrolled when only skipcol changed (#19972)

fix(events): trigger WinScrolled when only skipcol changed

vim-patch:9.0.0304: WinScrolled is not triggered when only skipcol changes

Problem:    WinScrolled is not triggered when only skipcol changes.
Solution:   Add w_last_skipcol and use it. (closes vim/vim#10998)
https://github.com/vim/vim/commit/670ab0334b536e12d84810de88e73b7bcb01346d
---
 test/functional/autocmd/winscrolled_spec.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'test')

diff --git a/test/functional/autocmd/winscrolled_spec.lua b/test/functional/autocmd/winscrolled_spec.lua
index 5c1b758961..12b8e7c42d 100644
--- a/test/functional/autocmd/winscrolled_spec.lua
+++ b/test/functional/autocmd/winscrolled_spec.lua
@@ -61,6 +61,20 @@ describe('WinScrolled', function()
     eq(3, eval('g:scrolled'))
   end)
 
+  it('is triggered by scrolling on a long wrapped line #19968', function()
+    local height = meths.win_get_height(0)
+    local width = meths.win_get_width(0)
+    meths.buf_set_lines(0, 0, -1, true, {('foo'):rep(height * width)})
+    meths.win_set_cursor(0, {1, height * width - 1})
+    eq(0, eval('g:scrolled'))
+    feed('gj')
+    eq(1, eval('g:scrolled'))
+    feed('0')
+    eq(2, eval('g:scrolled'))
+    feed('$')
+    eq(3, eval('g:scrolled'))
+  end)
+
   it('is triggered when the window scrolls in Insert mode', function()
     local height = meths.win_get_height(0)
     local lines = {}
-- 
cgit 


From efacb6e974fa6391bcc916749103f04fa9b9f6f7 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Tue, 30 Aug 2022 01:09:14 +0800
Subject: fix(lsp): clean the diagnostic cache when buffer delete (#19449)

Co-authored-by: Gregory Anders <greg@gpanders.com>
---
 test/functional/lua/diagnostic_spec.lua | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index f9647f5b6a..4226bcebac 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -128,6 +128,28 @@ describe('vim.diagnostic', function()
     eq('Diagnostic #1', result[1].message)
   end)
 
+  it('removes diagnostics from the cache when a buffer is removed', function()
+    eq(2, exec_lua [[
+      vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
+      local other_bufnr = vim.fn.bufadd('test | test')
+      local lines = vim.api.nvim_buf_get_lines(diagnostic_bufnr, 0, -1, true)
+      vim.api.nvim_buf_set_lines(other_bufnr, 0, 1, false, lines)
+      vim.cmd('bunload! ' .. other_bufnr)
+
+      vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
+        make_error('Diagnostic #1', 1, 1, 1, 1),
+        make_error('Diagnostic #2', 2, 1, 2, 1),
+      })
+      vim.diagnostic.set(diagnostic_ns, other_bufnr, {
+        make_error('Diagnostic #3', 3, 1, 3, 1),
+      })
+      vim.api.nvim_set_current_buf(other_bufnr)
+      vim.opt_local.buflisted = true
+      vim.cmd('bwipeout!')
+      return #vim.diagnostic.get()
+    ]])
+  end)
+
   it('resolves buffer number 0 to the current buffer', function()
     eq(2, exec_lua [[
       vim.api.nvim_set_current_buf(diagnostic_bufnr)
-- 
cgit 


From 8fd66ff5c57d29a4349c80d3ae769cde12357ac0 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 29 Aug 2022 21:58:07 +0200
Subject: fix(redraw): handle switching to a tabpage with larger p_ch value

---
 test/functional/legacy/cmdline_spec.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index fb054eed9a..65b46f793d 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -19,8 +19,6 @@ describe('cmdline', function()
       [3] = {reverse = true};
       [4] = {bold = true, foreground = Screen.colors.Blue1};
     }
-    -- TODO(bfredl): redraw with tabs is severly broken. fix it
-    feed_command [[ set display-=msgsep ]]
 
     feed_command([[call setline(1, range(30))]])
     screen:expect([[
@@ -61,7 +59,7 @@ describe('cmdline', function()
       {4:~                             }|
                                     |
                                     |
-      :tabnew                       |
+                                    |
     ]]}
 
     feed [[gt]]
-- 
cgit 


From 568737d5b39a4b58cab05d4edc2599653979770c Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 30 Aug 2022 10:55:00 +0800
Subject: feat(tui): recognize sidescroll events (#19992)

Ref https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h3-Other-buttons
This works in xterm and kitty.
CSI < 66 ; x ; y M sequence is for ScrollWheelLeft.
CSI < 67 ; x ; y M sequence is for ScrollWheelRight.
---
 test/functional/terminal/tui_spec.lua | 193 ++++++++++++++++++++++++++++++++++
 1 file changed, 193 insertions(+)

(limited to 'test')

diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 99f69ef556..4f444316c3 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -297,6 +297,199 @@ describe('TUI', function()
     ]], attrs)
   end)
 
+  it('accepts mouse wheel events #19992', function()
+    child_session:request('nvim_command', [[
+      set number nostartofline nowrap mousescroll=hor:1,ver:1
+      call setline(1, repeat([join(range(10), '----')], 10))
+      vsplit
+    ]])
+    screen:expect([[
+      {11:  1 }{1:0}----1----2----3----4│{11:  1 }0----1----2----3----|
+      {11:  2 }0----1----2----3----4│{11:  2 }0----1----2----3----|
+      {11:  3 }0----1----2----3----4│{11:  3 }0----1----2----3----|
+      {11:  4 }0----1----2----3----4│{11:  4 }0----1----2----3----|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <ScrollWheelDown> in active window
+    feed_data('\027[<65;8;1M')
+    screen:expect([[
+      {11:  2 }{1:0}----1----2----3----4│{11:  1 }0----1----2----3----|
+      {11:  3 }0----1----2----3----4│{11:  2 }0----1----2----3----|
+      {11:  4 }0----1----2----3----4│{11:  3 }0----1----2----3----|
+      {11:  5 }0----1----2----3----4│{11:  4 }0----1----2----3----|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <ScrollWheelDown> in inactive window
+    feed_data('\027[<65;48;1M')
+    screen:expect([[
+      {11:  2 }{1:0}----1----2----3----4│{11:  2 }0----1----2----3----|
+      {11:  3 }0----1----2----3----4│{11:  3 }0----1----2----3----|
+      {11:  4 }0----1----2----3----4│{11:  4 }0----1----2----3----|
+      {11:  5 }0----1----2----3----4│{11:  5 }0----1----2----3----|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <ScrollWheelRight> in active window
+    feed_data('\027[<67;8;1M')
+    screen:expect([[
+      {11:  2 }{1:-}---1----2----3----4-│{11:  2 }0----1----2----3----|
+      {11:  3 }----1----2----3----4-│{11:  3 }0----1----2----3----|
+      {11:  4 }----1----2----3----4-│{11:  4 }0----1----2----3----|
+      {11:  5 }----1----2----3----4-│{11:  5 }0----1----2----3----|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <ScrollWheelRight> in inactive window
+    feed_data('\027[<67;48;1M')
+    screen:expect([[
+      {11:  2 }{1:-}---1----2----3----4-│{11:  2 }----1----2----3----4|
+      {11:  3 }----1----2----3----4-│{11:  3 }----1----2----3----4|
+      {11:  4 }----1----2----3----4-│{11:  4 }----1----2----3----4|
+      {11:  5 }----1----2----3----4-│{11:  5 }----1----2----3----4|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <S-ScrollWheelDown> in active window
+    feed_data('\027[<69;8;1M')
+    screen:expect([[
+      {11:  5 }{1:-}---1----2----3----4-│{11:  2 }----1----2----3----4|
+      {11:  6 }----1----2----3----4-│{11:  3 }----1----2----3----4|
+      {11:  7 }----1----2----3----4-│{11:  4 }----1----2----3----4|
+      {11:  8 }----1----2----3----4-│{11:  5 }----1----2----3----4|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <S-ScrollWheelDown> in inactive window
+    feed_data('\027[<69;48;1M')
+    screen:expect([[
+      {11:  5 }{1:-}---1----2----3----4-│{11:  5 }----1----2----3----4|
+      {11:  6 }----1----2----3----4-│{11:  6 }----1----2----3----4|
+      {11:  7 }----1----2----3----4-│{11:  7 }----1----2----3----4|
+      {11:  8 }----1----2----3----4-│{11:  8 }----1----2----3----4|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <S-ScrollWheelRight> in active window
+    feed_data('\027[<71;8;1M')
+    screen:expect([[
+      {11:  5 }{1:-}---6----7----8----9 │{11:  5 }----1----2----3----4|
+      {11:  6 }----6----7----8----9 │{11:  6 }----1----2----3----4|
+      {11:  7 }----6----7----8----9 │{11:  7 }----1----2----3----4|
+      {11:  8 }----6----7----8----9 │{11:  8 }----1----2----3----4|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <S-ScrollWheelRight> in inactive window
+    feed_data('\027[<71;48;1M')
+    screen:expect([[
+      {11:  5 }{1:-}---6----7----8----9 │{11:  5 }5----6----7----8----|
+      {11:  6 }----6----7----8----9 │{11:  6 }5----6----7----8----|
+      {11:  7 }----6----7----8----9 │{11:  7 }5----6----7----8----|
+      {11:  8 }----6----7----8----9 │{11:  8 }5----6----7----8----|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <ScrollWheelUp> in active window
+    feed_data('\027[<64;8;1M')
+    screen:expect([[
+      {11:  4 }----6----7----8----9 │{11:  5 }5----6----7----8----|
+      {11:  5 }{1:-}---6----7----8----9 │{11:  6 }5----6----7----8----|
+      {11:  6 }----6----7----8----9 │{11:  7 }5----6----7----8----|
+      {11:  7 }----6----7----8----9 │{11:  8 }5----6----7----8----|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <ScrollWheelUp> in inactive window
+    feed_data('\027[<64;48;1M')
+    screen:expect([[
+      {11:  4 }----6----7----8----9 │{11:  4 }5----6----7----8----|
+      {11:  5 }{1:-}---6----7----8----9 │{11:  5 }5----6----7----8----|
+      {11:  6 }----6----7----8----9 │{11:  6 }5----6----7----8----|
+      {11:  7 }----6----7----8----9 │{11:  7 }5----6----7----8----|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <ScrollWheelLeft> in active window
+    feed_data('\027[<66;8;1M')
+    screen:expect([[
+      {11:  4 }5----6----7----8----9│{11:  4 }5----6----7----8----|
+      {11:  5 }5{1:-}---6----7----8----9│{11:  5 }5----6----7----8----|
+      {11:  6 }5----6----7----8----9│{11:  6 }5----6----7----8----|
+      {11:  7 }5----6----7----8----9│{11:  7 }5----6----7----8----|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <ScrollWheelLeft> in inactive window
+    feed_data('\027[<66;48;1M')
+    screen:expect([[
+      {11:  4 }5----6----7----8----9│{11:  4 }-5----6----7----8---|
+      {11:  5 }5{1:-}---6----7----8----9│{11:  5 }-5----6----7----8---|
+      {11:  6 }5----6----7----8----9│{11:  6 }-5----6----7----8---|
+      {11:  7 }5----6----7----8----9│{11:  7 }-5----6----7----8---|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <S-ScrollWheelUp> in active window
+    feed_data('\027[<68;8;1M')
+    screen:expect([[
+      {11:  1 }5----6----7----8----9│{11:  4 }-5----6----7----8---|
+      {11:  2 }5----6----7----8----9│{11:  5 }-5----6----7----8---|
+      {11:  3 }5----6----7----8----9│{11:  6 }-5----6----7----8---|
+      {11:  4 }5{1:-}---6----7----8----9│{11:  7 }-5----6----7----8---|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <S-ScrollWheelUp> in inactive window
+    feed_data('\027[<68;48;1M')
+    screen:expect([[
+      {11:  1 }5----6----7----8----9│{11:  1 }-5----6----7----8---|
+      {11:  2 }5----6----7----8----9│{11:  2 }-5----6----7----8---|
+      {11:  3 }5----6----7----8----9│{11:  3 }-5----6----7----8---|
+      {11:  4 }5{1:-}---6----7----8----9│{11:  4 }-5----6----7----8---|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <S-ScrollWheelLeft> in active window
+    feed_data('\027[<70;8;1M')
+    screen:expect([[
+      {11:  1 }0----1----2----3----4│{11:  1 }-5----6----7----8---|
+      {11:  2 }0----1----2----3----4│{11:  2 }-5----6----7----8---|
+      {11:  3 }0----1----2----3----4│{11:  3 }-5----6----7----8---|
+      {11:  4 }0----1----2----3----{1:4}│{11:  4 }-5----6----7----8---|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+    -- <S-ScrollWheelLeft> in inactive window
+    feed_data('\027[<70;48;1M')
+    screen:expect([[
+      {11:  1 }0----1----2----3----4│{11:  1 }0----1----2----3----|
+      {11:  2 }0----1----2----3----4│{11:  2 }0----1----2----3----|
+      {11:  3 }0----1----2----3----4│{11:  3 }0----1----2----3----|
+      {11:  4 }0----1----2----3----{1:4}│{11:  4 }0----1----2----3----|
+      {5:[No Name] [+]             }{1:[No Name] [+]           }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+  end)
+
   it('accepts keypad keys from kitty keyboard protocol #19180', function()
     feed_data('i')
     feed_data(funcs.nr2char(57399)) -- KP_0
-- 
cgit 


From 6ab2bf68196292721b71e096f45bfa3dd0192ee0 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 22 Aug 2022 17:29:26 +0200
Subject: fix(highlight): set the window namespace when redrawing statusline

---
 test/functional/ui/highlight_spec.lua | 45 +++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index 4e3d62509c..5ffe9ddaad 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -2333,6 +2333,51 @@ describe("'winhighlight' highlight", function()
 
     helpers.assert_alive()
   end)
+
+  it('can redraw statusline on cursor movement', function()
+    screen:try_resize(40, 8)
+    exec [[
+      set statusline=%f%=%#Background1#%l,%c%V\ %P
+      split
+    ]]
+    insert [[
+      some text
+      more text]]
+    screen:expect{grid=[[
+      some text                               |
+      more tex^t                               |
+      {0:~                                       }|
+      {3:[No Name]                        }{1:2,9 All}|
+      some text                               |
+      more text                               |
+      {4:[No Name]                        }{1:1,1 All}|
+                                              |
+    ]]}
+
+    command 'set winhl=Background1:Background2'
+    screen:expect{grid=[[
+      some text                               |
+      more tex^t                               |
+      {0:~                                       }|
+      {3:[No Name]                        }{5:2,9 All}|
+      some text                               |
+      more text                               |
+      {4:[No Name]                        }{1:1,1 All}|
+                                              |
+    ]]}
+
+    feed 'k'
+    screen:expect{grid=[[
+      some tex^t                               |
+      more text                               |
+      {0:~                                       }|
+      {3:[No Name]                        }{5:1,9 All}|
+      some text                               |
+      more text                               |
+      {4:[No Name]                        }{1:1,1 All}|
+                                              |
+    ]]}
+  end)
 end)
 
 describe('highlight namespaces', function()
-- 
cgit 


From 813476bf7291dfaf9fc0ef77c9f53a07258a3801 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Tue, 30 Aug 2022 23:13:52 +0100
Subject: fix(exceptions): restore `did_throw` (#20000)

`!did_throw` doesn't exactly imply `!current_exception`, as `did_throw = false`
is sometimes used to defer exception handling for later (without forgetting the
exception). E.g: uncaught exception handling in `do_cmdline()` may be deferred
to a different call (e.g: when `try_level > 0`).

In #7881, `current_exception = NULL` in `do_cmdline()` is used as an analogue of
`did_throw = false`, but also causes the pending exception to be lost, which
also leaks as `discard_exception()` wasn't used.

It may be possible to fix this by saving/restoring `current_exception`, but
handling all of `did_throw`'s edge cases seems messier. Maybe not worth
diverging over.

This fix also uncovers a `man_spec.lua` bug on Windows: exceptions are thrown
due to Windows missing `man`, but they're lost; skip these tests if `man` isn't
executable.
---
 test/functional/plugin/man_spec.lua     |  6 ++++++
 test/functional/vimscript/eval_spec.lua | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

(limited to 'test')

diff --git a/test/functional/plugin/man_spec.lua b/test/functional/plugin/man_spec.lua
index c8da5a711f..9304aa6da9 100644
--- a/test/functional/plugin/man_spec.lua
+++ b/test/functional/plugin/man_spec.lua
@@ -6,6 +6,12 @@ local funcs = helpers.funcs
 local nvim_prog = helpers.nvim_prog
 local matches = helpers.matches
 
+clear()
+if funcs.executable('man') == 0 then
+  pending('missing "man" command', function() end)
+  return
+end
+
 describe(':Man', function()
   before_each(function()
     clear()
diff --git a/test/functional/vimscript/eval_spec.lua b/test/functional/vimscript/eval_spec.lua
index 65ac5b8c80..d4fa7afe89 100644
--- a/test/functional/vimscript/eval_spec.lua
+++ b/test/functional/vimscript/eval_spec.lua
@@ -219,3 +219,31 @@ it('Error when if/for/while/try/function is nested too deep',function()
   feed(':call Test5()<CR>')
   screen:expect({any = 'E1058: '})
 end)
+
+describe("uncaught exception", function()
+  before_each(clear)
+  after_each(function()
+    os.remove('throw1.vim')
+    os.remove('throw2.vim')
+    os.remove('throw3.vim')
+  end)
+
+  it('is not forgotten #13490', function()
+    command('autocmd BufWinEnter * throw "i am error"')
+    eq('i am error', exc_exec('try | new | endtry'))
+
+    -- Like Vim, throwing here aborts the processing of the script, but does not stop :runtime!
+    -- from processing the others.
+    -- Only the first thrown exception should be rethrown from the :try below, though.
+    for i = 1, 3 do
+      write_file('throw' .. i .. '.vim', ([[
+        let result ..= '%d'
+        throw 'throw%d'
+        let result ..= 'X'
+      ]]):format(i, i))
+    end
+    command('set runtimepath+=. | let result = ""')
+    eq('throw1', exc_exec('try | runtime! throw*.vim | endtry'))
+    eq('123', eval('result'))
+  end)
+end)
-- 
cgit 


From f4274d0f62625683486d3912dcd6e8e45877c6a4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 31 Aug 2022 09:41:00 +0800
Subject: vim-patch:8.2.3102: test for crash fix does not fail without the fix
 (#20018)

Problem:    Test for crash fix does not fail without the fix.
Solution:   Adjust the test sequence. (closes vim/vim#8506)
https://github.com/vim/vim/commit/3777d6e32b22f0a70b774760c24160079e303bad

Cherry-pick CheckUnix from patch 8.2.1432.
---
 .../ex_cmds/swapfile_preserve_recover_spec.lua     | 124 +++++++++++++++++----
 test/functional/legacy/cmdline_spec.lua            |   3 +-
 2 files changed, 107 insertions(+), 20 deletions(-)

(limited to 'test')

diff --git a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
index 4d984af41e..69404039ff 100644
--- a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
+++ b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
@@ -1,8 +1,8 @@
 local Screen = require('test.functional.ui.screen')
 local helpers = require('test.functional.helpers')(after_each)
 local lfs = require('lfs')
-local eq, eval, expect, source =
-  helpers.eq, helpers.eval, helpers.expect, helpers.source
+local eq, eval, expect, exec =
+  helpers.eq, helpers.eval, helpers.expect, helpers.exec
 local assert_alive = helpers.assert_alive
 local clear = helpers.clear
 local command = helpers.command
@@ -10,6 +10,8 @@ local feed = helpers.feed
 local nvim_prog = helpers.nvim_prog
 local ok = helpers.ok
 local rmdir = helpers.rmdir
+local new_argv = helpers.new_argv
+local pesc = helpers.pesc
 local os_kill = helpers.os_kill
 local set_session = helpers.set_session
 local spawn = helpers.spawn
@@ -55,11 +57,11 @@ describe(':preserve', function()
       set swapfile fileformat=unix undolevels=-1
     ]]
 
-    source(init)
+    exec(init)
     command('edit! '..testfile)
     feed('isometext<esc>')
     command('preserve')
-    source('redir => g:swapname | silent swapname | redir END')
+    exec('redir => g:swapname | silent swapname | redir END')
 
     local swappath1 = eval('g:swapname')
 
@@ -69,12 +71,12 @@ describe(':preserve', function()
                                 true)
     set_session(nvim2)
 
-    source(init)
+    exec(init)
 
     -- Use the "SwapExists" event to choose the (R)ecover choice at the dialog.
     command('autocmd SwapExists * let v:swapchoice = "r"')
     command('silent edit! '..testfile)
-    source('redir => g:swapname | silent swapname | redir END')
+    exec('redir => g:swapname | silent swapname | redir END')
 
     local swappath2 = eval('g:swapname')
 
@@ -92,25 +94,28 @@ end)
 
 describe('swapfile detection', function()
   local swapdir = lfs.currentdir()..'/Xtest_swapdialog_dir'
+  local nvim0
+  -- Put swapdir at the start of the 'directory' list. #1836
+  -- Note: `set swapfile` *must* go after `set directory`: otherwise it may
+  -- attempt to create a swapfile in different directory.
+  local init = [[
+    set directory^=]]..swapdir:gsub([[\]], [[\\]])..[[//
+    set swapfile fileformat=unix undolevels=-1 hidden
+  ]]
   before_each(function()
-    clear()
+    nvim0 = spawn(new_argv())
+    set_session(nvim0)
     rmdir(swapdir)
     lfs.mkdir(swapdir)
   end)
   after_each(function()
+    set_session(nvim0)
     command('%bwipeout!')
     rmdir(swapdir)
   end)
 
   it('always show swapfile dialog #8840 #9027', function()
     local testfile = 'Xtest_swapdialog_file1'
-    -- Put swapdir at the start of the 'directory' list. #1836
-    -- Note: `set swapfile` *must* go after `set directory`: otherwise it may
-    -- attempt to create a swapfile in different directory.
-    local init = [[
-      set directory^=]]..swapdir:gsub([[\]], [[\\]])..[[//
-      set swapfile fileformat=unix undolevels=-1 hidden
-    ]]
 
     local expected_no_dialog = '^'..(' '):rep(256)..'|\n'
     for _=1,37 do
@@ -119,19 +124,17 @@ describe('swapfile detection', function()
     expected_no_dialog = expected_no_dialog..testfile..(' '):rep(216)..'0,0-1          All|\n'
     expected_no_dialog = expected_no_dialog..(' '):rep(256)..'|\n'
 
-    source(init)
+    exec(init)
     command('edit! '..testfile)
     feed('isometext<esc>')
     command('preserve')
 
-    os_kill(eval('getpid()'))
     -- Start another Nvim instance.
-    local nvim2 = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed'},
-                        true)
+    local nvim2 = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed'}, true, nil, true)
     set_session(nvim2)
     local screen2 = Screen.new(256, 40)
     screen2:attach()
-    source(init)
+    exec(init)
 
     -- With shortmess+=F
     command('set shortmess+=F')
@@ -176,5 +179,88 @@ describe('swapfile detection', function()
       }
     })
     feed('<cr>')
+
+    nvim2:close()
+  end)
+
+  -- oldtest: Test_swap_prompt_splitwin()
+  it('selecting "q" in the attention prompt', function()
+    exec(init)
+    command('edit Xfile1')
+    command('preserve')  -- should help to make sure the swap file exists
+
+    local screen = Screen.new(75, 18)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {bold = true, foreground = Screen.colors.SeaGreen},  -- MoreMsg
+    })
+
+    local nvim1 = spawn(new_argv(), true, nil, true)
+    set_session(nvim1)
+    screen:attach()
+    exec(init)
+    feed(':split Xfile1\n')
+    screen:expect({
+      any = pesc('{1:[O]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort: }^')
+    })
+    feed('q')
+    feed(':<CR>')
+    screen:expect([[
+      ^                                                                           |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      :                                                                          |
+    ]])
+    nvim1:close()
+
+    local nvim2 = spawn(new_argv(), true, nil, true)
+    set_session(nvim2)
+    screen:attach()
+    exec(init)
+    command('set more')
+    command('au bufadd * let foo_w = wincol()')
+    feed(':e Xfile1<CR>')
+    screen:expect({any = pesc('{1:-- More --}^')})
+    feed('<Space>')
+    screen:expect({
+      any = pesc('{1:[O]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort: }^')
+    })
+    feed('q')
+    command([[echo 'hello']])
+    screen:expect([[
+      ^                                                                           |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      hello                                                                      |
+    ]])
+    nvim2:close()
   end)
 end)
diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 65b46f793d..99d2d0f30e 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -5,6 +5,7 @@ local command = helpers.command
 local feed = helpers.feed
 local feed_command = helpers.feed_command
 local exec = helpers.exec
+local pesc = helpers.pesc
 
 describe('cmdline', function()
   before_each(clear)
@@ -158,7 +159,7 @@ describe('cmdwin', function()
     command('set more')
     command('autocmd WinNew * highlight')
     feed('q:')
-    screen:expect({any = '{3:%-%- More %-%-}^'})
+    screen:expect({any = pesc('{3:-- More --}^')})
     feed('q')
     screen:expect([[
                                     |
-- 
cgit 


From fa747d004a1e91b30066020f2f592e4dc5d94084 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 31 Aug 2022 19:47:10 +0800
Subject: fix(api): nvim_set_hl bail out on invalid group name (#20021)

---
 test/functional/api/highlight_spec.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'test')

diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
index 2730f7e23d..3b36563d21 100644
--- a/test/functional/api/highlight_spec.lua
+++ b/test/functional/api/highlight_spec.lua
@@ -354,4 +354,9 @@ describe("API: set highlight", function()
     meths.set_hl(0, 'Normal', {fg='#000083', bg='#0000F3'})
     eq({foreground = 131, background = 243}, nvim("get_hl_by_name", 'Normal', true))
   end)
+
+  it('does not segfault on invalid group name #20009', function()
+    eq('Invalid highlight name: foo bar', pcall_err(meths.set_hl, 0, 'foo bar', {bold = true}))
+    assert_alive()
+  end)
 end)
-- 
cgit 


From 933c80e8f9d7ff4ab634c14d370440702c7c8ed7 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 31 Aug 2022 21:14:14 +0800
Subject: refactor(mappings)!: mapblock_fill_dict() use API Dictionary (#20020)

This introduces the following breaking changes:
- nvim_get_keymap now always returns a LuaRef object as "callback" for a
  Lua mapping regardless of how it is called. The LuaRef object can be
  called from Lua and Vim script, but is lost over RPC.
- maparg() now returns a Funcref instead of a ref number as "callback"
  for a Lua mapping. The Funcref can be called from Lua and Vim script,
  but is lost over RPC.

This may also make nvim_get_keymap faster, but make maparg() slower.
---
 test/functional/api/keymap_spec.lua | 42 ++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/keymap_spec.lua b/test/functional/api/keymap_spec.lua
index a93a4544ff..fedcbfa76a 100644
--- a/test/functional/api/keymap_spec.lua
+++ b/test/functional/api/keymap_spec.lua
@@ -6,6 +6,7 @@ local command = helpers.command
 local curbufmeths = helpers.curbufmeths
 local eq, neq = helpers.eq, helpers.neq
 local exec_lua = helpers.exec_lua
+local exec = helpers.exec
 local feed = helpers.feed
 local funcs = helpers.funcs
 local meths = helpers.meths
@@ -336,21 +337,26 @@ describe('nvim_get_keymap', function()
   end)
 
   it('can handle lua mappings', function()
-    eq(0, exec_lua [[
+    eq(0, exec_lua([[
       GlobalCount = 0
-      vim.api.nvim_set_keymap ('n', 'asdf', '', {callback = function() GlobalCount = GlobalCount + 1 end })
+      vim.api.nvim_set_keymap('n', 'asdf', '', {callback = function() GlobalCount = GlobalCount + 1 end })
       return GlobalCount
-    ]])
+    ]]))
 
     feed('asdf\n')
-    eq(1, exec_lua[[return GlobalCount]])
+    eq(1, exec_lua([[return GlobalCount]]))
 
-    eq(2, exec_lua[[
+    eq(2, exec_lua([[
       vim.api.nvim_get_keymap('n')[1].callback()
       return GlobalCount
+    ]]))
+
+    exec([[
+      call nvim_get_keymap('n')[0].callback()
     ]])
+    eq(3, exec_lua([[return GlobalCount]]))
+
     local mapargs = meths.get_keymap('n')
-    assert(type(mapargs[1].callback) == 'number', 'callback is not luaref number')
     mapargs[1].callback = nil
     eq({
       lhs='asdf',
@@ -834,17 +840,29 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
   end)
 
   it ('maparg() returns lua mapping correctly', function()
-    exec_lua [[
-      vim.api.nvim_set_keymap ('n', 'asdf', '', {callback = function() print('jkl;') end })
-    ]]
-    assert.truthy(string.match(funcs.maparg('asdf', 'n'),
-                  "^<Lua %d+>"))
+    eq(0, exec_lua([[
+      GlobalCount = 0
+      vim.api.nvim_set_keymap('n', 'asdf', '', {callback = function() GlobalCount = GlobalCount + 1 end })
+      return GlobalCount
+    ]]))
+
+    assert.truthy(string.match(funcs.maparg('asdf', 'n'), "^<Lua %d+>"))
+
     local mapargs = funcs.maparg('asdf', 'n', false, true)
-    assert(type(mapargs.callback) == 'number', 'callback is not luaref number')
     mapargs.callback = nil
     mapargs.lhsraw = nil
     mapargs.lhsrawalt = nil
     eq(generate_mapargs('n', 'asdf', nil, {sid=sid_lua}), mapargs)
+
+    eq(1, exec_lua([[
+      vim.fn.maparg('asdf', 'n', false, true).callback()
+      return GlobalCount
+    ]]))
+
+    exec([[
+      call maparg('asdf', 'n', v:false, v:true).callback()
+    ]])
+    eq(2, exec_lua([[return GlobalCount]]))
   end)
 
   it('can make lua expr mappings replacing keycodes', function()
-- 
cgit 


From f31db30975479cb6b57247f124a65f4362f80bfe Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Thu, 30 Jun 2022 13:26:31 +0600
Subject: feat(lua): vim.ui_attach to get ui events from lua

Co-authored-by: Famiu Haque <famiuhaque@protonmail.com>
---
 test/functional/lua/ui_event_spec.lua | 107 ++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 test/functional/lua/ui_event_spec.lua

(limited to 'test')

diff --git a/test/functional/lua/ui_event_spec.lua b/test/functional/lua/ui_event_spec.lua
new file mode 100644
index 0000000000..05322a0fdb
--- /dev/null
+++ b/test/functional/lua/ui_event_spec.lua
@@ -0,0 +1,107 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local eq = helpers.eq
+local exec_lua = helpers.exec_lua
+local clear = helpers.clear
+local feed = helpers.feed
+local funcs = helpers.funcs
+local inspect = require'vim.inspect'
+
+describe('vim.ui_attach', function()
+  local screen
+  before_each(function()
+    clear()
+    exec_lua [[
+      ns = vim.api.nvim_create_namespace 'testspace'
+      events = {}
+      function on_event(event, ...)
+        events[#events+1] = {event, ...}
+        return true
+      end
+
+      function get_events()
+        local ret_events = events
+        events = {}
+        return ret_events
+      end
+    ]]
+
+    screen = Screen.new(40,5)
+    screen:set_default_attr_ids({
+      [1] = {bold = true, foreground = Screen.colors.Blue1};
+      [2] = {bold = true};
+      [3] = {background = Screen.colors.Grey};
+      [4] = {background = Screen.colors.LightMagenta};
+    })
+    screen:attach()
+  end)
+
+  local function expect_events(expected)
+    local evs = exec_lua "return get_events(...)"
+    eq(expected, evs, inspect(evs))
+  end
+
+  it('can receive popupmenu events', function()
+    exec_lua [[ vim.ui_attach(ns, {ext_popupmenu=true}, on_event) ]]
+    feed('ifo')
+    screen:expect{grid=[[
+      fo^                                      |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {2:-- INSERT --}                            |
+    ]]}
+
+    funcs.complete(1, {'food', 'foobar', 'foo'})
+    screen:expect{grid=[[
+      food^                                    |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {2:-- INSERT --}                            |
+    ]]}
+    expect_events {
+      { "popupmenu_show", { { "food", "", "", "" }, { "foobar", "", "", "" }, { "foo", "", "", "" } }, 0, 0, 0, 1 };
+    }
+
+    feed '<c-n>'
+    screen:expect{grid=[[
+      foobar^                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {2:-- INSERT --}                            |
+    ]]}
+    expect_events {
+       { "popupmenu_select", 1 };
+    }
+
+    feed '<c-y>'
+    screen:expect{grid=[[
+      foobar^                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {2:-- INSERT --}                            |
+    ]], intermediate=true}
+    expect_events {
+       { "popupmenu_hide" };
+    }
+
+    -- ui_detach stops events, and reenables builtin pum
+    exec_lua [[ vim.ui_detach(ns) ]]
+
+    funcs.complete(1, {'food', 'foobar', 'foo'})
+    screen:expect{grid=[[
+      food^                                    |
+      {3:food           }{1:                         }|
+      {4:foobar         }{1:                         }|
+      {4:foo            }{1:                         }|
+      {2:-- INSERT --}                            |
+    ]]}
+    expect_events {
+    }
+
+
+  end)
+end)
-- 
cgit 


From 0c6b39894f4cac99c3d81857986e4eae533fb59a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 1 Sep 2022 06:19:49 +0800
Subject: feat(mapset): support restoring Lua callback (#20024)

vim-patch:9.0.0341: mapset() does not restore <Nop> mapping properly

Problem:    mapset() does not restore <Nop> mapping properly.
Solution:   Use an empty string for <Nop>. (closes vim/vim#11022)
https://github.com/vim/vim/commit/92a3d20682d46359bb50a452b4f831659e799155
---
 test/functional/vimscript/map_functions_spec.lua | 42 ++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'test')

diff --git a/test/functional/vimscript/map_functions_spec.lua b/test/functional/vimscript/map_functions_spec.lua
index aa64006de0..96b86d053e 100644
--- a/test/functional/vimscript/map_functions_spec.lua
+++ b/test/functional/vimscript/map_functions_spec.lua
@@ -3,6 +3,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
+local exec = helpers.exec
+local exec_lua = helpers.exec_lua
 local expect = helpers.expect
 local feed = helpers.feed
 local funcs = helpers.funcs
@@ -10,6 +12,7 @@ local meths = helpers.meths
 local nvim = helpers.nvim
 local source = helpers.source
 local command = helpers.command
+local pcall_err = helpers.pcall_err
 
 describe('maparg()', function()
   before_each(clear)
@@ -194,4 +197,43 @@ describe('mapset()', function()
     feed('foo')
     expect('<<lt><')
   end)
+
+  it('can restore Lua callback from the dict returned by maparg()', function()
+    eq(0, exec_lua([[
+      GlobalCount = 0
+      vim.api.nvim_set_keymap('n', 'asdf', '', {callback = function() GlobalCount = GlobalCount + 1 end })
+      return GlobalCount
+    ]]))
+    feed('asdf')
+    eq(1, exec_lua([[return GlobalCount]]))
+
+    exec_lua([[
+      _G.saved_asdf_map = vim.fn.maparg('asdf', 'n', false, true)
+      vim.api.nvim_set_keymap('n', 'asdf', '', {callback = function() GlobalCount = GlobalCount + 10 end })
+    ]])
+    feed('asdf')
+    eq(11, exec_lua([[return GlobalCount]]))
+
+    exec_lua([[vim.fn.mapset('n', false, _G.saved_asdf_map)]])
+    feed('asdf')
+    eq(12, exec_lua([[return GlobalCount]]))
+
+    exec([[
+      let g:saved_asdf_map = maparg('asdf', 'n', v:false, v:true)
+      lua vim.api.nvim_set_keymap('n', 'asdf', '', {callback = function() GlobalCount = GlobalCount + 10 end })
+    ]])
+    feed('asdf')
+    eq(22, exec_lua([[return GlobalCount]]))
+
+    command([[call mapset('n', v:false, g:saved_asdf_map)]])
+    feed('asdf')
+    eq(23, exec_lua([[return GlobalCount]]))
+  end)
+
+  it('does not leak memory if lhs is missing', function()
+    eq('Error executing lua: Vim:E460: entries missing in mapset() dict argument',
+       pcall_err(exec_lua, [[vim.fn.mapset('n', false, {rhs = 'foo'})]]))
+    eq('Error executing lua: Vim:E460: entries missing in mapset() dict argument',
+       pcall_err(exec_lua, [[vim.fn.mapset('n', false, {callback = function() end})]]))
+  end)
 end)
-- 
cgit 


From db2e5f46f5aa5a6300395eaa9c4923835683c770 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 1 Sep 2022 16:37:29 +0800
Subject: fix(lua): make ui_attach()/ui_detach() take effect immediately
 (#20037)

---
 test/functional/lua/ui_event_spec.lua | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/functional/lua/ui_event_spec.lua b/test/functional/lua/ui_event_spec.lua
index 05322a0fdb..294222ad13 100644
--- a/test/functional/lua/ui_event_spec.lua
+++ b/test/functional/lua/ui_event_spec.lua
@@ -88,10 +88,12 @@ describe('vim.ui_attach', function()
        { "popupmenu_hide" };
     }
 
-    -- ui_detach stops events, and reenables builtin pum
-    exec_lua [[ vim.ui_detach(ns) ]]
+    -- vim.ui_detach() stops events, and reenables builtin pum immediately
+    exec_lua [[
+      vim.ui_detach(ns)
+      vim.fn.complete(1, {'food', 'foobar', 'foo'})
+    ]]
 
-    funcs.complete(1, {'food', 'foobar', 'foo'})
     screen:expect{grid=[[
       food^                                    |
       {3:food           }{1:                         }|
@@ -102,6 +104,5 @@ describe('vim.ui_attach', function()
     expect_events {
     }
 
-
   end)
 end)
-- 
cgit 


From 689f5d604e59eba1ddab6f91b458a8163dc6629d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 1 Sep 2022 20:32:59 +0800
Subject: feat(api): add support for :horizontal modifier

---
 test/functional/api/command_spec.lua | 13 +++++++++++--
 test/functional/api/vim_spec.lua     | 26 ++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/command_spec.lua b/test/functional/api/command_spec.lua
index 440e93da0e..2d8bf23f5b 100644
--- a/test/functional/api/command_spec.lua
+++ b/test/functional/api/command_spec.lua
@@ -125,6 +125,7 @@ describe('nvim_create_user_command', function()
         confirm = false,
         emsg_silent = false,
         hide = false,
+        horizontal = false,
         keepalt = false,
         keepjumps = false,
         keepmarks = false,
@@ -160,6 +161,7 @@ describe('nvim_create_user_command', function()
         confirm = false,
         emsg_silent = false,
         hide = false,
+        horizontal = false,
         keepalt = false,
         keepjumps = false,
         keepmarks = false,
@@ -195,6 +197,7 @@ describe('nvim_create_user_command', function()
         confirm = false,
         emsg_silent = false,
         hide = false,
+        horizontal = false,
         keepalt = false,
         keepjumps = false,
         keepmarks = false,
@@ -224,12 +227,13 @@ describe('nvim_create_user_command', function()
       bang = true,
       line1 = 10,
       line2 = 10,
-      mods = "confirm unsilent botright",
+      mods = "confirm unsilent botright horizontal",
       smods = {
         browse = false,
         confirm = true,
         emsg_silent = false,
         hide = false,
+        horizontal = true,
         keepalt = false,
         keepjumps = false,
         keepmarks = false,
@@ -249,7 +253,7 @@ describe('nvim_create_user_command', function()
       count = 10,
       reg = "",
     }, exec_lua [=[
-      vim.api.nvim_command('unsilent botright confirm 10CommandWithLuaCallback! h\tey ')
+      vim.api.nvim_command('unsilent horizontal botright confirm 10CommandWithLuaCallback! h\tey ')
       return result
     ]=])
 
@@ -265,6 +269,7 @@ describe('nvim_create_user_command', function()
         confirm = false,
         emsg_silent = false,
         hide = false,
+        horizontal = false,
         keepalt = false,
         keepjumps = false,
         keepmarks = false,
@@ -300,6 +305,7 @@ describe('nvim_create_user_command', function()
         confirm = false,
         emsg_silent = false,
         hide = false,
+        horizontal = false,
         keepalt = false,
         keepjumps = false,
         keepmarks = false,
@@ -347,6 +353,7 @@ describe('nvim_create_user_command', function()
         confirm = false,
         emsg_silent = false,
         hide = false,
+        horizontal = false,
         keepalt = false,
         keepjumps = false,
         keepmarks = false,
@@ -383,6 +390,7 @@ describe('nvim_create_user_command', function()
         confirm = false,
         emsg_silent = false,
         hide = false,
+        horizontal = false,
         keepalt = false,
         keepjumps = false,
         keepmarks = false,
@@ -429,6 +437,7 @@ describe('nvim_create_user_command', function()
         confirm = false,
         emsg_silent = false,
         hide = false,
+        horizontal = false,
         keepalt = false,
         keepjumps = false,
         keepmarks = false,
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 24d0b6da45..2e37c4787d 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -3195,6 +3195,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3236,6 +3237,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3277,6 +3279,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3318,6 +3321,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3359,6 +3363,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3400,6 +3405,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3441,6 +3447,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = true,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3456,7 +3463,7 @@ describe('API', function()
           verbose = 15,
           vertical = false,
         },
-      }, meths.parse_cmd('15verbose silent! aboveleft topleft tab filter /foo/ split foo.txt', {}))
+      }, meths.parse_cmd('15verbose silent! horizontal topleft tab filter /foo/ split foo.txt', {}))
       eq({
         cmd = 'split',
         args = { 'foo.txt' },
@@ -3480,6 +3487,7 @@ describe('API', function()
               force = true
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3522,6 +3530,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3563,6 +3572,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3605,6 +3615,7 @@ describe('API', function()
               force = false
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3697,6 +3708,7 @@ describe('API', function()
             force = false,
           },
           hide = false,
+          horizontal = false,
           keepalt = false,
           keepjumps = false,
           keepmarks = false,
@@ -3798,10 +3810,20 @@ describe('API', function()
       eq('1',
          meths.cmd({ cmd = 'echomsg', args = { '1' }, mods = { silent = true } },
                    { output = true }))
-      -- with :silent message isn't added to message history
+      -- but message isn't added to message history
       eq('', meths.cmd({ cmd = 'messages' }, { output = true }))
       meths.create_user_command("Foo", 'set verbose', {})
       eq("  verbose=1", meths.cmd({ cmd = "Foo", mods = { verbose = 1 } }, { output = true }))
+      meths.create_user_command("Mods", "echo '<mods>'", {})
+      eq('keepmarks keeppatterns silent 3verbose aboveleft horizontal',
+         meths.cmd({ cmd = "Mods", mods = {
+           horizontal = true,
+           keepmarks = true,
+           keeppatterns = true,
+           silent = true,
+           split = 'aboveleft',
+           verbose = 3,
+         } }, { output = true }))
       eq(0, meths.get_option_value("verbose", {}))
       command('edit foo.txt | edit bar.txt')
       eq('  1 #h   "foo.txt"                      line 1',
-- 
cgit 


From 2afcdbd63a5b0cbeaad9d83b096a3af5201c67a9 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 2 Sep 2022 15:20:29 +0100
Subject: feat(Man): port to Lua (#19912)

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
---
 test/functional/plugin/man_spec.lua | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/functional/plugin/man_spec.lua b/test/functional/plugin/man_spec.lua
index 9304aa6da9..3e63c5df9a 100644
--- a/test/functional/plugin/man_spec.lua
+++ b/test/functional/plugin/man_spec.lua
@@ -1,7 +1,8 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
-local command, eval, rawfeed = helpers.command, helpers.eval, helpers.rawfeed
+local command, rawfeed = helpers.command, helpers.rawfeed
 local clear = helpers.clear
+local exec_lua = helpers.exec_lua
 local funcs = helpers.funcs
 local nvim_prog = helpers.nvim_prog
 local matches = helpers.matches
@@ -50,7 +51,7 @@ describe(':Man', function()
                                                             |
       ]]}
 
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       ^this {b:is} {b:a} test                                      |
@@ -74,7 +75,7 @@ describe(':Man', function()
                                                             |
       ]=]}
 
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       ^this {b:is }{bi:a }{biu:test}                                      |
@@ -89,7 +90,7 @@ describe(':Man', function()
       rawfeed([[
         ithis i<C-v><C-h>is<C-v><C-h>s あ<C-v><C-h>あ test
         with _<C-v><C-h>ö_<C-v><C-h>v_<C-v><C-h>e_<C-v><C-h>r_<C-v><C-h>s_<C-v><C-h>t_<C-v><C-h>r_<C-v><C-h>u_<C-v><C-h>̃_<C-v><C-h>c_<C-v><C-h>k te<C-v><ESC>[3mxt¶<C-v><ESC>[0m<ESC>]])
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       ^this {b:is} {b:あ} test                                     |
@@ -105,7 +106,7 @@ describe(':Man', function()
         i_<C-v><C-h>_b<C-v><C-h>be<C-v><C-h>eg<C-v><C-h>gi<C-v><C-h>in<C-v><C-h>ns<C-v><C-h>s
         m<C-v><C-h>mi<C-v><C-h>id<C-v><C-h>d_<C-v><C-h>_d<C-v><C-h>dl<C-v><C-h>le<C-v><C-h>e
         _<C-v><C-h>m_<C-v><C-h>i_<C-v><C-h>d_<C-v><C-h>__<C-v><C-h>d_<C-v><C-h>l_<C-v><C-h>e<ESC>]])
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       {b:^_begins}                                             |
@@ -121,7 +122,7 @@ describe(':Man', function()
         i· ·<C-v><C-h>·
         +<C-v><C-h>o
         +<C-v><C-h>+<C-v><C-h>o<C-v><C-h>o double<ESC>]])
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       ^· {b:·}                                                 |
@@ -138,7 +139,7 @@ describe(':Man', function()
         <C-v><C-[>[44m    4  <C-v><C-[>[45m    5  <C-v><C-[>[46m    6  <C-v><C-[>[47m    7  <C-v><C-[>[100m    8  <C-v><C-[>[101m    9
         <C-v><C-[>[102m   10  <C-v><C-[>[103m   11  <C-v><C-[>[104m   12  <C-v><C-[>[105m   13  <C-v><C-[>[106m   14  <C-v><C-[>[107m   15
         <C-v><C-[>[48:5:16m   16  <ESC>]])
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
        ^    0      1      2      3                          |
-- 
cgit 


From 1ef7720567b08caec0c077605fb2a01a9d6eafbc Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 1 Sep 2022 18:46:34 +0800
Subject: fix(api)!: correctly deal with number before :tab

Now nvim_parse_cmd and nvim_create_user_command use a "tab" value which
is the same as the number passed before :tab modifier instead of the
number plus 1, and "tab" value is -1 if :tab modifier is not used.
---
 test/functional/api/command_spec.lua | 41 +++++++++++++++++++++++++++---------
 test/functional/api/vim_spec.lua     | 24 ++++++++++-----------
 2 files changed, 43 insertions(+), 22 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/command_spec.lua b/test/functional/api/command_spec.lua
index 2d8bf23f5b..44a19d8348 100644
--- a/test/functional/api/command_spec.lua
+++ b/test/functional/api/command_spec.lua
@@ -136,7 +136,7 @@ describe('nvim_create_user_command', function()
         sandbox = false,
         silent = false,
         split = "",
-        tab = 0,
+        tab = -1,
         unsilent = false,
         verbose = -1,
         vertical = false,
@@ -172,7 +172,7 @@ describe('nvim_create_user_command', function()
         sandbox = false,
         silent = false,
         split = "",
-        tab = 0,
+        tab = -1,
         unsilent = false,
         verbose = -1,
         vertical = false,
@@ -208,7 +208,7 @@ describe('nvim_create_user_command', function()
         sandbox = false,
         silent = false,
         split = "",
-        tab = 0,
+        tab = -1,
         unsilent = false,
         verbose = -1,
         vertical = false,
@@ -244,7 +244,7 @@ describe('nvim_create_user_command', function()
         sandbox = false,
         silent = false,
         split = "botright",
-        tab = 0,
+        tab = -1,
         unsilent = true,
         verbose = -1,
         vertical = false,
@@ -280,7 +280,7 @@ describe('nvim_create_user_command', function()
         sandbox = false,
         silent = false,
         split = "",
-        tab = 0,
+        tab = -1,
         unsilent = false,
         verbose = -1,
         vertical = false,
@@ -316,7 +316,7 @@ describe('nvim_create_user_command', function()
         sandbox = false,
         silent = false,
         split = "",
-        tab = 0,
+        tab = -1,
         unsilent = false,
         verbose = -1,
         vertical = false,
@@ -364,7 +364,7 @@ describe('nvim_create_user_command', function()
         sandbox = false,
         silent = false,
         split = "",
-        tab = 0,
+        tab = -1,
         unsilent = false,
         verbose = -1,
         vertical = false,
@@ -401,7 +401,7 @@ describe('nvim_create_user_command', function()
         sandbox = false,
         silent = false,
         split = "",
-        tab = 0,
+        tab = -1,
         unsilent = false,
         verbose = -1,
         vertical = false,
@@ -448,7 +448,7 @@ describe('nvim_create_user_command', function()
         sandbox = false,
         silent = false,
         split = "",
-        tab = 0,
+        tab = -1,
         unsilent = false,
         verbose = -1,
         vertical = false,
@@ -523,8 +523,29 @@ describe('nvim_create_user_command', function()
         vim.api.nvim_cmd({ cmd = 'echo', args = { '&verbose' }, mods = opts.smods }, {})
       end, {})
     ]]
-
     eq("3", meths.cmd({ cmd = 'MyEcho', mods = { verbose = 3 } }, { output = true }))
+
+    eq(1, #meths.list_tabpages())
+    exec_lua[[
+      vim.api.nvim_create_user_command('MySplit', function(opts)
+        vim.api.nvim_cmd({ cmd = 'split', mods = opts.smods }, {})
+      end, {})
+    ]]
+    meths.cmd({ cmd = 'MySplit' }, {})
+    eq(1, #meths.list_tabpages())
+    eq(2, #meths.list_wins())
+    meths.cmd({ cmd = 'MySplit', mods = { tab = 1 } }, {})
+    eq(2, #meths.list_tabpages())
+    eq(2, funcs.tabpagenr())
+    meths.cmd({ cmd = 'MySplit', mods = { tab = 1 } }, {})
+    eq(3, #meths.list_tabpages())
+    eq(2, funcs.tabpagenr())
+    meths.cmd({ cmd = 'MySplit', mods = { tab = 3 } }, {})
+    eq(4, #meths.list_tabpages())
+    eq(4, funcs.tabpagenr())
+    meths.cmd({ cmd = 'MySplit', mods = { tab = 0 } }, {})
+    eq(5, #meths.list_tabpages())
+    eq(1, funcs.tabpagenr())
   end)
 end)
 
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 2e37c4787d..edbdd54c2f 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -3206,7 +3206,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
@@ -3248,7 +3248,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
@@ -3290,7 +3290,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
@@ -3332,7 +3332,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
@@ -3374,7 +3374,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
@@ -3416,7 +3416,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
@@ -3458,7 +3458,7 @@ describe('API', function()
           sandbox = false,
           silent = true,
           split = "topleft",
-          tab = 2,
+          tab = 1,
           unsilent = false,
           verbose = 15,
           vertical = false,
@@ -3503,7 +3503,7 @@ describe('API', function()
           verbose = 0,
           vertical = false,
         },
-      }, meths.parse_cmd('0verbose unsilent botright confirm filter! /foo/ split foo.txt', {}))
+      }, meths.parse_cmd('0verbose unsilent botright 0tab confirm filter! /foo/ split foo.txt', {}))
     end)
     it('works with user commands', function()
       command('command -bang -nargs=+ -range -addr=lines MyCommand echo foo')
@@ -3541,7 +3541,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
@@ -3583,7 +3583,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
@@ -3626,7 +3626,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
@@ -3719,7 +3719,7 @@ describe('API', function()
           sandbox = false,
           silent = false,
           split = "",
-          tab = 0,
+          tab = -1,
           unsilent = false,
           verbose = -1,
           vertical = false,
-- 
cgit 


From a5fe7940c8b9436b78ae408eae8345266423f2c8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 24 Jul 2022 11:32:56 +0800
Subject: feat(ui-ext): make 'mousemoveevent' a ui_option

---
 test/functional/ui/options_spec.lua | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/options_spec.lua b/test/functional/ui/options_spec.lua
index 8d7c404637..bd0d2104db 100644
--- a/test/functional/ui/options_spec.lua
+++ b/test/functional/ui/options_spec.lua
@@ -19,6 +19,7 @@ describe('UI receives option updates', function()
       linespace=0,
       pumblend=0,
       mousefocus=false,
+      mousemoveevent=false,
       showtabline=1,
       termguicolors=false,
       ttimeout=true,
@@ -131,6 +132,12 @@ describe('UI receives option updates', function()
       eq(expected, screen.options)
     end)
 
+    command("set mousemoveevent")
+    expected.mousemoveevent = true
+    screen:expect(function()
+      eq(expected, screen.options)
+    end)
+
     command("set nottimeout")
     expected.ttimeout = false
     screen:expect(function()
-- 
cgit 


From 04bd700ac3bc2bdea0e0d8747de95dab2034aa11 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 24 Jul 2022 11:26:54 +0800
Subject: feat(tui): support 'mousemoveevent'

---
 test/functional/ui/popupmenu_spec.lua | 40 +++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
index dcd4ad3d9a..bcd146e40d 100644
--- a/test/functional/ui/popupmenu_spec.lua
+++ b/test/functional/ui/popupmenu_spec.lua
@@ -2755,7 +2755,7 @@ describe('builtin popupmenu', function()
       menu PopUp.bar :let g:menustr = 'bar'<CR>
       menu PopUp.baz :let g:menustr = 'baz'<CR>
     ]])
-    meths.input_mouse('right', 'press', '', 0, 0, 4)
+    feed('<RightMouse><4,0>')
     screen:expect([[
       ^popup menu test                 |
       {1:~  }{n: foo }{1:                        }|
@@ -2792,7 +2792,7 @@ describe('builtin popupmenu', function()
       :let g:menustr = 'bar'          |
     ]])
     eq('bar', meths.get_var('menustr'))
-    meths.input_mouse('right', 'press', '', 0, 1, 20)
+    feed('<RightMouse><20,1>')
     screen:expect([[
       ^popup menu test                 |
       {1:~                               }|
@@ -2801,7 +2801,7 @@ describe('builtin popupmenu', function()
       {1:~                  }{n: baz }{1:        }|
       :let g:menustr = 'bar'          |
     ]])
-    meths.input_mouse('left', 'press', '', 0, 4, 22)
+    feed('<LeftMouse><22,4>')
     screen:expect([[
       ^popup menu test                 |
       {1:~                               }|
@@ -2811,7 +2811,7 @@ describe('builtin popupmenu', function()
       :let g:menustr = 'baz'          |
     ]])
     eq('baz', meths.get_var('menustr'))
-    meths.input_mouse('right', 'press', '', 0, 0, 4)
+    feed('<RightMouse><4,0>')
     screen:expect([[
       ^popup menu test                 |
       {1:~  }{n: foo }{1:                        }|
@@ -2820,7 +2820,7 @@ describe('builtin popupmenu', function()
       {1:~                               }|
       :let g:menustr = 'baz'          |
     ]])
-    meths.input_mouse('right', 'drag', '', 0, 3, 6)
+    feed('<RightDrag><6,3>')
     screen:expect([[
       ^popup menu test                 |
       {1:~  }{n: foo }{1:                        }|
@@ -2829,7 +2829,7 @@ describe('builtin popupmenu', function()
       {1:~                               }|
       :let g:menustr = 'baz'          |
     ]])
-    meths.input_mouse('right', 'release', '', 0, 1, 6)
+    feed('<RightRelease><6,1>')
     screen:expect([[
       ^popup menu test                 |
       {1:~                               }|
@@ -2839,6 +2839,34 @@ describe('builtin popupmenu', function()
       :let g:menustr = 'foo'          |
     ]])
     eq('foo', meths.get_var('menustr'))
+    feed('<RightMouse><4,0>')
+    screen:expect([[
+      ^popup menu test                 |
+      {1:~  }{n: foo }{1:                        }|
+      {1:~  }{n: bar }{1:                        }|
+      {1:~  }{n: baz }{1:                        }|
+      {1:~                               }|
+      :let g:menustr = 'foo'          |
+    ]])
+    feed('<MouseMove><6,3>')
+    screen:expect([[
+      ^popup menu test                 |
+      {1:~  }{n: foo }{1:                        }|
+      {1:~  }{n: bar }{1:                        }|
+      {1:~  }{s: baz }{1:                        }|
+      {1:~                               }|
+      :let g:menustr = 'foo'          |
+    ]])
+    feed('<LeftMouse><6,2>')
+    screen:expect([[
+      ^popup menu test                 |
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      :let g:menustr = 'bar'          |
+    ]])
+    eq('bar', meths.get_var('menustr'))
   end)
 end)
 
-- 
cgit 


From ceb09701f29dcabcf219f458fffbb64f5adced9b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 24 Jul 2022 13:58:29 +0800
Subject: feat(api): add "move" to nvim_input_mouse

---
 test/functional/ui/mouse_spec.lua     | 15 ++++++++-
 test/functional/ui/popupmenu_spec.lua | 63 +++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/ui/mouse_spec.lua b/test/functional/ui/mouse_spec.lua
index 9896b11218..8c5475ecce 100644
--- a/test/functional/ui/mouse_spec.lua
+++ b/test/functional/ui/mouse_spec.lua
@@ -1585,7 +1585,20 @@ describe('ui/mouse/input', function()
     eq(0, meths.get_var('mouse_up2'))
   end)
 
-  it('feeding <MouseMove> does not use uninitialized memory #19480', function()
+  it('<MouseMove> is not translated into multiclicks and can be mapped', function()
+    meths.set_var('mouse_move', 0)
+    meths.set_var('mouse_move2', 0)
+    command('nnoremap <MouseMove> <Cmd>let g:mouse_move += 1<CR>')
+    command('nnoremap <2-MouseMove> <Cmd>let g:mouse_move2 += 1<CR>')
+    feed('<MouseMove><0,0>')
+    feed('<MouseMove><0,0>')
+    meths.input_mouse('move', '', '', 0, 0, 0)
+    meths.input_mouse('move', '', '', 0, 0, 0)
+    eq(4, meths.get_var('mouse_move'))
+    eq(0, meths.get_var('mouse_move2'))
+  end)
+
+  it('feeding <MouseMove> in Normal mode does not use uninitialized memory #19480', function()
     feed('<MouseMove>')
     helpers.poke_eventloop()
     helpers.assert_alive()
diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
index bcd146e40d..b16e404ea8 100644
--- a/test/functional/ui/popupmenu_spec.lua
+++ b/test/functional/ui/popupmenu_spec.lua
@@ -3075,5 +3075,68 @@ describe('builtin popupmenu with ui/ext_multigrid', function()
       :let g:menustr = 'foo'          |
     ]]})
     eq('foo', meths.get_var('menustr'))
+    meths.input_mouse('right', 'press', '', 2, 0, 4)
+    screen:expect({grid=[[
+    ## grid 1
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [3:--------------------------------]|
+    ## grid 2
+      ^popup menu test                 |
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+    ## grid 3
+      :let g:menustr = 'foo'          |
+    ## grid 4
+      {n: foo }|
+      {n: bar }|
+      {n: baz }|
+    ]], float_pos={[4] = {{id = -1}, 'NW', 2, 1, 3, false, 100}}})
+    meths.input_mouse('move', '', '', 2, 3, 6)
+    screen:expect({grid=[[
+    ## grid 1
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [3:--------------------------------]|
+    ## grid 2
+      ^popup menu test                 |
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+    ## grid 3
+      :let g:menustr = 'foo'          |
+    ## grid 4
+      {n: foo }|
+      {n: bar }|
+      {s: baz }|
+    ]], float_pos={[4] = {{id = -1}, 'NW', 2, 1, 3, false, 100}}})
+    meths.input_mouse('left', 'press', '', 2, 2, 6)
+    screen:expect({grid=[[
+    ## grid 1
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [3:--------------------------------]|
+    ## grid 2
+      ^popup menu test                 |
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+    ## grid 3
+      :let g:menustr = 'bar'          |
+    ]]})
+    eq('bar', meths.get_var('menustr'))
   end)
 end)
-- 
cgit 


From 82d128405aaeb619a0c04353449f5717da126249 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 24 Jul 2022 15:24:15 +0800
Subject: feat(pum): pretend 'mousemoveevent' is set when showing right-click
 menu

---
 test/functional/terminal/tui_spec.lua | 52 +++++++++++++++++++++++++++++++++++
 test/functional/ui/popupmenu_spec.lua |  8 ++++++
 2 files changed, 60 insertions(+)

(limited to 'test')

diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 4f444316c3..3c56ad5f79 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -21,6 +21,7 @@ local nvim_set = helpers.nvim_set
 local ok = helpers.ok
 local read_file = helpers.read_file
 local funcs = helpers.funcs
+local meths = helpers.meths
 
 if helpers.pending_win32(pending) then return end
 
@@ -666,6 +667,57 @@ describe('TUI', function()
     ]], attrs)
   end)
 
+  it('mouse events work with right-click menu', function()
+    child_session:request('nvim_command', [[
+      call setline(1, 'popup menu test')
+      set mouse=a mousemodel=popup
+
+      aunmenu PopUp
+      menu PopUp.foo :let g:menustr = 'foo'<CR>
+      menu PopUp.bar :let g:menustr = 'bar'<CR>
+      menu PopUp.baz :let g:menustr = 'baz'<CR>
+      highlight Pmenu ctermbg=NONE ctermfg=NONE cterm=underline,reverse
+      highlight PmenuSel ctermbg=NONE ctermfg=NONE cterm=underline,reverse,bold
+    ]])
+    local attrs = screen:get_default_attr_ids()
+    attrs[11] = {underline = true, reverse = true}
+    attrs[12] = {underline = true, reverse = true, bold = true}
+    meths.input_mouse('right', 'press', '', 0, 0, 4)
+    screen:expect([[
+      {1:p}opup menu test                                   |
+      {4:~  }{11: foo }{4:                                          }|
+      {4:~  }{11: bar }{4:                                          }|
+      {4:~  }{11: baz }{4:                                          }|
+      {5:[No Name] [+]                                     }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]], attrs)
+    meths.input_mouse('right', 'release', '', 0, 0, 4)
+    screen:expect_unchanged()
+    meths.input_mouse('move', '', '', 0, 3, 6)
+    screen:expect([[
+      {1:p}opup menu test                                   |
+      {4:~  }{11: foo }{4:                                          }|
+      {4:~  }{11: bar }{4:                                          }|
+      {4:~  }{12: baz }{4:                                          }|
+      {5:[No Name] [+]                                     }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]], attrs)
+    meths.input_mouse('left', 'press', '', 0, 2, 6)
+    screen:expect([[
+      {1:p}opup menu test                                   |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name] [+]                                     }|
+      :let g:menustr = 'bar'                            |
+      {3:-- TERMINAL --}                                    |
+    ]], attrs)
+    meths.input_mouse('left', 'release', '', 0, 2, 6)
+    screen:expect_unchanged()
+  end)
+
   it('paste: Insert mode', function()
     -- "bracketed paste"
     feed_data('i""\027i\027[200~')
diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
index b16e404ea8..3c752875f0 100644
--- a/test/functional/ui/popupmenu_spec.lua
+++ b/test/functional/ui/popupmenu_spec.lua
@@ -2839,6 +2839,7 @@ describe('builtin popupmenu', function()
       :let g:menustr = 'foo'          |
     ]])
     eq('foo', meths.get_var('menustr'))
+    eq(false, screen.options.mousemoveevent)
     feed('<RightMouse><4,0>')
     screen:expect([[
       ^popup menu test                 |
@@ -2848,6 +2849,7 @@ describe('builtin popupmenu', function()
       {1:~                               }|
       :let g:menustr = 'foo'          |
     ]])
+    eq(true, screen.options.mousemoveevent)
     feed('<MouseMove><6,3>')
     screen:expect([[
       ^popup menu test                 |
@@ -2857,6 +2859,7 @@ describe('builtin popupmenu', function()
       {1:~                               }|
       :let g:menustr = 'foo'          |
     ]])
+    eq(true, screen.options.mousemoveevent)
     feed('<LeftMouse><6,2>')
     screen:expect([[
       ^popup menu test                 |
@@ -2866,6 +2869,7 @@ describe('builtin popupmenu', function()
       {1:~                               }|
       :let g:menustr = 'bar'          |
     ]])
+    eq(false, screen.options.mousemoveevent)
     eq('bar', meths.get_var('menustr'))
   end)
 end)
@@ -3075,6 +3079,7 @@ describe('builtin popupmenu with ui/ext_multigrid', function()
       :let g:menustr = 'foo'          |
     ]]})
     eq('foo', meths.get_var('menustr'))
+    eq(false, screen.options.mousemoveevent)
     meths.input_mouse('right', 'press', '', 2, 0, 4)
     screen:expect({grid=[[
     ## grid 1
@@ -3097,6 +3102,7 @@ describe('builtin popupmenu with ui/ext_multigrid', function()
       {n: bar }|
       {n: baz }|
     ]], float_pos={[4] = {{id = -1}, 'NW', 2, 1, 3, false, 100}}})
+    eq(true, screen.options.mousemoveevent)
     meths.input_mouse('move', '', '', 2, 3, 6)
     screen:expect({grid=[[
     ## grid 1
@@ -3119,6 +3125,7 @@ describe('builtin popupmenu with ui/ext_multigrid', function()
       {n: bar }|
       {s: baz }|
     ]], float_pos={[4] = {{id = -1}, 'NW', 2, 1, 3, false, 100}}})
+    eq(true, screen.options.mousemoveevent)
     meths.input_mouse('left', 'press', '', 2, 2, 6)
     screen:expect({grid=[[
     ## grid 1
@@ -3137,6 +3144,7 @@ describe('builtin popupmenu with ui/ext_multigrid', function()
     ## grid 3
       :let g:menustr = 'bar'          |
     ]]})
+    eq(false, screen.options.mousemoveevent)
     eq('bar', meths.get_var('menustr'))
   end)
 end)
-- 
cgit 


From 6254b0fd3bc725705020192dc9e35635136b9929 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 4 Sep 2022 16:13:37 +0200
Subject: ci(tests): don't skip parsers on functionaltest

Treesitter parsers are now a mandatory part of the installation and
should be tested on all platforms. Remove `pending_c_parser` helper.
---
 test/functional/helpers.lua                   | 10 ----------
 test/functional/treesitter/highlight_spec.lua | 18 ------------------
 test/functional/treesitter/language_spec.lua  | 12 ++----------
 test/functional/treesitter/node_spec.lua      |  5 -----
 test/functional/treesitter/parser_spec.lua    |  3 ---
 test/functional/treesitter/utils_spec.lua     |  2 --
 6 files changed, 2 insertions(+), 48 deletions(-)

(limited to 'test')

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 93fb0f245e..d672037a1e 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -755,16 +755,6 @@ function module.pending_win32(pending_fn)
   end
 end
 
-function module.pending_c_parser(pending_fn)
-  local status, _ = unpack(module.exec_lua([[ return {pcall(vim.treesitter.require_language, 'c')} ]]))
-  if not status then
-    pending_fn 'no C parser, skipping'
-    return true
-  end
-  module.exec_lua [[vim._ts_remove_language 'c']]
-  return false
-end
-
 -- Calls pending() and returns `true` if the system is too slow to
 -- run fragile or expensive tests. Else returns `false`.
 function module.skip_fragile(pending_fn, cond)
diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua
index 4b0bd1eb50..5a1081592e 100644
--- a/test/functional/treesitter/highlight_spec.lua
+++ b/test/functional/treesitter/highlight_spec.lua
@@ -5,7 +5,6 @@ local clear = helpers.clear
 local insert = helpers.insert
 local exec_lua = helpers.exec_lua
 local feed = helpers.feed
-local pending_c_parser = helpers.pending_c_parser
 local command = helpers.command
 local meths = helpers.meths
 local eq = helpers.eq
@@ -111,8 +110,6 @@ describe('treesitter highlighting', function()
   end)
 
   it('is updated with edits', function()
-    if pending_c_parser(pending) then return end
-
     insert(hl_text)
     screen:expect{grid=[[
       /// Schedule Lua callback on main loop's event queue             |
@@ -276,8 +273,6 @@ describe('treesitter highlighting', function()
   end)
 
   it('is updated with :sort', function()
-    if pending_c_parser(pending) then return end
-
     insert(test_text)
     exec_lua [[
       local parser = vim.treesitter.get_parser(0, "c")
@@ -351,8 +346,6 @@ describe('treesitter highlighting', function()
   end)
 
   it("supports with custom parser", function()
-    if pending_c_parser(pending) then return end
-
     screen:set_default_attr_ids {
       [1] = {bold = true, foreground = Screen.colors.SeaGreen4};
     }
@@ -417,8 +410,6 @@ describe('treesitter highlighting', function()
   end)
 
   it("supports injected languages", function()
-    if pending_c_parser(pending) then return end
-
     insert([[
     int x = INT_MAX;
     #define READ_STRING(x, y) (char_u *)read_string((x), (size_t)(y))
@@ -479,8 +470,6 @@ describe('treesitter highlighting', function()
   end)
 
   it("supports overriding queries, like ", function()
-    if pending_c_parser(pending) then return end
-
     insert([[
     int x = INT_MAX;
     #define READ_STRING(x, y) (char_u *)read_string((x), (size_t)(y))
@@ -520,8 +509,6 @@ describe('treesitter highlighting', function()
   end)
 
   it("supports highlighting with custom highlight groups", function()
-    if pending_c_parser(pending) then return end
-
     insert(hl_text)
 
     exec_lua [[
@@ -577,8 +564,6 @@ describe('treesitter highlighting', function()
   end)
 
   it("supports highlighting with priority", function()
-    if pending_c_parser(pending) then return end
-
     insert([[
     int x = INT_MAX;
     #define READ_STRING(x, y) (char_u *)read_string((x), (size_t)(y))
@@ -625,8 +610,6 @@ describe('treesitter highlighting', function()
     end)
 
   it("allows to use captures with dots (don't use fallback when specialization of foo exists)", function()
-    if pending_c_parser(pending) then return end
-
     insert([[
     char* x = "Will somebody ever read this?";
     ]])
@@ -708,7 +691,6 @@ describe('treesitter highlighting', function()
   end)
 
   it("supports conceal attribute", function()
-    if pending_c_parser(pending) then return end
     insert(hl_text)
 
     -- conceal can be empty or a single cchar.
diff --git a/test/functional/treesitter/language_spec.lua b/test/functional/treesitter/language_spec.lua
index 8e9941d797..ed84dedb5a 100644
--- a/test/functional/treesitter/language_spec.lua
+++ b/test/functional/treesitter/language_spec.lua
@@ -6,7 +6,6 @@ local command = helpers.command
 local exec_lua = helpers.exec_lua
 local pcall_err = helpers.pcall_err
 local matches = helpers.matches
-local pending_c_parser = helpers.pending_c_parser
 local insert = helpers.insert
 
 before_each(clear)
@@ -28,15 +27,11 @@ describe('treesitter language API', function()
     eq("Error executing lua: .../language.lua:0: no parser for 'borklang' language, see :help treesitter-parsers",
        pcall_err(exec_lua, "parser = vim.treesitter.inspect_language('borklang')"))
 
-    if not pending_c_parser(pending) then
-      matches("Error executing lua: Failed to load parser: uv_dlsym: .+",
-         pcall_err(exec_lua, 'vim.treesitter.require_language("c", nil, false, "borklang")'))
-   end
+    matches("Error executing lua: Failed to load parser: uv_dlsym: .+",
+       pcall_err(exec_lua, 'vim.treesitter.require_language("c", nil, false, "borklang")'))
   end)
 
   it('inspects language', function()
-    if pending_c_parser(pending) then return end
-
     local keys, fields, symbols = unpack(exec_lua([[
       local lang = vim.treesitter.inspect_language('c')
       local keys, symbols = {}, {}
@@ -76,7 +71,6 @@ describe('treesitter language API', function()
   end)
 
   it('checks if vim.treesitter.get_parser tries to create a new parser on filetype change', function ()
-    if pending_c_parser(pending) then return end
     command("set filetype=c")
     -- Should not throw an error when filetype is c
     eq('c', exec_lua("return vim.treesitter.get_parser(0):lang()"))
@@ -87,7 +81,6 @@ describe('treesitter language API', function()
   end)
 
   it('retrieve the tree given a range', function ()
-    if pending_c_parser(pending) then return end
     insert([[
       int main() {
         int x = 3;
@@ -102,7 +95,6 @@ describe('treesitter language API', function()
   end)
 
   it('retrieve the node given a range', function ()
-    if pending_c_parser(pending) then return end
     insert([[
       int main() {
         int x = 3;
diff --git a/test/functional/treesitter/node_spec.lua b/test/functional/treesitter/node_spec.lua
index 87ce1b973c..a82dce47b7 100644
--- a/test/functional/treesitter/node_spec.lua
+++ b/test/functional/treesitter/node_spec.lua
@@ -4,7 +4,6 @@ local clear = helpers.clear
 local eq = helpers.eq
 local exec_lua = helpers.exec_lua
 local insert = helpers.insert
-local pending_c_parser = helpers.pending_c_parser
 
 before_each(clear)
 
@@ -15,10 +14,6 @@ end
 describe('treesitter node API', function()
   clear()
 
-  if pending_c_parser(pending) then
-    return
-  end
-
   it('can move between siblings', function()
     insert([[
       int main(int x, int y, int z) {
diff --git a/test/functional/treesitter/parser_spec.lua b/test/functional/treesitter/parser_spec.lua
index 7f3b0e770a..ccbd55df0e 100644
--- a/test/functional/treesitter/parser_spec.lua
+++ b/test/functional/treesitter/parser_spec.lua
@@ -5,13 +5,11 @@ local eq = helpers.eq
 local insert = helpers.insert
 local exec_lua = helpers.exec_lua
 local feed = helpers.feed
-local pending_c_parser = helpers.pending_c_parser
 
 before_each(clear)
 
 describe('treesitter parser API', function()
   clear()
-  if pending_c_parser(pending) then return end
 
   it('parses buffer', function()
     if helpers.pending_win32(pending) then return end
@@ -249,7 +247,6 @@ void ui_refresh(void)
   end)
 
   it('supports getting text of multiline node', function()
-    if pending_c_parser(pending) then return end
     insert(test_text)
     local res = exec_lua([[
       local parser = vim.treesitter.get_parser(0, "c")
diff --git a/test/functional/treesitter/utils_spec.lua b/test/functional/treesitter/utils_spec.lua
index 4f4c18a748..7f5a864c3d 100644
--- a/test/functional/treesitter/utils_spec.lua
+++ b/test/functional/treesitter/utils_spec.lua
@@ -4,7 +4,6 @@ local clear = helpers.clear
 local insert = helpers.insert
 local eq = helpers.eq
 local exec_lua = helpers.exec_lua
-local pending_c_parser = helpers.pending_c_parser
 
 before_each(clear)
 
@@ -12,7 +11,6 @@ describe('treesitter utils', function()
   before_each(clear)
 
   it('can find an ancestor', function()
-    if pending_c_parser(pending) then return end
 
     insert([[
       int main() {
-- 
cgit 


From 64cc78c9f39b3066b74f01ec7e3f50fd316416e4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 4 Sep 2022 16:37:24 +0200
Subject: feat(treesitter): add injections

---
 test/functional/treesitter/highlight_spec.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua
index 5a1081592e..5e38a8c2df 100644
--- a/test/functional/treesitter/highlight_spec.lua
+++ b/test/functional/treesitter/highlight_spec.lua
@@ -579,9 +579,9 @@ describe('treesitter highlighting', function()
     -- expect everything to have Error highlight
     screen:expect{grid=[[
       {12:int}{8: x = INT_MAX;}                                                 |
-      {8:#define READ_STRING(x, y) (char_u *)read_string((x), (size_t)(y))}|
-      {8:#define foo void main() { \}                                      |
-      {8:              return 42;  \}                                      |
+      {8:#define READ_STRING(x, y) (}{12:char_u}{8: *)read_string((x), (}{12:size_t}{8:)(y))}|
+      {8:#define foo }{12:void}{8: main() { \}                                      |
+      {8:              }{12:return}{8: 42;  \}                                      |
       {8:            }}                                                    |
       ^                                                                 |
       {1:~                                                                }|
-- 
cgit 


From 97f38f0a9bbae4969f672746a62caa6cba136b45 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 4 Sep 2022 17:58:33 +0200
Subject: fix(treesitter): do not link @error by default

The @error capture is used for tree-sitter's ERROR node, which indicates
a parsing error -- which can be quite frequent (and jarring) while typing.

Users can still manually `hi link @error Error` in their config.
---
 test/functional/treesitter/highlight_spec.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test')

diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua
index 5e38a8c2df..d557b2c012 100644
--- a/test/functional/treesitter/highlight_spec.lua
+++ b/test/functional/treesitter/highlight_spec.lua
@@ -106,6 +106,7 @@ describe('treesitter highlighting', function()
     }
 
     exec_lua([[ hl_query = ... ]], hl_query)
+    command [[ hi link @error ErrorMsg ]]
     command [[ hi link @warning WarningMsg ]]
   end)
 
-- 
cgit 


From 75adfefc85bcf0d62d2c0f51a951e6003b595cea Mon Sep 17 00:00:00 2001
From: Thomas Vigouroux <thomas.vigouroux@protonmail.com>
Date: Mon, 18 Jul 2022 14:21:40 +0200
Subject: feat(extmarks,ts,spell): full support for spelling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Added 'spell' option to extmarks:

  Extmarks with this set will have the region spellchecked.

- Added 'noplainbuffer' option to 'spelloptions':

  This is used to tell Neovim not to spellcheck the buffer. The old
  behaviour was to spell check the whole buffer unless :syntax was set.

- Added spelling support to the treesitter highlighter:

  @spell captures in highlights.scm are used to define regions which
  should be spell checked.

- Added support for navigating spell errors for extmarks:

  Works for both ephemeral and static extmarks

- Added '_on_spell_nav' callback for decoration providers:

  Since ephemeral callbacks are only drawn for the visible screen,
  providers must implement this callback to instruct Neovim which
  regions in the buffer need can be spell checked.

  The callback takes a start position and an end position.

  Note: this callback is subject to change hence the _ prefix.

- Added spell captures for built-in support languages

Co-authored-by: Lewis Russell <lewis6991@gmail.com>
Co-authored-by: Björn Linse <bjorn.linse@gmail.com>
---
 test/functional/ui/decorations_spec.lua | 86 +++++++++++++++++++++++++++++++--
 1 file changed, 83 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua
index 789f1c6487..db5a775632 100644
--- a/test/functional/ui/decorations_spec.lua
+++ b/test/functional/ui/decorations_spec.lua
@@ -31,6 +31,8 @@ describe('decorations providers', function()
       [12] = {foreground = tonumber('0x990000')};
       [13] = {background = Screen.colors.LightBlue};
       [14] = {background = Screen.colors.WebGray, foreground = Screen.colors.DarkBlue};
+      [15] = {special = Screen.colors.Blue1, undercurl = true},
+      [16] = {special = Screen.colors.Red, undercurl = true},
     }
   end)
 
@@ -56,7 +58,7 @@ describe('decorations providers', function()
       a.nvim_set_decoration_provider(_G.ns1, {
         on_start = on_do; on_buf = on_do;
         on_win = on_do; on_line = on_do;
-        on_end = on_do;
+        on_end = on_do; _on_spell_nav = on_do;
       })
       return _G.ns1
     ]])
@@ -95,7 +97,7 @@ describe('decorations providers', function()
                                               |
     ]]}
     check_trace {
-      { "start", 4, 40 };
+      { "start", 4 };
       { "win", 1000, 1, 0, 8 };
       { "line", 1000, 1, 0 };
       { "line", 1000, 1, 1 };
@@ -119,7 +121,7 @@ describe('decorations providers', function()
                                               |
     ]]}
     check_trace {
-      { "start", 5, 10 };
+      { "start", 5 };
       { "buf", 1 };
       { "win", 1000, 1, 0, 8 };
       { "line", 1000, 1, 6 };
@@ -156,6 +158,84 @@ describe('decorations providers', function()
     ]]}
   end)
 
+  it('can indicate spellchecked points', function()
+    exec [[
+    set spell
+    set spelloptions=noplainbuffer
+    syntax off
+    ]]
+
+    insert [[
+    I am well written text.
+    i am not capitalized.
+    I am a speling mistakke.
+    ]]
+
+    setup_provider [[
+      local ns = a.nvim_create_namespace "spell"
+      beamtrace = {}
+      local function on_do(kind, ...)
+        if kind == 'win' or kind == 'spell' then
+          a.nvim_buf_set_extmark(0, ns, 0, 0, { end_row = 2, end_col = 23, spell = true, ephemeral = true })
+        end
+        table.insert(beamtrace, {kind, ...})
+      end
+    ]]
+
+    check_trace {
+      { "start", 5 };
+      { "win", 1000, 1, 0, 5 };
+      { "line", 1000, 1, 0 };
+      { "line", 1000, 1, 1 };
+      { "line", 1000, 1, 2 };
+      { "line", 1000, 1, 3 };
+      { "end", 5 };
+    }
+
+    feed "gg0"
+
+    screen:expect{grid=[[
+    ^I am well written text.                 |
+    {15:i} am not capitalized.                   |
+    I am a {16:speling} {16:mistakke}.                |
+                                            |
+    {1:~                                       }|
+    {1:~                                       }|
+    {1:~                                       }|
+                                            |
+    ]]}
+
+    feed "]s"
+    check_trace {
+      { "spell", 1000, 1, 1, 0, 1, -1 };
+    }
+    screen:expect{grid=[[
+    I am well written text.                 |
+    {15:^i} am not capitalized.                   |
+    I am a {16:speling} {16:mistakke}.                |
+                                            |
+    {1:~                                       }|
+    {1:~                                       }|
+    {1:~                                       }|
+                                            |
+    ]]}
+
+    feed "]s"
+    check_trace {
+      { "spell", 1000, 1, 2, 7, 2, -1 };
+    }
+    screen:expect{grid=[[
+    I am well written text.                 |
+    {15:i} am not capitalized.                   |
+    I am a {16:^speling} {16:mistakke}.                |
+                                            |
+    {1:~                                       }|
+    {1:~                                       }|
+    {1:~                                       }|
+                                            |
+    ]]}
+  end)
+
   it('can predefine highlights', function()
     screen:try_resize(40, 16)
     insert(mulholland)
-- 
cgit 


From 73207cae611a1efb8cd17139e8228772daeb9866 Mon Sep 17 00:00:00 2001
From: Dundar Göc <gocdundar@gmail.com>
Date: Fri, 26 Aug 2022 23:11:25 +0200
Subject: refactor: replace char_u with char

Work on https://github.com/neovim/neovim/issues/459
---
 test/unit/message_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/unit/message_spec.lua b/test/unit/message_spec.lua
index 7e92b5c857..549eff6e03 100644
--- a/test/unit/message_spec.lua
+++ b/test/unit/message_spec.lua
@@ -22,7 +22,7 @@ describe('trunc_string', function()
   local function test_copy(s, expected, room)
     room = room and room or 20
     local buf = cimp.xmalloc(ffi.sizeof('char_u') * buflen)
-    local str = cimp.vim_strsave(to_cstr(s))
+    local str = cimp.xstrdup(to_cstr(s))
     cimp.trunc_string(str, buf, room, buflen)
     eq(expected, ffi.string(buf))
     cimp.xfree(buf)
-- 
cgit 


From b76e33b5989dcdbc48cdb6f099c9c0c917efa610 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 9 Feb 2022 08:46:37 +0100
Subject: fix(terminal): adopt altscreen test for libvterm 0.2 changes

Due to a rewrite of the resize handling logic in libvterm, the behavior
changed. It's actually fixing a bug.

https://github.com/cryptomilk/libvterm/commit/16b857457575c3fd6ffdb0866d7a190b69c28312
---
 test/functional/terminal/altscreen_spec.lua | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/functional/terminal/altscreen_spec.lua b/test/functional/terminal/altscreen_spec.lua
index 155a156d15..e4e1aa5fa2 100644
--- a/test/functional/terminal/altscreen_spec.lua
+++ b/test/functional/terminal/altscreen_spec.lua
@@ -126,13 +126,13 @@ describe(':terminal altscreen', function()
       wait_removal()
       feed('<c-\\><c-n>4k')
       screen:expect([[
-        ^line3                                             |
+        ^                                                  |
                                                           |
                                                           |
         rows: 4, cols: 50                                 |
                                                           |
       ]])
-      eq(8, curbuf('line_count'))
+      eq(9, curbuf('line_count'))
     end)
 
     describe('and after exit', function()
@@ -142,15 +142,11 @@ describe(':terminal altscreen', function()
       end)
 
       it('restore buffer state', function()
-        -- FIXME(tarruda): Note that the last line was lost after restoring the
-        -- screen. This is a libvterm bug: When the main screen is restored it
-        -- seems to "cut" lines that would have been left below the new visible
-        -- screen.
         screen:expect([[
-          line4                                             |
           line5                                             |
           line6                                             |
           line7                                             |
+          line8                                             |
           {3:-- TERMINAL --}                                    |
         ]])
       end)
-- 
cgit 


From f32fd19f1eedbd75e6a37b73f28cf8761e0e875c Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Wed, 7 Sep 2022 03:55:03 +0100
Subject: fix(diagnostic): remove buf from cache on `BufWipeout` (#20099)

Doing so on `BufDelete` has issues:
  - `BufDelete` is also fired for listed buffers that are made unlisted.
  - `BufDelete` is not fired for unlisted buffers that are deleted.

This means that diagnostics will be lost for a buffer that becomes unlisted.

It also means that if an entry exists for an unlisted buffer, deleting that
buffer later will not remove its entry from the cache (and you may see "Invalid
buffer id" errors when using diagnostic functions if it was wiped).

Instead, remove a buffer from the cache if it is wiped out.
This means simply `:bd`ing a buffer will not clear its diagnostics now.
---
 test/functional/lua/diagnostic_spec.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 4226bcebac..1514dadca8 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -148,6 +148,15 @@ describe('vim.diagnostic', function()
       vim.cmd('bwipeout!')
       return #vim.diagnostic.get()
     ]])
+    eq(2, exec_lua [[
+      vim.api.nvim_set_current_buf(diagnostic_bufnr)
+      vim.opt_local.buflisted = false
+      return #vim.diagnostic.get()
+    ]])
+    eq(0, exec_lua [[
+      vim.cmd('bwipeout!')
+      return #vim.diagnostic.get()
+    ]])
   end)
 
   it('resolves buffer number 0 to the current buffer', function()
-- 
cgit 


From fd1595514b747d8b083f78007579d869ccfbe89c Mon Sep 17 00:00:00 2001
From: Thomas Vigouroux <thomas.vigouroux@protonmail.com>
Date: Wed, 7 Sep 2022 08:39:56 +0200
Subject: Use weak tables in tree-sitter code (#17117)

feat(treesitter): use weak tables when possible

Also add the defaulttable function to create a table whose values are created when a key is missing.
---
 test/functional/lua/vim_spec.lua | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index f2fb661b70..cd3240cd30 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -2754,6 +2754,24 @@ describe('lua stdlib', function()
 
   end)
 
+  describe("vim.defaulttable", function()
+    it("creates nested table by default", function()
+      eq({ b = {c = 1 } }, exec_lua[[
+        local a = vim.defaulttable()
+        a.b.c = 1
+        return a
+      ]])
+    end)
+
+    it("allows to create default objects", function()
+      eq({ b = 1 }, exec_lua[[
+        local a = vim.defaulttable(function() return 0 end)
+        a.b = a.b + 1
+        return a
+      ]])
+    end)
+  end)
+
 end)
 
 describe('lua: builtin modules', function()
-- 
cgit 


From 4dc4cf346755375e49410e16635c00a602b26c36 Mon Sep 17 00:00:00 2001
From: ii14 <59243201+ii14@users.noreply.github.com>
Date: Wed, 7 Sep 2022 17:59:27 +0200
Subject: fix(options): mark `winhighlight` as list style  (#19477)

Also add missing fcs, lcs and winhighlight to list of key-value options for `vim.opt`.

Co-authored-by: ii14 <ii14@users.noreply.github.com>
---
 test/functional/api/vim_spec.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index edbdd54c2f..44775ef85c 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -2732,8 +2732,8 @@ describe('API', function()
 
     it('should have information about window options', function()
       eq({
-        allows_duplicates = true,
-        commalist = false;
+        allows_duplicates = false,
+        commalist = true;
         default = "";
         flaglist = false;
         global_local = false;
-- 
cgit 


From 4a67f9d386bb16149eecf32f45a3cb73878f12e7 Mon Sep 17 00:00:00 2001
From: ii14 <ii14@users.noreply.github.com>
Date: Wed, 7 Sep 2022 20:45:22 +0200
Subject: vim-patch:9.0.0409: #{g:x} was seen as a curly-braces expression

Problem:    #{g:x} was seen as a curly-braces expression.
Solution:   Do never see #{} as a curly-braces expression. (closes vim/vim#11075)
https://github.com/vim/vim/commit/7c7e1e9b98d4e5dbe7358c795a635c6f1f36f418
---
 test/functional/ex_cmds/source_spec.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/ex_cmds/source_spec.lua b/test/functional/ex_cmds/source_spec.lua
index cd1f43f9fd..10ebefd8cd 100644
--- a/test/functional/ex_cmds/source_spec.lua
+++ b/test/functional/ex_cmds/source_spec.lua
@@ -104,7 +104,7 @@ describe(':source', function()
     eq("0zBEEFCAFE", meths.exec('echo d', true))
 
     exec('set cpoptions+=C')
-    eq('Vim(let):E15: Invalid expression: #{', exc_exec('source'))
+    eq('Vim(let):E723: Missing end of Dictionary \'}\': ', exc_exec('source'))
   end)
 
   it('selection in current buffer', function()
@@ -138,7 +138,7 @@ describe(':source', function()
     eq('Vim(echo):E117: Unknown function: s:C', exc_exec('echo D()'))
 
     exec('set cpoptions+=C')
-    eq('Vim(let):E15: Invalid expression: #{', exc_exec("'<,'>source"))
+    eq('Vim(let):E723: Missing end of Dictionary \'}\': ', exc_exec("'<,'>source"))
   end)
 
   it('does not break if current buffer is modified while sourced', function()
-- 
cgit 


From 11167ab6d569994dd0a4f58155c84b118706380c Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Thu, 8 Sep 2022 11:33:04 +0200
Subject: feat(lsp): add range option to lsp.buf.format (#19998)

---
 test/functional/plugin/lsp_spec.lua | 48 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index fa731f6faf..9da2c4aa61 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -3180,8 +3180,54 @@ describe('LSP', function()
         end,
       }
     end)
+    it('format formats range in visual mode', function()
+      local result = exec_lua([[
+        local messages = {}
+        local server = function(dispatchers)
+          local closing = false
+          return {
+            request = function(method, params, callback)
+              table.insert(messages, {
+                method = method,
+                params = params,
+              })
+              if method == 'initialize' then
+                callback(nil, {
+                  capabilities = {
+                    documentFormattingProvider = true,
+                    documentRangeFormattingProvider = true,
+                  }
+                })
+              end
+            end,
+            notify = function(...)
+            end,
+            is_closing = function()
+              return closing
+            end,
+            terminate = function()
+              closing = true
+            end
+          }
+        end
+        local bufnr = vim.api.nvim_get_current_buf()
+        local client_id = vim.lsp.start({ name = 'dummy', cmd = server })
+        vim.api.nvim_win_set_buf(0, bufnr)
+        vim.api.nvim_buf_set_lines(bufnr, 0, -1, true, {'foo', 'bar'})
+        vim.api.nvim_win_set_cursor(0, { 1, 0 })
+        vim.cmd.normal('v')
+        vim.api.nvim_win_set_cursor(0, { 2, 3 })
+        vim.lsp.buf.format({ bufnr = bufnr, false })
+        return messages
+      ]])
+      eq("textDocument/rangeFormatting", result[2].method)
+      local expected_range = {
+        start = { line = 0, character = 0 },
+        ['end'] = { line = 1, character = 4 },
+      }
+      eq(expected_range, result[2].params.range)
+    end)
   end)
-
   describe('cmd', function()
     it('can connect to lsp server via rpc.connect', function()
       local result = exec_lua [[
-- 
cgit 


From 30ca6d23a9c77175a76a4cd59da81de83d9253af Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Thu, 8 Sep 2022 23:09:32 +0800
Subject: fix(lsp): when buffer detach remove buffer from client attached
 buffers (#20081)

Co-authored-by: Mathias Fussenegger <f.mathias@zignar.net>
---
 test/functional/plugin/lsp_spec.lua | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'test')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index 9da2c4aa61..e0035e2e8b 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -418,6 +418,42 @@ describe('LSP', function()
       }
     end)
 
+    it('should detach buffer on bufwipe', function()
+      local result = exec_lua([[
+        local server = function(dispatchers)
+          local closing = false
+          return {
+            request = function(method, params, callback)
+              if method == 'initialize' then
+                callback(nil, { capabilities = {} })
+              end
+            end,
+            notify = function(...)
+            end,
+            is_closing = function() return closing end,
+            terminate = function() closing = true end
+          }
+        end
+        local bufnr = vim.api.nvim_create_buf(false, true)
+        vim.api.nvim_set_current_buf(bufnr)
+        local client_id = vim.lsp.start({ name = 'detach-dummy', cmd = server })
+        assert(client_id, "lsp.start must return client_id")
+        local client = vim.lsp.get_client_by_id(client_id)
+        local num_attached_before = vim.tbl_count(client.attached_buffers)
+        vim.api.nvim_buf_delete(bufnr, { force = true })
+        local num_attached_after = vim.tbl_count(client.attached_buffers)
+        return {
+          bufnr = bufnr,
+          client_id = client_id,
+          num_attached_before = num_attached_before,
+          num_attached_after = num_attached_after,
+        }
+      ]])
+      eq(true, result ~= nil, "exec_lua must return result")
+      eq(1, result.num_attached_before)
+      eq(0, result.num_attached_after)
+    end)
+
     it('client should return settings via workspace/configuration handler', function()
       local expected_handlers = {
         {NIL, {}, {method="shutdown", client_id=1}};
-- 
cgit 


From 2d6735d8cecc587eb5549f65260ee9ddeb8e1d78 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Fri, 9 Sep 2022 00:12:42 +0200
Subject: ci: move BSD jobs from sourcehut to Cirrus CI #19616

dispatch.sr.ht is being deprecated, meaning that using sourcehut CI
won't be possible (see https://github.com/neovim/neovim/issues/19609).
Since Github Actions doesn't provide any BSD runners an external service
is required and Cirrus CI seems like a good replacement for sourcehut.

Initially experimented with using FreeBSD and OpenBSD virtual machines
in GitHub Actions, but Cirrus has been a much better fit with better
performance, logs and overall experience.

Failing tests are automatically skipped on FreeBSD regardless if it's on
CI or not. Ideally these tests should only be skipped in CI with the
help of `isCI` helper function. Unfortunately, the tests don't recognize
the environment variable CIRRUS_CI even if it's set manually. This
workaround is good enough for the time being, but we might want to only
skip tests when using the CI (or even better, fix the failing tests).

Closes: https://github.com/neovim/neovim/issues/19609
---
 test/functional/api/server_notifications_spec.lua | 4 ++++
 test/functional/core/fileio_spec.lua              | 7 +++++++
 test/functional/ex_cmds/write_spec.lua            | 7 +++++++
 test/functional/terminal/ex_terminal_spec.lua     | 4 ++++
 test/helpers.lua                                  | 5 ++---
 5 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/server_notifications_spec.lua b/test/functional/api/server_notifications_spec.lua
index 1c00f001ff..1c554b05a3 100644
--- a/test/functional/api/server_notifications_spec.lua
+++ b/test/functional/api/server_notifications_spec.lua
@@ -7,6 +7,7 @@ local exec_lua = helpers.exec_lua
 local retry = helpers.retry
 local isCI = helpers.isCI
 local assert_alive = helpers.assert_alive
+local uname = helpers.uname
 
 describe('notify', function()
   local channel
@@ -78,6 +79,9 @@ describe('notify', function()
   end)
 
   it('cancels stale events on channel close', function()
+    if uname() == 'freebsd' then
+      pending('Failing FreeBSD test')
+    end
     if isCI() then
       pending('hangs on CI #14083 #15251')
       return
diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua
index a4d22685e8..e71131dcf8 100644
--- a/test/functional/core/fileio_spec.lua
+++ b/test/functional/core/fileio_spec.lua
@@ -23,6 +23,7 @@ local iswin = helpers.iswin
 local assert_alive = helpers.assert_alive
 local expect_exit = helpers.expect_exit
 local write_file = helpers.write_file
+local uname = helpers.uname
 
 describe('fileio', function()
   before_each(function()
@@ -83,6 +84,9 @@ describe('fileio', function()
   end)
 
   it('backup #9709', function()
+    if uname() == 'freebsd' then
+      pending('Failing FreeBSD test')
+    end
     clear({ args={ '-i', 'Xtest_startup_shada',
                    '--cmd', 'set directory=Xtest_startup_swapdir' } })
 
@@ -102,6 +106,9 @@ describe('fileio', function()
   end)
 
   it('backup with full path #11214', function()
+    if uname() == 'freebsd' then
+      pending('Failing FreeBSD test')
+    end
     clear()
     mkdir('Xtest_backupdir')
     command('set backup')
diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua
index 32fe397c03..14035a4341 100644
--- a/test/functional/ex_cmds/write_spec.lua
+++ b/test/functional/ex_cmds/write_spec.lua
@@ -9,6 +9,7 @@ local feed_command = helpers.feed_command
 local funcs = helpers.funcs
 local meths = helpers.meths
 local iswin = helpers.iswin
+local uname = helpers.uname
 
 local fname = 'Xtest-functional-ex_cmds-write'
 local fname_bak = fname .. '~'
@@ -52,6 +53,9 @@ describe(':write', function()
   end)
 
   it('&backupcopy=no replaces symlink with new file', function()
+    if uname() == 'freebsd' then
+      pending('Failing FreeBSD test')
+    end
     command('set backupcopy=no')
     write_file('test_bkc_file.txt', 'content0')
     if iswin() then
@@ -91,6 +95,9 @@ describe(':write', function()
   end)
 
   it('errors out correctly', function()
+    if uname() == 'freebsd' then
+      pending('Failing FreeBSD test')
+    end
     command('let $HOME=""')
     eq(funcs.fnamemodify('.', ':p:h'), funcs.fnamemodify('.', ':p:h:~'))
     -- Message from check_overwrite
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index 23b69319f0..36f9f90143 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -10,6 +10,7 @@ local retry = helpers.retry
 local ok = helpers.ok
 local iswin = helpers.iswin
 local command = helpers.command
+local uname = helpers.uname
 
 describe(':terminal', function()
   local screen
@@ -45,6 +46,9 @@ describe(':terminal', function()
   end)
 
   it("reads output buffer on terminal reporting #4151", function()
+    if uname() == 'freebsd' then
+      pending('Failing FreeBSD test')
+    end
     if helpers.pending_win32(pending) then return end
     if iswin() then
       feed_command([[terminal powershell -NoProfile -NoLogo -Command Write-Host -NoNewline "\"$([char]27)[6n\""; Start-Sleep -Milliseconds 500 ]])
diff --git a/test/helpers.lua b/test/helpers.lua
index 7ec9beea92..499b91488b 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -790,10 +790,9 @@ end
 
 function module.isCI(name)
   local any = (name == nil)
-  assert(any or name == 'sourcehut' or name == 'github')
-  local sh = ((any or name == 'sourcehut') and nil ~= os.getenv('SOURCEHUT'))
+  assert(any or name == 'github')
   local gh = ((any or name == 'github') and nil ~= os.getenv('GITHUB_ACTIONS'))
-  return sh or gh
+  return gh
 
 end
 
-- 
cgit 


From 7533ceec13a1dd9a1e46a523975bddf52f533a93 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 8 Sep 2022 15:56:35 +0100
Subject: refactor(vim.opt): unify vim.bo/wo building

---
 test/functional/lua/vim_spec.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index cd3240cd30..2466e9cc31 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -1396,7 +1396,7 @@ describe('lua stdlib', function()
     ]]
     eq('', funcs.luaeval "vim.bo.filetype")
     eq(true, funcs.luaeval "vim.bo[BUF].modifiable")
-    matches("unknown option 'nosuchopt'$",
+    matches("no such option: 'nosuchopt'$",
        pcall_err(exec_lua, 'return vim.bo.nosuchopt'))
     matches("Expected lua string$",
        pcall_err(exec_lua, 'return vim.bo[0][0].autoread'))
@@ -1417,7 +1417,7 @@ describe('lua stdlib', function()
     eq(0, funcs.luaeval "vim.wo.cole")
     eq(0, funcs.luaeval "vim.wo[0].cole")
     eq(0, funcs.luaeval "vim.wo[1001].cole")
-    matches("unknown option 'notanopt'$",
+    matches("no such option: 'notanopt'$",
        pcall_err(exec_lua, 'return vim.wo.notanopt'))
     matches("Expected lua string$",
        pcall_err(exec_lua, 'return vim.wo[0][0].list'))
-- 
cgit 


From 38059b4f31d8c9374002e209bc9ee2df28ac17fa Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 12 Sep 2022 14:03:32 +0800
Subject: vim-patch:8.2.2646: Vim9: error for not using string doesn't mention
 argument

Problem:    Vim9: error for not using string doesn't mention argument.
Solution:   Add argument number.
https://github.com/vim/vim/commit/f28f2ac425600b88da0bdcc12a82cd620f575681
---
 test/functional/vimscript/executable_spec.lua | 6 ++++--
 test/functional/vimscript/exepath_spec.lua    | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/functional/vimscript/executable_spec.lua b/test/functional/vimscript/executable_spec.lua
index b4162b2336..b49eb09512 100644
--- a/test/functional/vimscript/executable_spec.lua
+++ b/test/functional/vimscript/executable_spec.lua
@@ -34,11 +34,13 @@ describe('executable()', function()
 
   it('fails for invalid values', function()
     for _, input in ipairs({'v:null', 'v:true', 'v:false', '{}', '[]'}) do
-      eq('Vim(call):E928: String required', exc_exec('call executable('..input..')'))
+      eq('Vim(call):E1174: String required for argument 1',
+         exc_exec('call executable('..input..')'))
     end
     command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")')
     for _, input in ipairs({'v:null', 'v:true', 'v:false'}) do
-      eq('Vim(call):E928: String required', exc_exec('call executable('..input..')'))
+      eq('Vim(call):E1174: String required for argument 1',
+         exc_exec('call executable('..input..')'))
     end
   end)
 
diff --git a/test/functional/vimscript/exepath_spec.lua b/test/functional/vimscript/exepath_spec.lua
index bbca954511..439dd96fcd 100644
--- a/test/functional/vimscript/exepath_spec.lua
+++ b/test/functional/vimscript/exepath_spec.lua
@@ -21,12 +21,12 @@ describe('exepath()', function()
 
   it('fails for invalid values', function()
     for _, input in ipairs({'v:null', 'v:true', 'v:false', '{}', '[]'}) do
-      eq('Vim(call):E928: String required', exc_exec('call exepath('..input..')'))
+      eq('Vim(call):E1174: String required for argument 1', exc_exec('call exepath('..input..')'))
     end
-    eq('Vim(call):E1142: Non-empty string required', exc_exec('call exepath("")'))
+    eq('Vim(call):E1142: Non-empty string required for argument 1', exc_exec('call exepath("")'))
     command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")')
     for _, input in ipairs({'v:null', 'v:true', 'v:false'}) do
-      eq('Vim(call):E928: String required', exc_exec('call exepath('..input..')'))
+      eq('Vim(call):E1174: String required for argument 1', exc_exec('call exepath('..input..')'))
     end
   end)
 
-- 
cgit 


From 91a150d0a9f81d8db34ba45de2a8a270010e2f3a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 13 Sep 2022 06:01:35 +0800
Subject: test(lsp): call clear() before bufwipe test (#20170)

Otherwise this test cannot be run alone, and fails frequently on CI.
---
 test/functional/plugin/lsp_spec.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index e0035e2e8b..395f8ed32a 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -419,6 +419,7 @@ describe('LSP', function()
     end)
 
     it('should detach buffer on bufwipe', function()
+      clear()
       local result = exec_lua([[
         local server = function(dispatchers)
           local closing = false
-- 
cgit 


From f19e91acd8b90eaddaaa6070db260acf8de9aa10 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 13 Sep 2022 22:08:01 +0800
Subject: vim-patch:9.0.0457: substitute prompt does not highlight an empty
 match (#20186)

Problem:    Substitute prompt does not highlight an empty match.
Solution:   Highlight at least one character.
https://github.com/vim/vim/commit/a04f457a6c071179bac4088c9314007d39d5c5e0
---
 test/functional/legacy/080_substitute_spec.lua | 162 ---------------------
 test/functional/legacy/substitute_spec.lua     | 189 +++++++++++++++++++++++++
 2 files changed, 189 insertions(+), 162 deletions(-)
 delete mode 100644 test/functional/legacy/080_substitute_spec.lua
 create mode 100644 test/functional/legacy/substitute_spec.lua

(limited to 'test')

diff --git a/test/functional/legacy/080_substitute_spec.lua b/test/functional/legacy/080_substitute_spec.lua
deleted file mode 100644
index faeb61e3af..0000000000
--- a/test/functional/legacy/080_substitute_spec.lua
+++ /dev/null
@@ -1,162 +0,0 @@
--- Test for *sub-replace-special* and *sub-replace-expression* on substitute().
--- Test for submatch() on substitute().
--- Test for *:s%* on :substitute.
-
-local helpers = require('test.functional.helpers')(after_each)
-local feed, insert = helpers.feed, helpers.insert
-local clear, feed_command, expect = helpers.clear, helpers.feed_command, helpers.expect
-local eq, eval = helpers.eq, helpers.eval
-
-describe('substitue()', function()
-  before_each(clear)
-
-  -- The original test contained several TEST_X lines to delimit different
-  -- parts.  These where used to split the test into different it() blocks.
-  -- The TEST_X strings are repeated in the description of the blocks to make
-  -- it easier to incorporate upstream changes.
-
-  local function test_1_and_2()
-    eq('AA', eval("substitute('A', 'A', '&&', '')"))
-    eq('&', eval([[substitute('B', 'B', '\&', '')]]))
-    eq('C123456789987654321', eval([[substitute('C123456789', ]] ..
-      [['C\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', ]] ..
-      [['\0\9\8\7\6\5\4\3\2\1', '')]]))
-    eq('d', eval("substitute('D', 'D', 'd', '')"))
-    eq('~', eval("substitute('E', 'E', '~', '')"))
-    eq('~', eval([[substitute('F', 'F', '\~', '')]]))
-    eq('Gg', eval([[substitute('G', 'G', '\ugg', '')]]))
-    eq('Hh', eval([[substitute('H', 'H', '\Uh\Eh', '')]]))
-    eq('iI', eval([[substitute('I', 'I', '\lII', '')]]))
-    eq('jJ', eval([[substitute('J', 'J', '\LJ\EJ', '')]]))
-    eq('Kk', eval([[substitute('K', 'K', '\Uk\ek', '')]]))
-    eq('l\rl', eval("substitute('lLl', 'L', '\r', '')"))
-    eq('m\rm', eval([[substitute('mMm', 'M', '\r', '')]]))
-    eq('n\rn', eval("substitute('nNn', 'N', '\\\r', '')"))
-    eq('o\no', eval([[substitute('oOo', 'O', '\n', '')]]))
-    eq('p\bp', eval([[substitute('pPp', 'P', '\b', '')]]))
-    eq('q\tq', eval([[substitute('qQq', 'Q', '\t', '')]]))
-    eq('r\\r', eval([[substitute('rRr', 'R', '\\', '')]]))
-    eq('scs', eval([[substitute('sSs', 'S', '\c', '')]]))
-    eq('t\rt', eval([[substitute('tTt', 'T', "\r", '')]]))
-    eq('u\nu', eval([[substitute('uUu', 'U', "\n", '')]]))
-    eq('v\bv', eval([[substitute('vVv', 'V', "\b", '')]]))
-    eq('w\\w', eval([[substitute('wWw', 'W', "\\", '')]]))
-    eq('XxxX', eval([[substitute('X', 'X', '\L\uxXx\l\EX', '')]]))
-    eq('yYYy', eval([[substitute('Y', 'Y', '\U\lYyY\u\Ey', '')]]))
-  end
-
-  it('with "set magic" (TEST_1)', function()
-    feed_command('set magic')
-    test_1_and_2()
-  end)
-
-  it('with "set nomagic" (TEST_2)', function()
-    feed_command('set nomagic')
-    test_1_and_2()
-  end)
-
-  it('with sub-replace-expression (TEST_3)', function()
-    feed_command('set magic&')
-    eq('a\\a', eval([[substitute('aAa', 'A', '\="\\"', '')]]))
-    eq('b\\\\b', eval([[substitute('bBb', 'B', '\="\\\\"', '')]]))
-    eq('c\rc', eval([[substitute('cCc', 'C', '\="]]..'\r'..[["', '')]]))
-    eq('d\\\rd', eval([[substitute('dDd', 'D', '\="\\]]..'\r'..[["', '')]]))
-    eq('e\\\\\re',
-      eval([[substitute('eEe', 'E', '\="\\\\]]..'\r'..[["', '')]]))
-    eq('f\\rf', eval([[substitute('fFf', 'F', '\="\\r"', '')]]))
-    eq('j\\nj', eval([[substitute('jJj', 'J', '\="\\n"', '')]]))
-    eq('k\rk', eval([[substitute('kKk', 'K', '\="\r"', '')]]))
-    eq('l\nl', eval([[substitute('lLl', 'L', '\="\n"', '')]]))
-  end)
-
-  it('with submatch() (TEST_4)', function()
-    feed_command('set magic&')
-    eq('a\\a', eval([[substitute('aAa', 'A', ]] ..
-      [['\=substitute(submatch(0), ".", "\\", "")', '')]]))
-    eq('b\\b', eval([[substitute('bBb', 'B', ]] ..
-      [['\=substitute(submatch(0), ".", "\\\\", "")', '')]]))
-    eq('c\rc', eval([[substitute('cCc', 'C', ]] ..
-      [['\=substitute(submatch(0), ".", "]]..'\r'..[[", "")', '')]]))
-    eq('d\rd', eval([[substitute('dDd', 'D', ]] ..
-      [['\=substitute(submatch(0), ".", "\\]]..'\r'..[[", "")', '')]]))
-    eq('e\\\re', eval([[substitute('eEe', 'E', ]] ..
-      [['\=substitute(submatch(0), ".", "\\\\]]..'\r'..[[", "")', '')]]))
-    eq('f\rf', eval([[substitute('fFf', 'F', ]] ..
-      [['\=substitute(submatch(0), ".", "\\r", "")', '')]]))
-    eq('j\nj', eval([[substitute('jJj', 'J', ]] ..
-      [['\=substitute(submatch(0), ".", "\\n", "")', '')]]))
-    eq('k\rk', eval([[substitute('kKk', 'K', ]] ..
-      [['\=substitute(submatch(0), ".", "\r", "")', '')]]))
-    eq('l\nl', eval([[substitute('lLl', 'L', ]] ..
-      [['\=substitute(submatch(0), ".", "\n", "")', '')]]))
-  end)
-
-  it('with submatch() (TEST_5)', function()
-    feed_command('set magic&')
-    eq('A123456789987654321', eval([[substitute('A123456789', ]] ..
-      [['A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', ]] ..
-      [['\=submatch(0) . submatch(9) . submatch(8) . submatch(7) . ]] ..
-      [[submatch(6) . submatch(5) . submatch(4) . submatch(3) . ]] ..
-      [[submatch(2) . submatch(1)', '')]]))
-    eq("[['A123456789'], ['9'], ['8'], ['7'], ['6'], ['5'], ['4'], ['3'], " ..
-      "['2'], ['1']]", eval([[substitute('A123456789', ]] ..
-      [['A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', ]] ..
-      [['\=string([submatch(0, 1), submatch(9, 1), submatch(8, 1), ]] ..
-      [[submatch(7, 1), submatch(6, 1), submatch(5, 1), submatch(4, 1), ]] ..
-      [[submatch(3, 1), submatch(2, 1), submatch(1, 1)])', '')]]))
-  end)
-
-  -- TEST_6 was about the 'cpoptions' flag / which was removed in pull request
-  -- #2943.
-
-  it('with submatch or \\ze (TEST_7)', function()
-    feed_command('set magic&')
-    eq('A\rA', eval("substitute('A\rA', 'A.', '\\=submatch(0)', '')"))
-    eq('B\nB', eval([[substitute("B\nB", 'B.', '\=submatch(0)', '')]]))
-    eq("['B\n']B",
-      eval([[substitute("B\nB", 'B.', '\=string(submatch(0, 1))', '')]]))
-    eq('-abab', eval([[substitute('-bb', '\zeb', 'a', 'g')]]))
-    eq('c-cbcbc', eval([[substitute('-bb', '\ze', 'c', 'g')]]))
-  end)
-
-  it('with \\zs and \\ze (TEST_10)', function()
-    feed_command('set magic&')
-    eq('a1a2a3a', eval([[substitute('123', '\zs', 'a', 'g')]]))
-    eq('aaa', eval([[substitute('123', '\zs.', 'a', 'g')]]))
-    eq('1a2a3a', eval([[substitute('123', '.\zs', 'a', 'g')]]))
-    eq('a1a2a3a', eval([[substitute('123', '\ze', 'a', 'g')]]))
-    eq('a1a2a3', eval([[substitute('123', '\ze.', 'a', 'g')]]))
-    eq('aaa', eval([[substitute('123', '.\ze', 'a', 'g')]]))
-    eq('aa2a3a', eval([[substitute('123', '1\|\ze', 'a', 'g')]]))
-    eq('1aaa', eval([[substitute('123', '1\zs\|[23]', 'a', 'g')]]))
-  end)
-end)
-
-describe(':substitue', function()
-  before_each(clear)
-
-  it('with \\ze and \\zs and confirmation dialog (TEST_8)', function()
-    insert([[
-      ,,X
-      ,,Y
-      ,,Z]])
-    feed_command('set magic&')
-    feed_command([[1s/\(^\|,\)\ze\(,\|X\)/\1N/g]])
-    feed_command([[2s/\(^\|,\)\ze\(,\|Y\)/\1N/gc]])
-    feed('a')  -- For the dialog of the previous :s command.
-    feed_command([[3s/\(^\|,\)\ze\(,\|Z\)/\1N/gc]])
-    feed('yy')  -- For the dialog of the previous :s command.
-    expect([[
-      N,,NX
-      N,,NY
-      N,,NZ]])
-  end)
-
-  it('with confirmation dialog (TEST_9)', function()
-    insert('xxx')
-    feed_command('set magic&')
-    feed_command('s/x/X/gc')
-    feed('yyq')  -- For the dialog of the previous :s command.
-    expect('XXx')
-  end)
-end)
diff --git a/test/functional/legacy/substitute_spec.lua b/test/functional/legacy/substitute_spec.lua
new file mode 100644
index 0000000000..f3ce343680
--- /dev/null
+++ b/test/functional/legacy/substitute_spec.lua
@@ -0,0 +1,189 @@
+-- Test for *sub-replace-special* and *sub-replace-expression* on substitute().
+-- Test for submatch() on substitute().
+-- Test for *:s%* on :substitute.
+
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local feed, insert = helpers.feed, helpers.insert
+local exec = helpers.exec
+local clear, feed_command, expect = helpers.clear, helpers.feed_command, helpers.expect
+local eq, eval = helpers.eq, helpers.eval
+
+describe('substitute()', function()
+  before_each(clear)
+
+  -- The original test contained several TEST_X lines to delimit different
+  -- parts.  These where used to split the test into different it() blocks.
+  -- The TEST_X strings are repeated in the description of the blocks to make
+  -- it easier to incorporate upstream changes.
+
+  local function test_1_and_2()
+    eq('AA', eval("substitute('A', 'A', '&&', '')"))
+    eq('&', eval([[substitute('B', 'B', '\&', '')]]))
+    eq('C123456789987654321', eval([[substitute('C123456789', ]] ..
+      [['C\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', ]] ..
+      [['\0\9\8\7\6\5\4\3\2\1', '')]]))
+    eq('d', eval("substitute('D', 'D', 'd', '')"))
+    eq('~', eval("substitute('E', 'E', '~', '')"))
+    eq('~', eval([[substitute('F', 'F', '\~', '')]]))
+    eq('Gg', eval([[substitute('G', 'G', '\ugg', '')]]))
+    eq('Hh', eval([[substitute('H', 'H', '\Uh\Eh', '')]]))
+    eq('iI', eval([[substitute('I', 'I', '\lII', '')]]))
+    eq('jJ', eval([[substitute('J', 'J', '\LJ\EJ', '')]]))
+    eq('Kk', eval([[substitute('K', 'K', '\Uk\ek', '')]]))
+    eq('l\rl', eval("substitute('lLl', 'L', '\r', '')"))
+    eq('m\rm', eval([[substitute('mMm', 'M', '\r', '')]]))
+    eq('n\rn', eval("substitute('nNn', 'N', '\\\r', '')"))
+    eq('o\no', eval([[substitute('oOo', 'O', '\n', '')]]))
+    eq('p\bp', eval([[substitute('pPp', 'P', '\b', '')]]))
+    eq('q\tq', eval([[substitute('qQq', 'Q', '\t', '')]]))
+    eq('r\\r', eval([[substitute('rRr', 'R', '\\', '')]]))
+    eq('scs', eval([[substitute('sSs', 'S', '\c', '')]]))
+    eq('t\rt', eval([[substitute('tTt', 'T', "\r", '')]]))
+    eq('u\nu', eval([[substitute('uUu', 'U', "\n", '')]]))
+    eq('v\bv', eval([[substitute('vVv', 'V', "\b", '')]]))
+    eq('w\\w', eval([[substitute('wWw', 'W', "\\", '')]]))
+    eq('XxxX', eval([[substitute('X', 'X', '\L\uxXx\l\EX', '')]]))
+    eq('yYYy', eval([[substitute('Y', 'Y', '\U\lYyY\u\Ey', '')]]))
+  end
+
+  it('with "set magic" (TEST_1)', function()
+    feed_command('set magic')
+    test_1_and_2()
+  end)
+
+  it('with "set nomagic" (TEST_2)', function()
+    feed_command('set nomagic')
+    test_1_and_2()
+  end)
+
+  it('with sub-replace-expression (TEST_3)', function()
+    feed_command('set magic&')
+    eq('a\\a', eval([[substitute('aAa', 'A', '\="\\"', '')]]))
+    eq('b\\\\b', eval([[substitute('bBb', 'B', '\="\\\\"', '')]]))
+    eq('c\rc', eval([[substitute('cCc', 'C', '\="]]..'\r'..[["', '')]]))
+    eq('d\\\rd', eval([[substitute('dDd', 'D', '\="\\]]..'\r'..[["', '')]]))
+    eq('e\\\\\re',
+      eval([[substitute('eEe', 'E', '\="\\\\]]..'\r'..[["', '')]]))
+    eq('f\\rf', eval([[substitute('fFf', 'F', '\="\\r"', '')]]))
+    eq('j\\nj', eval([[substitute('jJj', 'J', '\="\\n"', '')]]))
+    eq('k\rk', eval([[substitute('kKk', 'K', '\="\r"', '')]]))
+    eq('l\nl', eval([[substitute('lLl', 'L', '\="\n"', '')]]))
+  end)
+
+  it('with submatch() (TEST_4)', function()
+    feed_command('set magic&')
+    eq('a\\a', eval([[substitute('aAa', 'A', ]] ..
+      [['\=substitute(submatch(0), ".", "\\", "")', '')]]))
+    eq('b\\b', eval([[substitute('bBb', 'B', ]] ..
+      [['\=substitute(submatch(0), ".", "\\\\", "")', '')]]))
+    eq('c\rc', eval([[substitute('cCc', 'C', ]] ..
+      [['\=substitute(submatch(0), ".", "]]..'\r'..[[", "")', '')]]))
+    eq('d\rd', eval([[substitute('dDd', 'D', ]] ..
+      [['\=substitute(submatch(0), ".", "\\]]..'\r'..[[", "")', '')]]))
+    eq('e\\\re', eval([[substitute('eEe', 'E', ]] ..
+      [['\=substitute(submatch(0), ".", "\\\\]]..'\r'..[[", "")', '')]]))
+    eq('f\rf', eval([[substitute('fFf', 'F', ]] ..
+      [['\=substitute(submatch(0), ".", "\\r", "")', '')]]))
+    eq('j\nj', eval([[substitute('jJj', 'J', ]] ..
+      [['\=substitute(submatch(0), ".", "\\n", "")', '')]]))
+    eq('k\rk', eval([[substitute('kKk', 'K', ]] ..
+      [['\=substitute(submatch(0), ".", "\r", "")', '')]]))
+    eq('l\nl', eval([[substitute('lLl', 'L', ]] ..
+      [['\=substitute(submatch(0), ".", "\n", "")', '')]]))
+  end)
+
+  it('with submatch() (TEST_5)', function()
+    feed_command('set magic&')
+    eq('A123456789987654321', eval([[substitute('A123456789', ]] ..
+      [['A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', ]] ..
+      [['\=submatch(0) . submatch(9) . submatch(8) . submatch(7) . ]] ..
+      [[submatch(6) . submatch(5) . submatch(4) . submatch(3) . ]] ..
+      [[submatch(2) . submatch(1)', '')]]))
+    eq("[['A123456789'], ['9'], ['8'], ['7'], ['6'], ['5'], ['4'], ['3'], " ..
+      "['2'], ['1']]", eval([[substitute('A123456789', ]] ..
+      [['A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', ]] ..
+      [['\=string([submatch(0, 1), submatch(9, 1), submatch(8, 1), ]] ..
+      [[submatch(7, 1), submatch(6, 1), submatch(5, 1), submatch(4, 1), ]] ..
+      [[submatch(3, 1), submatch(2, 1), submatch(1, 1)])', '')]]))
+  end)
+
+  -- TEST_6 was about the 'cpoptions' flag / which was removed in pull request
+  -- #2943.
+
+  it('with submatch or \\ze (TEST_7)', function()
+    feed_command('set magic&')
+    eq('A\rA', eval("substitute('A\rA', 'A.', '\\=submatch(0)', '')"))
+    eq('B\nB', eval([[substitute("B\nB", 'B.', '\=submatch(0)', '')]]))
+    eq("['B\n']B",
+      eval([[substitute("B\nB", 'B.', '\=string(submatch(0, 1))', '')]]))
+    eq('-abab', eval([[substitute('-bb', '\zeb', 'a', 'g')]]))
+    eq('c-cbcbc', eval([[substitute('-bb', '\ze', 'c', 'g')]]))
+  end)
+
+  it('with \\zs and \\ze (TEST_10)', function()
+    feed_command('set magic&')
+    eq('a1a2a3a', eval([[substitute('123', '\zs', 'a', 'g')]]))
+    eq('aaa', eval([[substitute('123', '\zs.', 'a', 'g')]]))
+    eq('1a2a3a', eval([[substitute('123', '.\zs', 'a', 'g')]]))
+    eq('a1a2a3a', eval([[substitute('123', '\ze', 'a', 'g')]]))
+    eq('a1a2a3', eval([[substitute('123', '\ze.', 'a', 'g')]]))
+    eq('aaa', eval([[substitute('123', '.\ze', 'a', 'g')]]))
+    eq('aa2a3a', eval([[substitute('123', '1\|\ze', 'a', 'g')]]))
+    eq('1aaa', eval([[substitute('123', '1\zs\|[23]', 'a', 'g')]]))
+  end)
+end)
+
+describe(':substitute', function()
+  before_each(clear)
+
+  it('with \\ze and \\zs and confirmation dialog (TEST_8)', function()
+    insert([[
+      ,,X
+      ,,Y
+      ,,Z]])
+    feed_command('set magic&')
+    feed_command([[1s/\(^\|,\)\ze\(,\|X\)/\1N/g]])
+    feed_command([[2s/\(^\|,\)\ze\(,\|Y\)/\1N/gc]])
+    feed('a')  -- For the dialog of the previous :s command.
+    feed_command([[3s/\(^\|,\)\ze\(,\|Z\)/\1N/gc]])
+    feed('yy')  -- For the dialog of the previous :s command.
+    expect([[
+      N,,NX
+      N,,NY
+      N,,NZ]])
+  end)
+
+  it('with confirmation dialog (TEST_9)', function()
+    insert('xxx')
+    feed_command('set magic&')
+    feed_command('s/x/X/gc')
+    feed('yyq')  -- For the dialog of the previous :s command.
+    expect('XXx')
+  end)
+
+  it('first char is highlighted with confirmation dialog and empty match', function()
+    local screen = Screen.new(60, 8)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {reverse = true},  -- IncSearch
+      [2] = {bold = true, foreground = Screen.colors.SeaGreen},  -- MoreMsg
+    })
+    screen:attach()
+    exec([[
+      set nohlsearch noincsearch
+      call setline(1, ['one', 'two', 'three'])
+    ]])
+    feed(':%s/^/   /c<CR>')
+    screen:expect([[
+      {1:o}ne                                                         |
+      two                                                         |
+      three                                                       |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {2:replace with     (y/n/a/q/l/^E/^Y)?}^                         |
+    ]])
+  end)
+end)
-- 
cgit 


From 1970d2ac43059639e4e2c83223d86397b38786ff Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Tue, 13 Sep 2022 08:33:39 -0600
Subject: feat(diagnostic): pass diagnostics as data to DiagnosticChanged
 autocmd (#20173)

---
 test/functional/lua/diagnostic_spec.lua | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 1514dadca8..28a8679205 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -1983,19 +1983,26 @@ end)
     end)
 
     it('triggers the autocommand when diagnostics are set', function()
-      eq(true, exec_lua [[
+      eq({true, true}, exec_lua [[
         -- Set a different buffer as current to test that <abuf> is being set properly in
         -- DiagnosticChanged callbacks
         local tmp = vim.api.nvim_create_buf(false, true)
         vim.api.nvim_set_current_buf(tmp)
 
-        vim.g.diagnostic_autocmd_triggered = 0
-        vim.cmd('autocmd DiagnosticChanged * let g:diagnostic_autocmd_triggered = +expand("<abuf>")')
+        local triggered = {}
+        vim.api.nvim_create_autocmd('DiagnosticChanged', {
+          callback = function(args)
+            triggered = {args.buf, #args.data.diagnostics}
+          end,
+        })
         vim.api.nvim_buf_set_name(diagnostic_bufnr, "test | test")
         vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
           make_error('Diagnostic', 0, 0, 0, 0)
         })
-        return vim.g.diagnostic_autocmd_triggered == diagnostic_bufnr
+        return {
+          triggered[1] == diagnostic_bufnr,
+          triggered[2] == 1,
+        }
       ]])
       end)
 
-- 
cgit 


From a8c9e721d91efe4730db78c1115261fc128dca68 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Tue, 13 Sep 2022 22:16:20 +0200
Subject: feat(fs): extend fs.find to accept predicate (#20193)

Makes it possible to use `vim.fs.find` to find files where only a
substring is known.
This is useful for `vim.lsp.start` to get the `root_dir` for languages
where the project-file is only known by its extension, not by the full
name.
For example in .NET projects there is usually a `<projectname>.csproj`
file in the project root.

Example:

    vim.fs.find(function(x) return vim.endswith(x, '.csproj') end, { upward = true })
---
 test/functional/lua/fs_spec.lua | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/fs_spec.lua b/test/functional/lua/fs_spec.lua
index 2bcc84db0f..3123ec324c 100644
--- a/test/functional/lua/fs_spec.lua
+++ b/test/functional/lua/fs_spec.lua
@@ -78,6 +78,23 @@ describe('vim.fs', function()
         return vim.fs.find(nvim, { path = dir, type = 'file' })
       ]], test_build_dir, nvim_prog_basename))
     end)
+
+    it('accepts predicate as names', function()
+      eq({test_build_dir}, exec_lua([[
+        local dir = ...
+        local opts = { path = dir, upward = true, type = 'directory' }
+        return vim.fs.find(function(x) return x == 'build' end, opts)
+      ]], nvim_dir))
+      eq({nvim_prog}, exec_lua([[
+        local dir, nvim = ...
+        return vim.fs.find(function(x) return x == nvim end, { path = dir, type = 'file' })
+      ]], test_build_dir, nvim_prog_basename))
+      eq({}, exec_lua([[
+        local dir = ...
+        local opts = { path = dir, upward = true, type = 'directory' }
+        return vim.fs.find(function(x) return x == 'no-match' end, opts)
+      ]], nvim_dir))
+    end)
   end)
 
   describe('normalize()', function()
-- 
cgit 


From 25e4af439f3b5620406776ca77417d897097a3e9 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 12 Sep 2022 11:26:27 +0200
Subject: fix(lua): make vim.str_utfindex and vim.str_byteindex handle NUL
 bytes

fixes #16290
---
 test/functional/lua/vim_spec.lua | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index cd3240cd30..33f4b108da 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -158,17 +158,20 @@ describe('lua stdlib', function()
   end)
 
   it("vim.str_utfindex/str_byteindex", function()
-    exec_lua([[_G.test_text = "xy åäö ɧ 汉语 ↥ 🤦x🦄 å بِيَّ"]])
-    local indicies32 = {[0]=0,1,2,3,5,7,9,10,12,13,16,19,20,23,24,28,29,33,34,35,37,38,40,42,44,46,48}
-    local indicies16 = {[0]=0,1,2,3,5,7,9,10,12,13,16,19,20,23,24,28,28,29,33,33,34,35,37,38,40,42,44,46,48}
+    exec_lua([[_G.test_text = "xy åäö ɧ 汉语 ↥ 🤦x🦄 å بِيَّ\000ъ"]])
+    local indicies32 = {[0]=0,1,2,3,5,7,9,10,12,13,16,19,20,23,24,28,29,33,34,35,37,38,40,42,44,46,48,49,51}
+    local indicies16 = {[0]=0,1,2,3,5,7,9,10,12,13,16,19,20,23,24,28,28,29,33,33,34,35,37,38,40,42,44,46,48,49,51}
     for i,k in pairs(indicies32) do
       eq(k, exec_lua("return vim.str_byteindex(_G.test_text, ...)", i), i)
     end
     for i,k in pairs(indicies16) do
       eq(k, exec_lua("return vim.str_byteindex(_G.test_text, ..., true)", i), i)
     end
+    matches(": index out of range$", pcall_err(exec_lua, "return vim.str_byteindex(_G.test_text, ...)", #indicies32 + 1))
+    matches(": index out of range$", pcall_err(exec_lua, "return vim.str_byteindex(_G.test_text, ..., true)", #indicies16 + 1))
     local i32, i16 = 0, 0
-    for k = 0,48 do
+    local len = 51
+    for k = 0,len do
       if indicies32[i32] < k then
         i32 = i32 + 1
       end
@@ -180,6 +183,7 @@ describe('lua stdlib', function()
       end
       eq({i32, i16}, exec_lua("return {vim.str_utfindex(_G.test_text, ...)}", k), k)
     end
+    matches(": index out of range$", pcall_err(exec_lua, "return vim.str_utfindex(_G.test_text, ...)", len + 1))
   end)
 
   it("vim.str_utf_start", function()
-- 
cgit 


From 708bd686516b420c2b65f4bc4d2c58fe43fb945e Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Tue, 13 Sep 2022 12:56:30 +0200
Subject: feat(ui): use msg_grid based implementation for cmdheight=0

---
 test/functional/ui/cmdline_spec.lua      | 20 ++++++++++----------
 test/functional/vimscript/timer_spec.lua | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index db13647cc6..40dee4186b 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -1022,7 +1022,7 @@ describe('cmdheight=0', function()
       ~                        |
       :^                        |
     ]]}
-    eq(1, eval('&cmdheight'))
+    eq(0, eval('&cmdheight'))
     feed('<cr>')
     screen:expect{grid=[[
       ^                         |
@@ -1040,11 +1040,11 @@ describe('cmdheight=0', function()
     screen:expect{grid=[[
                                |
       ~                        |
-      ~                        |
-      ~                        |
+                               |
+      :call input("foo >")     |
       foo >^                    |
     ]]}
-    eq(1, eval('&cmdheight'))
+    eq(0, eval('&cmdheight'))
     feed('<cr>')
     screen:expect{grid=[[
       ^                         |
@@ -1060,8 +1060,8 @@ describe('cmdheight=0', function()
     command("set cmdheight=0 noruler laststatus=3 winbar=foo")
     feed(':split<CR>')
     screen:expect{grid=[[
-      foo                      |
                                |
+      :split                   |
       E36: Not enough room     |
       Press ENTER or type comma|
       nd to continue^           |
@@ -1079,7 +1079,7 @@ describe('cmdheight=0', function()
       foo                      |
                                |
       ~                        |
-      [No Name]                |
+      ~                        |
       :^                        |
     ]]}
     feed('<Esc>')
@@ -1103,8 +1103,8 @@ describe('cmdheight=0', function()
       ~                        |
       ~                        |
       ~                        |
-      recording @q             |
-    ]], showmode={}}
+      ~                        |
+    ]]}
     feed('q')
     screen:expect{grid=[[
       ^                         |
@@ -1112,7 +1112,7 @@ describe('cmdheight=0', function()
       ~                        |
       ~                        |
       ~                        |
-    ]], showmode={}}
+    ]], unchanged=true}
   end)
 
   it("when substitute text", function()
@@ -1131,7 +1131,7 @@ describe('cmdheight=0', function()
       foo                      |
       ~                        |
       ~                        |
-      [No Name] [+]            |
+      ~                        |
       replace wi...q/l/^E/^Y)?^ |
     ]]}
 
diff --git a/test/functional/vimscript/timer_spec.lua b/test/functional/vimscript/timer_spec.lua
index 5463cfb234..1818a71ea2 100644
--- a/test/functional/vimscript/timer_spec.lua
+++ b/test/functional/vimscript/timer_spec.lua
@@ -131,34 +131,34 @@ describe('timers', function()
     nvim_async("command", "call timer_start("..load_adjust(100)..", 'AddItem', {'repeat': -1})")
 
     screen:expect([[
-      ITEM 1                                  |
+      ^ITEM 1                                  |
       ITEM 2                                  |
       {1:~                                       }|
       {1:~                                       }|
       {1:~                                       }|
-      ^                                        |
+                                              |
     ]])
     nvim_async("command", "let g:cont = 1")
 
     screen:expect([[
-      ITEM 1                                  |
+      ^ITEM 1                                  |
       ITEM 2                                  |
       ITEM 3                                  |
       {1:~                                       }|
       {1:~                                       }|
-      ^                                        |
+                                              |
     ]])
 
     feed("3")
     eq(51, eval("g:c2"))
-    screen:expect([[
+    screen:expect{grid=[[
       ^ITEM 1                                  |
       ITEM 2                                  |
       ITEM 3                                  |
       {1:~                                       }|
       {1:~                                       }|
                                               |
-    ]])
+    ]], unchanged=true}
   end)
 
   it('can be stopped', function()
-- 
cgit 


From 9ec4b20be695501ba166f31dec39ef9e30cc7dd8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 16 Sep 2022 09:05:05 +0200
Subject: fix(treesitter): return full metadata for get_captures_at_position
 (#20203)

fix(treesitter): get_captures_at_position returns metadata

Return the full `metadata` table for the capture instead of just the
priority.

Further cleanup of related docs.
---
 test/functional/treesitter/highlight_spec.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua
index d557b2c012..1684337c3c 100644
--- a/test/functional/treesitter/highlight_spec.lua
+++ b/test/functional/treesitter/highlight_spec.lua
@@ -605,8 +605,8 @@ describe('treesitter highlighting', function()
     }}
 
     eq({
-      {capture='Error', priority='101'};
-      {capture='type'};
+      {capture='Error', metadata = { priority='101' }};
+      {capture='type', metadata = { } };
     }, exec_lua [[ return vim.treesitter.get_captures_at_position(0, 0, 2) ]])
     end)
 
-- 
cgit 


From b616458af90cc12ef7379d06c3ef1fde4958e62b Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Fri, 16 Sep 2022 10:31:37 +0200
Subject: fix(messages): do not crash on cmdheight=0 and g< redisplay

fixes #20153
---
 test/functional/ui/messages_spec.lua | 51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 522c9ccba2..6b8fa99b38 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -2020,4 +2020,55 @@ aliquip ex ea commodo consequat.]])
                                     |
     ]]}
   end)
+
+  it('with cmdheight=0 does not crash with g<', function()
+    command('set cmdheight=0')
+    feed(':ls<cr>')
+    screen:expect{grid=[[
+                                         |
+      {1:~                                  }|
+      {12:                                   }|
+      :ls                                |
+        1 %a   "[No Name]"               |
+           line 1                        |
+      {4:Press ENTER or type command to cont}|
+      {4:inue}^                               |
+    ]]}
+
+    feed('<cr>')
+    screen:expect{grid=[[
+      ^                                   |
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+    ]]}
+
+    feed('g<lt>')
+    screen:expect{grid=[[
+                                         |
+      {1:~                                  }|
+      {12:                                   }|
+      :ls                                |
+        1 %a   "[No Name]"               |
+           line 1                        |
+      {4:Press ENTER or type command to cont}|
+      {4:inue}^                               |
+    ]]}
+
+    feed('<cr>')
+    screen:expect{grid=[[
+      ^                                   |
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+    ]]}
+  end)
 end)
-- 
cgit 


From 754822a066e6ce92462aa17fce8999472c23b777 Mon Sep 17 00:00:00 2001
From: notomo <notomo.motono@gmail.com>
Date: Fri, 16 Sep 2022 18:06:37 +0900
Subject: fix(lua): free vim.ui_attach callback before lua close (#20205)

---
 test/functional/lua/ui_event_spec.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/ui_event_spec.lua b/test/functional/lua/ui_event_spec.lua
index 294222ad13..57ffcf7b4e 100644
--- a/test/functional/lua/ui_event_spec.lua
+++ b/test/functional/lua/ui_event_spec.lua
@@ -105,4 +105,16 @@ describe('vim.ui_attach', function()
     }
 
   end)
+
+  it('does not crash on exit', function()
+    helpers.funcs.system({
+      helpers.nvim_prog,
+      '-u', 'NONE',
+      '-i', 'NONE',
+      '--cmd', [[ lua ns = vim.api.nvim_create_namespace 'testspace' ]],
+      '--cmd', [[ lua vim.ui_attach(ns, {ext_popupmenu=true}, function() end) ]],
+      '--cmd', 'quitall!',
+    })
+    eq(0, helpers.eval('v:shell_error'))
+  end)
 end)
-- 
cgit 


From 6b2f0f43b5f9d375d2be1b4eb4784716dd89ec8f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 16 Sep 2022 23:09:26 +0800
Subject: fix(eval)!: make Lua Funcref work as method and in substitute()
 (#20217)

BREAKING CHANGE: When using a Funcref converted from a Lua function as
a method in Vim script, the result of the base expression is now passed
as the first argument instead of being ignored.

vim-patch:8.2.5117: crash when calling a Lua callback from a :def function

Problem:    Crash when calling a Lua callback from a :def function. (Bohdan
            Makohin)
Solution:   Handle FC_CFUNC in call_user_func_check(). (closes vim/vim#10587)
https://github.com/vim/vim/commit/7d149f899d423b7bf2b90d7b11ebe3e560c462b9
---
 test/functional/lua/vim_spec.lua | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index 33f4b108da..00ce44f48a 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -792,6 +792,11 @@ describe('lua stdlib', function()
       local x = vim.fn.VarArg(function() return 'foo' end, function() return 'bar' end)
       return #x == 2 and x[1]() == 'foo' and x[2]() == 'bar'
     ]]))
+
+    -- Test for #20211
+    eq('a (b) c', exec_lua([[
+      return vim.fn.substitute('a b c', 'b', function(m) return '(' .. m[1] .. ')' end, 'g')
+    ]]))
   end)
 
   it('vim.fn should error when calling API function', function()
@@ -1033,6 +1038,7 @@ describe('lua stdlib', function()
       vim.g.AddCounter = add_counter
       vim.g.GetCounter = get_counter
       vim.g.funcs = {add = add_counter, get = get_counter}
+      vim.g.AddParens = function(s) return '(' .. s .. ')' end
     ]]
 
     eq(0, eval('g:GetCounter()'))
@@ -1048,6 +1054,7 @@ describe('lua stdlib', function()
     eq(5, exec_lua([[return vim.g.funcs.get()]]))
     exec_lua([[vim.api.nvim_get_var('funcs').add()]])
     eq(6, exec_lua([[return vim.api.nvim_get_var('funcs').get()]]))
+    eq('((foo))', eval([['foo'->AddParens()->AddParens()]]))
 
     exec_lua [[
       local counter = 0
@@ -1056,6 +1063,7 @@ describe('lua stdlib', function()
       vim.api.nvim_set_var('AddCounter', add_counter)
       vim.api.nvim_set_var('GetCounter', get_counter)
       vim.api.nvim_set_var('funcs', {add = add_counter, get = get_counter})
+      vim.api.nvim_set_var('AddParens', function(s) return '(' .. s .. ')' end)
     ]]
 
     eq(0, eval('g:GetCounter()'))
@@ -1071,6 +1079,7 @@ describe('lua stdlib', function()
     eq(5, exec_lua([[return vim.g.funcs.get()]]))
     exec_lua([[vim.api.nvim_get_var('funcs').add()]])
     eq(6, exec_lua([[return vim.api.nvim_get_var('funcs').get()]]))
+    eq('((foo))', eval([['foo'->AddParens()->AddParens()]]))
 
     exec([[
       function Test()
@@ -1137,6 +1146,7 @@ describe('lua stdlib', function()
       vim.b.AddCounter = add_counter
       vim.b.GetCounter = get_counter
       vim.b.funcs = {add = add_counter, get = get_counter}
+      vim.b.AddParens = function(s) return '(' .. s .. ')' end
     ]]
 
     eq(0, eval('b:GetCounter()'))
@@ -1152,6 +1162,7 @@ describe('lua stdlib', function()
     eq(5, exec_lua([[return vim.b.funcs.get()]]))
     exec_lua([[vim.api.nvim_buf_get_var(0, 'funcs').add()]])
     eq(6, exec_lua([[return vim.api.nvim_buf_get_var(0, 'funcs').get()]]))
+    eq('((foo))', eval([['foo'->b:AddParens()->b:AddParens()]]))
 
     exec_lua [[
       local counter = 0
@@ -1160,6 +1171,7 @@ describe('lua stdlib', function()
       vim.api.nvim_buf_set_var(0, 'AddCounter', add_counter)
       vim.api.nvim_buf_set_var(0, 'GetCounter', get_counter)
       vim.api.nvim_buf_set_var(0, 'funcs', {add = add_counter, get = get_counter})
+      vim.api.nvim_buf_set_var(0, 'AddParens', function(s) return '(' .. s .. ')' end)
     ]]
 
     eq(0, eval('b:GetCounter()'))
@@ -1175,6 +1187,7 @@ describe('lua stdlib', function()
     eq(5, exec_lua([[return vim.b.funcs.get()]]))
     exec_lua([[vim.api.nvim_buf_get_var(0, 'funcs').add()]])
     eq(6, exec_lua([[return vim.api.nvim_buf_get_var(0, 'funcs').get()]]))
+    eq('((foo))', eval([['foo'->b:AddParens()->b:AddParens()]]))
 
     exec([[
       function Test()
@@ -1231,6 +1244,7 @@ describe('lua stdlib', function()
       vim.w.AddCounter = add_counter
       vim.w.GetCounter = get_counter
       vim.w.funcs = {add = add_counter, get = get_counter}
+      vim.w.AddParens = function(s) return '(' .. s .. ')' end
     ]]
 
     eq(0, eval('w:GetCounter()'))
@@ -1246,6 +1260,7 @@ describe('lua stdlib', function()
     eq(5, exec_lua([[return vim.w.funcs.get()]]))
     exec_lua([[vim.api.nvim_win_get_var(0, 'funcs').add()]])
     eq(6, exec_lua([[return vim.api.nvim_win_get_var(0, 'funcs').get()]]))
+    eq('((foo))', eval([['foo'->w:AddParens()->w:AddParens()]]))
 
     exec_lua [[
       local counter = 0
@@ -1254,6 +1269,7 @@ describe('lua stdlib', function()
       vim.api.nvim_win_set_var(0, 'AddCounter', add_counter)
       vim.api.nvim_win_set_var(0, 'GetCounter', get_counter)
       vim.api.nvim_win_set_var(0, 'funcs', {add = add_counter, get = get_counter})
+      vim.api.nvim_win_set_var(0, 'AddParens', function(s) return '(' .. s .. ')' end)
     ]]
 
     eq(0, eval('w:GetCounter()'))
@@ -1269,6 +1285,7 @@ describe('lua stdlib', function()
     eq(5, exec_lua([[return vim.w.funcs.get()]]))
     exec_lua([[vim.api.nvim_win_get_var(0, 'funcs').add()]])
     eq(6, exec_lua([[return vim.api.nvim_win_get_var(0, 'funcs').get()]]))
+    eq('((foo))', eval([['foo'->w:AddParens()->w:AddParens()]]))
 
     exec([[
       function Test()
@@ -1320,6 +1337,7 @@ describe('lua stdlib', function()
       vim.t.AddCounter = add_counter
       vim.t.GetCounter = get_counter
       vim.t.funcs = {add = add_counter, get = get_counter}
+      vim.t.AddParens = function(s) return '(' .. s .. ')' end
     ]]
 
     eq(0, eval('t:GetCounter()'))
@@ -1335,6 +1353,7 @@ describe('lua stdlib', function()
     eq(5, exec_lua([[return vim.t.funcs.get()]]))
     exec_lua([[vim.api.nvim_tabpage_get_var(0, 'funcs').add()]])
     eq(6, exec_lua([[return vim.api.nvim_tabpage_get_var(0, 'funcs').get()]]))
+    eq('((foo))', eval([['foo'->t:AddParens()->t:AddParens()]]))
 
     exec_lua [[
       local counter = 0
@@ -1343,6 +1362,7 @@ describe('lua stdlib', function()
       vim.api.nvim_tabpage_set_var(0, 'AddCounter', add_counter)
       vim.api.nvim_tabpage_set_var(0, 'GetCounter', get_counter)
       vim.api.nvim_tabpage_set_var(0, 'funcs', {add = add_counter, get = get_counter})
+      vim.api.nvim_tabpage_set_var(0, 'AddParens', function(s) return '(' .. s .. ')' end)
     ]]
 
     eq(0, eval('t:GetCounter()'))
@@ -1358,6 +1378,7 @@ describe('lua stdlib', function()
     eq(5, exec_lua([[return vim.t.funcs.get()]]))
     exec_lua([[vim.api.nvim_tabpage_get_var(0, 'funcs').add()]])
     eq(6, exec_lua([[return vim.api.nvim_tabpage_get_var(0, 'funcs').get()]]))
+    eq('((foo))', eval([['foo'->t:AddParens()->t:AddParens()]]))
 
     exec_lua [[
     vim.cmd "tabnew"
-- 
cgit 


From 3c3f3e7353ba2cb9071183cd05036ca2a98d3672 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 17 Sep 2022 16:17:51 +0800
Subject: test(remote_spec): reduce flakiness in waiting for client exit
 (#20230)

It is less likely for client to exit between jobstart() and jobwait() if
they are invoked in the same RPC request instead of two separate ones.
---
 test/functional/core/remote_spec.lua | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/functional/core/remote_spec.lua b/test/functional/core/remote_spec.lua
index d7bd075eb2..846d79abf3 100644
--- a/test/functional/core/remote_spec.lua
+++ b/test/functional/core/remote_spec.lua
@@ -3,6 +3,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local command = helpers.command
 local eq = helpers.eq
+local exec_lua = helpers.exec_lua
 local expect = helpers.expect
 local funcs = helpers.funcs
 local insert = helpers.insert
@@ -48,8 +49,8 @@ describe('Remote', function()
       -- our incoming --remote calls.
       local client_starter = spawn(new_argv(), false, nil, true)
       set_session(client_starter)
-      local client_job_id = funcs.jobstart(client_argv)
-      eq({ 0 }, funcs.jobwait({client_job_id}))
+      -- Call jobstart() and jobwait() in the same RPC request to reduce flakiness.
+      eq({ 0 }, exec_lua([[return vim.fn.jobwait({ vim.fn.jobstart(...) })]], client_argv))
       client_starter:close()
       set_session(server)
     end
@@ -121,8 +122,8 @@ describe('Remote', function()
       -- the event loop. If the server event loop is blocked, it can't process
       -- our incoming --remote calls.
       clear()
-      local bogus_job_id = funcs.jobstart(bogus_argv)
-      eq({2}, funcs.jobwait({bogus_job_id}))
+      -- Call jobstart() and jobwait() in the same RPC request to reduce flakiness.
+      eq({ 2 }, exec_lua([[return vim.fn.jobwait({ vim.fn.jobstart(...) })]], bogus_argv))
     end
     it('bogus subcommand', function()
       run_and_check_exit_code('--remote-bogus')
-- 
cgit 


From 644a3f48b117abd1d0d0aab5ec96cd62392ca0f1 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 14 Sep 2022 19:49:55 +0800
Subject: fix(events): make CursorHold behave as documented

---
 test/functional/autocmd/cursorhold_spec.lua | 57 ++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/test/functional/autocmd/cursorhold_spec.lua b/test/functional/autocmd/cursorhold_spec.lua
index 506b688853..5d54610e1d 100644
--- a/test/functional/autocmd/cursorhold_spec.lua
+++ b/test/functional/autocmd/cursorhold_spec.lua
@@ -5,22 +5,61 @@ local eq = helpers.eq
 local eval = helpers.eval
 local feed = helpers.feed
 local retry = helpers.retry
-local source = helpers.source
+local exec = helpers.source
 local sleep = helpers.sleep
+local meths = helpers.meths
 
-describe('CursorHoldI', function()
-  before_each(clear)
+before_each(clear)
+
+describe('CursorHold', function()
+  it('is triggered correctly #12587', function()
+    exec([[
+      augroup test
+        au CursorHold * let g:cursorhold += 1
+      augroup END
+    ]])
+
+    local function test_cursorhold(fn, early)
+      local ut = 2
+      -- if testing with small 'updatetime' fails, double its value and test again
+      retry(10, nil, function()
+        ut = ut * 2
+        meths.set_option('updatetime', ut)
+        feed('0')  -- reset did_cursorhold
+        meths.set_var('cursorhold', 0)
+        sleep(ut / 4)
+        fn()
+        eq(0, meths.get_var('cursorhold'))
+        sleep(ut / 2)
+        fn()
+        eq(0, meths.get_var('cursorhold'))
+        sleep(ut / 2)
+        eq(early, meths.get_var('cursorhold'))
+        sleep(ut / 4 * 3)
+        eq(1, meths.get_var('cursorhold'))
+      end)
+    end
 
+    local ignore_key = meths.replace_termcodes('<Ignore>', true, true, true)
+    test_cursorhold(function() end, 1)
+    test_cursorhold(function() feed('') end, 1)
+    test_cursorhold(function() meths.feedkeys('', 'n', true) end, 1)
+    test_cursorhold(function() feed('<Ignore>') end, 0)
+    test_cursorhold(function() meths.feedkeys(ignore_key, 'n', true) end, 0)
+  end)
+end)
+
+describe('CursorHoldI', function()
   -- NOTE: since this test uses RPC it is not necessary to trigger the initial
   --       issue (#3757) via timer's or RPC callbacks in the first place.
   it('is triggered after input', function()
-    source([[
-    set updatetime=1
+    exec([[
+      set updatetime=1
 
-    let g:cursorhold = 0
-    augroup test
-      au CursorHoldI * let g:cursorhold += 1
-    augroup END
+      let g:cursorhold = 0
+      augroup test
+        au CursorHoldI * let g:cursorhold += 1
+      augroup END
     ]])
     feed('ifoo')
     retry(5, nil, function()
-- 
cgit 


From 6d557e324fd4223fff3279a0112f40431c540163 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sun, 18 Sep 2022 03:17:15 +0200
Subject: vim-patch:8.1.0941: macros for MS-Windows are inconsistent (#20215)

Problem:    Macros for MS-Windows are inconsistent, using "32", "3264 and
            others.
Solution:   Use MSWIN for all MS-Windows builds.  Use FEAT_GUI_MSWIN for the
            GUI build. (Hirohito Higashi, closes vim/vim#3932)
https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
---
 test/functional/fixtures/printenv-test.c |  6 +++---
 test/functional/fixtures/tty-test.c      | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/functional/fixtures/printenv-test.c b/test/functional/fixtures/printenv-test.c
index 0e68129543..295b4f04c3 100644
--- a/test/functional/fixtures/printenv-test.c
+++ b/test/functional/fixtures/printenv-test.c
@@ -3,13 +3,13 @@
 
 #include <stdio.h>
 
-#ifdef WIN32
+#ifdef MSWIN
 # include <windows.h>
 #else
 # include <stdlib.h>
 #endif
 
-#ifdef WIN32
+#ifdef MSWIN
 int wmain(int argc, wchar_t **argv)
 #else
 int main(int argc, char **argv)
@@ -19,7 +19,7 @@ int main(int argc, char **argv)
     return 1;
   }
 
-#ifdef WIN32
+#ifdef MSWIN
   wchar_t *value = _wgetenv(argv[1]);
   if (value == NULL) {
     return 1;
diff --git a/test/functional/fixtures/tty-test.c b/test/functional/fixtures/tty-test.c
index 4438b73a22..6ee7715021 100644
--- a/test/functional/fixtures/tty-test.c
+++ b/test/functional/fixtures/tty-test.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <uv.h>
-#ifdef _WIN32
+#ifdef MSWIN
 # include <windows.h>
 #else
 # include <unistd.h>
@@ -23,7 +23,7 @@ uv_tty_t tty_out;
 bool owns_tty(void);  // silence -Wmissing-prototypes
 bool owns_tty(void)
 {
-#ifdef _WIN32
+#ifdef MSWIN
   // XXX: We need to make proper detect owns tty
   // HWND consoleWnd = GetConsoleWindow();
   // DWORD dwProcessId;
@@ -38,14 +38,14 @@ bool owns_tty(void)
 static void walk_cb(uv_handle_t *handle, void *arg)
 {
   if (!uv_is_closing(handle)) {
-#ifdef WIN32
+#ifdef MSWIN
     uv_tty_set_mode(&tty, UV_TTY_MODE_NORMAL);
 #endif
     uv_close(handle, NULL);
   }
 }
 
-#ifndef WIN32
+#ifndef MSWIN
 static void sig_handler(int signum)
 {
   switch (signum) {
@@ -64,7 +64,7 @@ static void sig_handler(int signum)
 }
 #endif
 
-#ifdef WIN32
+#ifdef MSWIN
 static void sigwinch_cb(uv_signal_t *handle, int signum)
 {
   int width, height;
@@ -102,7 +102,7 @@ static void read_cb(uv_stream_t *stream, ssize_t cnt, const uv_buf_t *buf)
   uv_write_t req;
   uv_buf_t b = {
     .base = buf->base,
-#ifdef WIN32
+#ifdef MSWIN
     .len = (ULONG)cnt
 #else
     .len = (size_t)cnt
@@ -171,7 +171,7 @@ int main(int argc, char **argv)
   uv_prepare_t prepare;
   uv_prepare_init(uv_default_loop(), &prepare);
   uv_prepare_start(&prepare, prepare_cb);
-#ifndef WIN32
+#ifndef MSWIN
   uv_tty_init(uv_default_loop(), &tty, fileno(stderr), 1);
 #else
   uv_tty_init(uv_default_loop(), &tty, fileno(stdin), 1);
@@ -182,7 +182,7 @@ int main(int argc, char **argv)
   uv_tty_set_mode(&tty, UV_TTY_MODE_RAW);
   tty.data = &interrupted;
   uv_read_start(STRUCT_CAST(uv_stream_t, &tty), alloc_cb, read_cb);
-#ifndef WIN32
+#ifndef MSWIN
   struct sigaction sa;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = 0;
@@ -196,7 +196,7 @@ int main(int argc, char **argv)
 #endif
   uv_run(uv_default_loop(), UV_RUN_DEFAULT);
 
-#ifndef WIN32
+#ifndef MSWIN
   // XXX: Without this the SIGHUP handler is skipped on some systems.
   sleep(100);
 #endif
-- 
cgit 


From 67df3347fd1e637f643b35239f7a20ac813ee588 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 18 Sep 2022 15:20:20 +0200
Subject: vim-patch:9712ff1288f9 (#20240)

Update runtime files
https://github.com/vim/vim/commit/9712ff1288f942736ed76c0dec014909f067eec9
---
 test/functional/ui/decorations_spec.lua | 54 ++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua
index db5a775632..eff6fe6d23 100644
--- a/test/functional/ui/decorations_spec.lua
+++ b/test/functional/ui/decorations_spec.lua
@@ -686,15 +686,15 @@ end]]
 
     screen:expect{grid=[[
       {5:^for} _,item {5:in} {6:ipairs}(items) {5:do}                    |
-          {5:local} text, hl_id_cell, count = unpack(item)  |
-          {5:if} hl_id_cell ~= {13:nil} {5:then}                     |
-              hl_id = hl_id_cell                        |
+          {5:local} text, hl_id_cell, count {5:=} unpack(item)  |
+          {5:if} hl_id_cell {5:~=} {13:nil} {5:then}                     |
+              hl_id {5:=} hl_id_cell                        |
           {5:end}                                           |
-          {5:for} _ = {13:1}, (count {5:or} {13:1}) {5:do}                    |
-              {5:local} cell = line[colpos]                 |
-              cell.text = text                          |
-              cell.hl_id = hl_id                        |
-              colpos = colpos+{13:1}                         |
+          {5:for} _ {5:=} {13:1}, (count {5:or} {13:1}) {5:do}                    |
+              {5:local} cell {5:=} line[colpos]                 |
+              cell.text {5:=} text                          |
+              cell.hl_id {5:=} hl_id                        |
+              colpos {5:=} colpos{5:+}{13:1}                         |
           {5:end}                                           |
       {5:end}                                               |
       {1:~                                                 }|
@@ -713,15 +713,15 @@ end]]
 
     screen:expect{grid=[[
       {5:^for} _,item {5:in} {6:ipairs}(items) {5:do}                    |
-          {5:l}{8:blen}{7:dy}{10:e}{7:text}{10:h}{7:-}{10:_}{7:here}ell, count = unpack(item)  |
-          {5:i}{12:c}{11:ombining color} {13:nil} {5:then}                     |
+          {5:l}{8:blen}{7:dy}{10:e}{7:text}{10:h}{7:-}{10:_}{7:here}ell, count {5:=} unpack(item)  |
+          {5:i}{12:c}{11:ombining col}{12:or} {13:nil} {5:then}                     |
            {11:replacing color}d_cell                        |
           {5:e}{8:bl}{7:endy}{10: }{7:text}{10: }{7:-}{10: }{7:here}                           |
-          {5:f}{12:co}{11:mbini}{16:n}{11:g color}t {5:or} {13:1}) {5:do}                    |
+          {5:f}{12:co}{11:mbi}{12:n}{11:i}{16:n}{11:g color}t {5:or} {13:1}) {5:do}                    |
            {11:replacing color} line[colpos]                 |
-              cell.text = text                          |
-              cell.hl_id = hl_id                        |
-              colpos = colpos+{13:1}                         |
+              cell.text {5:=} text                          |
+              cell.hl_id {5:=} hl_id                        |
+              colpos {5:=} colpos{5:+}{13:1}                         |
           {5:end}                                           |
       {5:end}                                               |
       {1:~                                                 }|
@@ -732,15 +732,15 @@ end]]
     feed 'V5G'
     screen:expect{grid=[[
       {17:for}{18: _,item }{17:in}{18: }{19:ipairs}{18:(items) }{17:do}                    |
-      {18:    }{17:l}{20:blen}{21:dy}{22:e}{21:text}{22:h}{21:-}{22:_}{21:here}{18:ell, count = unpack(item)}  |
-      {18:    }{17:i}{12:c}{11:ombining color}{18: }{23:nil}{18: }{17:then}                     |
+      {18:    }{17:l}{20:blen}{21:dy}{22:e}{21:text}{22:h}{21:-}{22:_}{21:here}{18:ell, count }{17:=}{18: unpack(item)}  |
+      {18:    }{17:i}{12:c}{11:ombining col}{12:or}{18: }{23:nil}{18: }{17:then}                     |
       {18:     }{11:replacing color}{18:d_cell}                        |
       {18:    }{5:^e}{17:nd}                                           |
-          {5:f}{12:co}{11:mbini}{16:n}{11:g color}t {5:or} {13:1}) {5:do}                    |
+          {5:f}{12:co}{11:mbi}{12:n}{11:i}{16:n}{11:g color}t {5:or} {13:1}) {5:do}                    |
            {11:replacing color} line[colpos]                 |
-              cell.text = text                          |
-              cell.hl_id = hl_id                        |
-              colpos = colpos+{13:1}                         |
+              cell.text {5:=} text                          |
+              cell.hl_id {5:=} hl_id                        |
+              colpos {5:=} colpos{5:+}{13:1}                         |
           {5:end}                                           |
       {5:end}                                               |
       {1:~                                                 }|
@@ -751,15 +751,15 @@ end]]
     feed 'jj'
     screen:expect{grid=[[
       {17:for}{18: _,item }{17:in}{18: }{19:ipairs}{18:(items) }{17:do}                    |
-      {18:    }{17:l}{20:blen}{21:dy}{22:e}{21:text}{22:h}{21:-}{22:_}{21:here}{18:ell, count = unpack(item)}  |
-      {18:    }{17:i}{12:c}{11:ombining color}{18: }{23:nil}{18: }{17:then}                     |
+      {18:    }{17:l}{20:blen}{21:dy}{22:e}{21:text}{22:h}{21:-}{22:_}{21:here}{18:ell, count }{17:=}{18: unpack(item)}  |
+      {18:    }{17:i}{12:c}{11:ombining col}{12:or}{18: }{23:nil}{18: }{17:then}                     |
       {18:     }{11:replacing color}{18:d_cell}                        |
       {18:    }{17:end}                                           |
-      {18:    }{17:for}{18: _ = }{23:1}{18:, (count }{17:or}{18: }{23:1}{18:) }{17:do}                    |
-      {18:    }^ {18:   }{17:local}{18: cell = line[colpos]}                 |
-              cell.text = text                          |
-              cell.hl_id = hl_id                        |
-              colpos = colpos+{13:1}                         |
+      {18:    }{17:for}{18: _ }{17:=}{18: }{23:1}{18:, (count }{17:or}{18: }{23:1}{18:) }{17:do}                    |
+      {18:    }^ {18:   }{17:local}{18: cell }{17:=}{18: line[colpos]}                 |
+              cell.text {5:=} text                          |
+              cell.hl_id {5:=} hl_id                        |
+              colpos {5:=} colpos{5:+}{13:1}                         |
           {5:end}                                           |
       {5:end}                                               |
       {1:~                                                 }|
-- 
cgit 


From 647da34bbd4cf19a4bcc11899df24e00d6b8fcbe Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 18 Sep 2022 22:55:30 +0800
Subject: fix: assert failure when changing 'ut' while waiting for CursorHold
 (#20241)

---
 test/functional/autocmd/cursorhold_spec.lua | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/autocmd/cursorhold_spec.lua b/test/functional/autocmd/cursorhold_spec.lua
index 5d54610e1d..b04bd5233a 100644
--- a/test/functional/autocmd/cursorhold_spec.lua
+++ b/test/functional/autocmd/cursorhold_spec.lua
@@ -2,7 +2,6 @@ local helpers = require('test.functional.helpers')(after_each)
 
 local clear = helpers.clear
 local eq = helpers.eq
-local eval = helpers.eval
 local feed = helpers.feed
 local retry = helpers.retry
 local exec = helpers.source
@@ -12,13 +11,16 @@ local meths = helpers.meths
 before_each(clear)
 
 describe('CursorHold', function()
-  it('is triggered correctly #12587', function()
+  before_each(function()
     exec([[
+      let g:cursorhold = 0
       augroup test
         au CursorHold * let g:cursorhold += 1
       augroup END
     ]])
+  end)
 
+  it('is triggered correctly #12587', function()
     local function test_cursorhold(fn, early)
       local ut = 2
       -- if testing with small 'updatetime' fails, double its value and test again
@@ -47,6 +49,17 @@ describe('CursorHold', function()
     test_cursorhold(function() feed('<Ignore>') end, 0)
     test_cursorhold(function() meths.feedkeys(ignore_key, 'n', true) end, 0)
   end)
+
+  it("reducing 'updatetime' while waiting for CursorHold #20241", function()
+    meths.set_option('updatetime', 10000)
+    feed('0')  -- reset did_cursorhold
+    meths.set_var('cursorhold', 0)
+    sleep(50)
+    eq(0, meths.get_var('cursorhold'))
+    meths.set_option('updatetime', 20)
+    sleep(10)
+    eq(1, meths.get_var('cursorhold'))
+  end)
 end)
 
 describe('CursorHoldI', function()
@@ -64,7 +77,7 @@ describe('CursorHoldI', function()
     feed('ifoo')
     retry(5, nil, function()
       sleep(1)
-      eq(1, eval('g:cursorhold'))
+      eq(1, meths.get_var('cursorhold'))
     end)
   end)
 end)
-- 
cgit 


From 7bd4c8e8ee2f623fbde017987f2989e8b8792829 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 19 Sep 2022 12:37:25 +0800
Subject: fix(inccommand): avoid unnecessary redraw when not showing (#20244)

---
 test/functional/ui/inccommand_spec.lua | 55 ++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua
index 9ca4673efe..49b3c7a655 100644
--- a/test/functional/ui/inccommand_spec.lua
+++ b/test/functional/ui/inccommand_spec.lua
@@ -1190,6 +1190,8 @@ describe(":substitute, inccommand=split", function()
   end)
 
   it("deactivates if 'redrawtime' is exceeded #5602", function()
+    -- prevent redraws from 'incsearch'
+    meths.set_option('incsearch', false)
     -- Assert that 'inccommand' is ENABLED initially.
     eq("split", eval("&inccommand"))
     -- Set 'redrawtime' to minimal value, to ensure timeout is triggered.
@@ -2972,6 +2974,59 @@ it(':substitute with inccommand, does not crash if range contains invalid marks'
   ]])
 end)
 
+it(':substitute with inccommand, no unnecessary redraw if preview is not shown', function()
+  local screen = Screen.new(60, 6)
+  clear()
+  common_setup(screen, 'split', 'test')
+  feed(':ls<CR>')
+  screen:expect([[
+    test                                                        |
+    {15:~                                                           }|
+    {11:                                                            }|
+    :ls                                                         |
+      1 %a + "[No Name]"                    line 1              |
+    {13:Press ENTER or type command to continue}^                     |
+  ]])
+  feed(':s')
+  -- no unnecessary redraw, so messages are still shown
+  screen:expect([[
+    test                                                        |
+    {15:~                                                           }|
+    {11:                                                            }|
+    :ls                                                         |
+      1 %a + "[No Name]"                    line 1              |
+    :s^                                                          |
+  ]])
+  feed('o')
+  screen:expect([[
+    test                                                        |
+    {15:~                                                           }|
+    {11:                                                            }|
+    :ls                                                         |
+      1 %a + "[No Name]"                    line 1              |
+    :so^                                                         |
+  ]])
+  feed('<BS>')
+  screen:expect([[
+    test                                                        |
+    {15:~                                                           }|
+    {11:                                                            }|
+    :ls                                                         |
+      1 %a + "[No Name]"                    line 1              |
+    :s^                                                          |
+  ]])
+  feed('/test')
+  -- now inccommand is shown, so screen is redrawn
+  screen:expect([[
+    {12:test}                                                        |
+    {15:~                                                           }|
+    {15:~                                                           }|
+    {15:~                                                           }|
+    {15:~                                                           }|
+    :s/test^                                                     |
+  ]])
+end)
+
 it(":substitute doesn't crash with inccommand, if undo is empty #12932", function()
   local screen = Screen.new(10,5)
   clear()
-- 
cgit 


From 10196f1b462400b8a4a9e8f13893da2514f8c850 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Tue, 20 Sep 2022 09:28:23 +0200
Subject: fix(lsp): support `false` result in handlers (#20252)

Closes https://github.com/neovim/neovim/issues/20111
---
 test/functional/plugin/lsp_spec.lua | 71 +++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

(limited to 'test')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index 395f8ed32a..e7ea089fbf 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -3292,4 +3292,75 @@ describe('LSP', function()
       eq(result.method, "initialize")
     end)
   end)
+
+  describe('handlers', function()
+    it('handler can return false as response', function()
+      local result = exec_lua [[
+        local uv = vim.loop
+        local server = uv.new_tcp()
+        local messages = {}
+        local responses = {}
+        server:bind('127.0.0.1', 0)
+        server:listen(127, function(err)
+          assert(not err, err)
+          local socket = uv.new_tcp()
+          server:accept(socket)
+          socket:read_start(require('vim.lsp.rpc').create_read_loop(function(body)
+            local payload = vim.json.decode(body)
+            if payload.method then
+              table.insert(messages, payload.method)
+              if payload.method == 'initialize' then
+                local msg = vim.json.encode({
+                  id = payload.id,
+                  jsonrpc = '2.0',
+                  result = {
+                    capabilities = {}
+                  },
+                })
+                socket:write(table.concat({'Content-Length: ', tostring(#msg), '\r\n\r\n', msg}))
+              elseif payload.method == 'initialized' then
+                local msg = vim.json.encode({
+                  id = 10,
+                  jsonrpc = '2.0',
+                  method = 'dummy',
+                  params = {},
+                })
+                socket:write(table.concat({'Content-Length: ', tostring(#msg), '\r\n\r\n', msg}))
+              end
+            else
+              table.insert(responses, payload)
+              socket:close()
+            end
+          end))
+        end)
+        local port = server:getsockname().port
+        local handler_called = false
+        vim.lsp.handlers['dummy'] = function(err, result)
+          handler_called = true
+          return false
+        end
+        local client_id = vim.lsp.start({ name = 'dummy', cmd = vim.lsp.rpc.connect('127.0.0.1', port) })
+        local client = vim.lsp.get_client_by_id(client_id)
+        vim.wait(1000, function() return #messages == 2 and handler_called and #responses == 1 end)
+        server:close()
+        server:shutdown()
+        return {
+          messages = messages,
+          handler_called = handler_called,
+          responses = responses }
+      ]]
+      local expected = {
+        messages = { 'initialize', 'initialized' },
+        handler_called = true,
+        responses = {
+          {
+            id = 10,
+            jsonrpc = '2.0',
+            result = false
+          }
+        }
+      }
+      eq(expected, result)
+    end)
+  end)
 end)
-- 
cgit 


From abe2d90693e5cec3428c0162c48f0ea38972ff31 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 20 Sep 2022 11:15:32 +0100
Subject: feat(lua): move compat module from runtime to test (#20257)

---
 test/compat.lua  | 12 ++++++++++++
 test/helpers.lua |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 test/compat.lua

(limited to 'test')

diff --git a/test/compat.lua b/test/compat.lua
new file mode 100644
index 0000000000..2c9786d491
--- /dev/null
+++ b/test/compat.lua
@@ -0,0 +1,12 @@
+-- Lua 5.1 forward-compatibility layer.
+-- For background see https://github.com/neovim/neovim/pull/9280
+--
+-- Reference the lua-compat-5.2 project for hints:
+--    https://github.com/keplerproject/lua-compat-5.2/blob/c164c8f339b95451b572d6b4b4d11e944dc7169d/compat52/mstrict.lua
+--    https://github.com/keplerproject/lua-compat-5.2/blob/c164c8f339b95451b572d6b4b4d11e944dc7169d/tests/test.lua
+
+local lua_version = _VERSION:sub(-3)
+
+if lua_version >= '5.2' then
+  unpack = table.unpack -- luacheck: ignore 121 143
+end
diff --git a/test/helpers.lua b/test/helpers.lua
index 499b91488b..a7eda60f87 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -1,4 +1,4 @@
-require('vim.compat')
+require('test.compat')
 local shared = require('vim.shared')
 local assert = require('luassert')
 local luv = require('luv')
-- 
cgit 


From 9413f7544bcab6951f9a0c26c4b2e1a6dc477c82 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 20 Sep 2022 20:38:44 +0800
Subject: vim-patch:9.0.0507: cmdline cleared when using :redrawstatus in
 CmdlineChanged

Problem:    Command line cleared when using :redrawstatus in CmdlineChanged
            autocommand event.
Solution:   Postpone the redraw. (closes vim/vim#11162)
https://github.com/vim/vim/commit/bcd6924245c0e73d8be256282656c06aaf91f17c

Cherry-pick Test_redraw_in_autocmd() from Vim patch 8.2.4789.
---
 test/functional/legacy/cmdline_spec.lua | 56 +++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

(limited to 'test')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 99d2d0f30e..8ea5754cfa 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -140,6 +140,62 @@ describe('cmdline', function()
       :^                             |
     ]])
   end)
+
+  -- oldtest: Test_redraw_in_autocmd()
+  it('cmdline cursor position is correct after :redraw with cmdheight=2', function()
+    local screen = Screen.new(30, 6)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+    })
+    screen:attach()
+    exec([[
+      set cmdheight=2
+      autocmd CmdlineChanged * redraw
+    ]])
+    feed(':for i in range(3)<CR>')
+    screen:expect([[
+                                    |
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      :for i in range(3)            |
+      :  ^                           |
+    ]])
+    feed(':let i =')
+    -- Note: this may still be considered broken, ref #18140
+    screen:expect([[
+                                    |
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      :  :let i =^                   |
+                                    |
+    ]])
+  end)
+
+  -- oldtest: Test_redrawstatus_in_autocmd()
+  it(':redrawstatus in cmdline mode', function()
+    local screen = Screen.new(60, 6)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {bold = true, reverse = true},  -- MsgSeparator
+    })
+    screen:attach()
+    exec([[
+      set cmdheight=2
+      autocmd CmdlineChanged * if getcmdline() == 'foobar' | redrawstatus | endif
+    ]])
+    feed([[:echo "one\ntwo\nthree\nfour"<CR>]])
+    feed(':foobar')
+    screen:expect([[
+      {1:                                                            }|
+      one                                                         |
+      two                                                         |
+      three                                                       |
+      four                                                        |
+      :foobar^                                                     |
+    ]])
+  end)
 end)
 
 describe('cmdwin', function()
-- 
cgit 


From 2e4532bea50e5f6fb68ebf750c461c5704fc58c2 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 20 Sep 2022 20:54:07 +0800
Subject: vim-patch:9.0.0512: cannot redraw the status lines when editing a
 command

Problem:    Cannot redraw the status lines when editing a command.
Solution:   Only postpone the redraw when messages have scrolled.
            (closes vim/vim#11170)
https://github.com/vim/vim/commit/c14bfc31d907cbee6a3636f780561ad1787cdb9b
---
 test/functional/legacy/cmdline_spec.lua | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 8ea5754cfa..8325f7eeb0 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -178,13 +178,15 @@ describe('cmdline', function()
     local screen = Screen.new(60, 6)
     screen:set_default_attr_ids({
       [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
-      [1] = {bold = true, reverse = true},  -- MsgSeparator
+      [1] = {bold = true, reverse = true},  -- MsgSeparator, StatusLine
     })
     screen:attach()
     exec([[
-      set cmdheight=2
+      set laststatus=2
+      set statusline=%=:%{getcmdline()}
       autocmd CmdlineChanged * if getcmdline() == 'foobar' | redrawstatus | endif
     ]])
+    -- :redrawstatus is postponed if messages have scrolled
     feed([[:echo "one\ntwo\nthree\nfour"<CR>]])
     feed(':foobar')
     screen:expect([[
@@ -195,6 +197,16 @@ describe('cmdline', function()
       four                                                        |
       :foobar^                                                     |
     ]])
+    -- it is not postponed if messages have not scrolled
+    feed('<Esc>:foobar')
+    screen:expect([[
+                                                                  |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:                                                     :foobar}|
+      :foobar^                                                     |
+    ]])
   end)
 end)
 
-- 
cgit 


From cfdc93e8ac3e6c1577f1582c4b9546c118aa7987 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 20 Sep 2022 21:58:39 +0800
Subject: vim-patch:9.0.0511: unnecessary scrolling for message of only one
 line (#20261)

Problem:    Unnecessary scrolling for message of only one line.
Solution:   Only set msg_scroll when needed. (closes vim/vim#11178)
https://github.com/vim/vim/commit/bdedd2bcce3a59028c7504a397ff77d901b1b12a
---
 test/functional/legacy/messages_spec.lua | 37 ++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'test')

diff --git a/test/functional/legacy/messages_spec.lua b/test/functional/legacy/messages_spec.lua
index 159cf7a551..c76ce62ef0 100644
--- a/test/functional/legacy/messages_spec.lua
+++ b/test/functional/legacy/messages_spec.lua
@@ -10,6 +10,43 @@ before_each(clear)
 describe('messages', function()
   local screen
 
+  -- oldtest: Test_warning_scroll()
+  it('a warning causes scrolling if and only if it has a stacktrace', function()
+    screen = Screen.new(75, 6)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {bold = true, foreground = Screen.colors.SeaGreen},  -- MoreMsg
+      [2] = {bold = true, reverse = true},  -- MsgSeparator
+      [3] = {foreground = Screen.colors.Red},  -- WarningMsg
+    })
+    screen:attach()
+
+    -- When the warning comes from a script, messages are scrolled so that the
+    -- stacktrace is visible.
+    -- It is a bit hard to assert the screen when sourcing a script, so skip this part.
+
+    -- When the warning does not come from a script, messages are not scrolled.
+    command('enew')
+    command('set readonly')
+    feed('u')
+    screen:expect({grid = [[
+                                                                                 |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {3:W10: Warning: Changing a readonly file}^                                     |
+    ]], timeout = 500})
+    screen:expect([[
+      ^                                                                           |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      Already at oldest change                                                   |
+    ]])
+  end)
+
   describe('more prompt', function()
     before_each(function()
       screen = Screen.new(75, 6)
-- 
cgit 


From ec94014cd1d09884b12cb19021d5a1eff52cb76d Mon Sep 17 00:00:00 2001
From: ofwinterpassed <johannes@librem.one>
Date: Tue, 20 Sep 2022 22:14:58 +0200
Subject: fix(lsp): out of bounds error in lsp.util.apply_text_edits (#20137)

Co-authored-by: Jonas Strittmatter <40792180+smjonas@users.noreply.github.com>
---
 test/functional/plugin/lsp_spec.lua | 40 +++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'test')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index e7ea089fbf..e032f3bc2b 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -1719,6 +1719,46 @@ describe('LSP', function()
     end)
   end)
 
+  describe('apply_text_edits regression tests for #20116', function()
+    before_each(function()
+      insert(dedent([[
+      Test line one
+      Test line two 21 char]]))
+    end)
+    describe('with LSP end column out of bounds and start column at 0', function()
+      it('applies edits at the end of the buffer', function()
+        local edits = {
+          make_edit(0, 0, 1, 22, {'#include "whatever.h"\r\n#include <algorithm>\r'});
+        }
+        exec_lua('vim.lsp.util.apply_text_edits(...)', edits, 1, "utf-8")
+        eq({'#include "whatever.h"', '#include <algorithm>'}, buf_lines(1))
+      end)
+      it('applies edits in the middle of the buffer', function()
+        local edits = {
+          make_edit(0, 0, 0, 22, {'#include "whatever.h"\r\n#include <algorithm>\r'});
+        }
+        exec_lua('vim.lsp.util.apply_text_edits(...)', edits, 1, "utf-8")
+        eq({'#include "whatever.h"', '#include <algorithm>', 'Test line two 21 char'}, buf_lines(1))
+      end)
+    end)
+    describe('with LSP end column out of bounds and start column NOT at 0', function()
+      it('applies edits at the end of the buffer', function()
+        local edits = {
+          make_edit(0, 2, 1, 22, {'#include "whatever.h"\r\n#include <algorithm>\r'});
+        }
+        exec_lua('vim.lsp.util.apply_text_edits(...)', edits, 1, "utf-8")
+        eq({'Te#include "whatever.h"', '#include <algorithm>'}, buf_lines(1))
+      end)
+      it('applies edits in the middle of the buffer', function()
+        local edits = {
+          make_edit(0, 2, 0, 22, {'#include "whatever.h"\r\n#include <algorithm>\r'});
+        }
+        exec_lua('vim.lsp.util.apply_text_edits(...)', edits, 1, "utf-8")
+        eq({'Te#include "whatever.h"', '#include <algorithm>', 'Test line two 21 char'}, buf_lines(1))
+      end)
+    end)
+  end)
+
   describe('apply_text_document_edit', function()
     local target_bufnr
     local text_document_edit = function(editVersion)
-- 
cgit 


From ad1f353fe1aeb54144a34d1a0de8e318bd5113aa Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 21 Sep 2022 06:47:29 +0800
Subject: vim-patch:9.0.0517: when at the command line :redrawstatus does not
 work well (#20266)

Problem:    When at the command line :redrawstatus does not work well.
Solution:   Only update the statuslines instead of the screen. (closes vim/vim#11180)
https://github.com/vim/vim/commit/320d910064320f894a09ffdd1cd800ff5371e97f
---
 test/functional/legacy/cmdline_spec.lua | 53 +++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 8325f7eeb0..49e3825693 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -175,7 +175,7 @@ describe('cmdline', function()
 
   -- oldtest: Test_redrawstatus_in_autocmd()
   it(':redrawstatus in cmdline mode', function()
-    local screen = Screen.new(60, 6)
+    local screen = Screen.new(60, 8)
     screen:set_default_attr_ids({
       [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
       [1] = {bold = true, reverse = true},  -- MsgSeparator, StatusLine
@@ -184,13 +184,16 @@ describe('cmdline', function()
     exec([[
       set laststatus=2
       set statusline=%=:%{getcmdline()}
-      autocmd CmdlineChanged * if getcmdline() == 'foobar' | redrawstatus | endif
+      autocmd CmdlineChanged * redrawstatus
+      set display-=msgsep
     ]])
     -- :redrawstatus is postponed if messages have scrolled
     feed([[:echo "one\ntwo\nthree\nfour"<CR>]])
     feed(':foobar')
     screen:expect([[
-      {1:                                                            }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:                               :echo "one\ntwo\nthree\nfour"}|
       one                                                         |
       two                                                         |
       three                                                       |
@@ -198,14 +201,52 @@ describe('cmdline', function()
       :foobar^                                                     |
     ]])
     -- it is not postponed if messages have not scrolled
-    feed('<Esc>:foobar')
+    feed('<Esc>:for in in range(3)')
     screen:expect([[
                                                                   |
       {0:~                                                           }|
       {0:~                                                           }|
       {0:~                                                           }|
-      {1:                                                     :foobar}|
-      :foobar^                                                     |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:                                         :for in in range(3)}|
+      :for in in range(3)^                                         |
+    ]])
+    -- with cmdheight=1 messages have scrolled when typing :endfor
+    feed('<CR>:endfor')
+    screen:expect([[
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:                                         :for in in range(3)}|
+      :for in in range(3)                                         |
+      :  :endfor^                                                  |
+    ]])
+    feed('<CR>:set cmdheight=2<CR>')
+    -- with cmdheight=2 messages haven't scrolled when typing :for or :endfor
+    feed(':for in in range(3)')
+    screen:expect([[
+                                                                  |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:                                         :for in in range(3)}|
+      :for in in range(3)^                                         |
+                                                                  |
+    ]])
+    feed('<CR>:endfor')
+    screen:expect([[
+                                                                  |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:                                                    ::endfor}|
+      :for in in range(3)                                         |
+      :  :endfor^                                                  |
     ]])
   end)
 end)
-- 
cgit 


From 71e70d0c9919f1ab25fe3940b32ce549f49b30e8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 22 Sep 2022 09:43:37 +0800
Subject: vim-patch:9.0.0537: the do_set() function is much too long (#20274)

Problem:    The do_set() function is much too long.
Solution:   Move setting of a string option to a separate function.
https://github.com/vim/vim/commit/4740394f230dda09d6e9337465305741d8ee4fa3

Cherry-pick some tests from Vim patch 8.2.0540.
---
 test/functional/shada/shada_spec.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'test')

diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index d10a2facbb..f5a81eb2ef 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -238,6 +238,15 @@ describe('ShaDa support code', function()
     eq('', meths.get_option('shada'))
   end)
 
+  it('setting &shada gives proper error message on missing number', function()
+    eq([[Vim(set):E526: Missing number after <">: shada="]],
+       exc_exec([[set shada=\"]]))
+    for _, c in ipairs({"'", "/", ":", "<", "@", "s"}) do
+      eq(([[Vim(set):E526: Missing number after <%s>: shada=%s]]):format(c, c),
+         exc_exec(([[set shada=%s]]):format(c)))
+    end
+  end)
+
   it('does not crash when ShaDa file directory is not writable', function()
     if helpers.pending_win32(pending) then return end
 
-- 
cgit 


From 00cfc1dcebd1c81dd0d8c111740782e86cf2e385 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Fri, 16 Sep 2022 19:21:32 +0200
Subject: fix(redraw): avoid unnecessary redraws and glitches with
 floats+messages

fixes #20106
fixes #20229
---
 test/functional/ui/cmdline_spec.lua | 175 ++++++++++--------
 test/functional/ui/float_spec.lua   | 360 ++++++++++++++++++++++++++++++++++++
 2 files changed, 463 insertions(+), 72 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index 40dee4186b..92eb853686 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -934,6 +934,15 @@ describe('cmdheight=0', function()
   before_each(function()
     clear()
     screen = Screen.new(25, 5)
+    screen:set_default_attr_ids {
+      [1] = {bold = true, foreground = Screen.colors.Blue};
+      [2] = {bold = true, reverse = true};
+      [3] = {bold = true};
+      [4] = {foreground = Screen.colors.White, background = Screen.colors.Red};
+      [5] = {foreground = Screen.colors.SeaGreen4, bold = true};
+      [6] = {reverse = true};
+      [7] = {background = Screen.colors.Yellow};
+    }
     screen:attach()
   end)
 
@@ -941,9 +950,9 @@ describe('cmdheight=0', function()
     command("set cmdheight=1 noruler laststatus=2")
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      [No Name]                |
+      {1:~                        }|
+      {1:~                        }|
+      {2:[No Name]                }|
                                |
     ]]}
   end)
@@ -952,10 +961,10 @@ describe('cmdheight=0', function()
     command("set cmdheight=0 noruler laststatus=2")
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      [No Name]                |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {2:[No Name]                }|
     ]]}
   end)
 
@@ -963,10 +972,10 @@ describe('cmdheight=0', function()
     command("set cmdheight=0 ruler laststatus=0")
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
     ]]}
   end)
 
@@ -975,10 +984,10 @@ describe('cmdheight=0', function()
     feed('i')
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
     ]], showmode={}}
     feed('<Esc>')
     eq(0, eval('&cmdheight'))
@@ -989,10 +998,10 @@ describe('cmdheight=0', function()
     feed('i')
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
     ]], showmode={}}
     feed('<Esc>')
     eq(0, eval('&cmdheight'))
@@ -1003,10 +1012,10 @@ describe('cmdheight=0', function()
     feed('i')
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      -- INSERT --             |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {3:-- INSERT --}             |
     ]]}
     feed('<Esc>')
     eq(1, eval('&cmdheight'))
@@ -1017,19 +1026,19 @@ describe('cmdheight=0', function()
     feed(':')
     screen:expect{grid=[[
                                |
-      ~                        |
-      ~                        |
-      ~                        |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
       :^                        |
     ]]}
     eq(0, eval('&cmdheight'))
     feed('<cr>')
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
     ]], showmode={}}
     eq(0, eval('&cmdheight'))
   end)
@@ -1039,8 +1048,8 @@ describe('cmdheight=0', function()
     feed(':call input("foo >")<cr>')
     screen:expect{grid=[[
                                |
-      ~                        |
-                               |
+      {1:~                        }|
+      {2:                         }|
       :call input("foo >")     |
       foo >^                    |
     ]]}
@@ -1048,10 +1057,10 @@ describe('cmdheight=0', function()
     feed('<cr>')
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
     ]], showmode={}}
     eq(0, eval('&cmdheight'))
   end)
@@ -1060,35 +1069,35 @@ describe('cmdheight=0', function()
     command("set cmdheight=0 noruler laststatus=3 winbar=foo")
     feed(':split<CR>')
     screen:expect{grid=[[
-                               |
+      {2:                         }|
       :split                   |
-      E36: Not enough room     |
-      Press ENTER or type comma|
-      nd to continue^           |
+      {4:E36: Not enough room}     |
+      {5:Press ENTER or type comma}|
+      {5:nd to continue}^           |
     ]]}
     feed('<CR>')
     screen:expect{grid=[[
-      foo                      |
+      {3:foo                      }|
       ^                         |
-      ~                        |
-      ~                        |
-      [No Name]                |
+      {1:~                        }|
+      {1:~                        }|
+      {2:[No Name]                }|
     ]]}
     feed(':')
     screen:expect{grid=[[
-      foo                      |
+      {3:foo                      }|
                                |
-      ~                        |
-      ~                        |
+      {1:~                        }|
+      {1:~                        }|
       :^                        |
     ]]}
     feed('<Esc>')
     screen:expect{grid=[[
-      foo                      |
+      {3:foo                      }|
       ^                         |
-      ~                        |
-      ~                        |
-      [No Name]                |
+      {1:~                        }|
+      {1:~                        }|
+      {2:[No Name]                }|
     ]], showmode={}}
     eq(0, eval('&cmdheight'))
 
@@ -1100,18 +1109,18 @@ describe('cmdheight=0', function()
     feed('qq')
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
     ]]}
     feed('q')
     screen:expect{grid=[[
       ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
     ]], unchanged=true}
   end)
 
@@ -1120,28 +1129,28 @@ describe('cmdheight=0', function()
     feed('ifoo<ESC>')
     screen:expect{grid=[[
       fo^o                      |
-      ~                        |
-      ~                        |
-      ~                        |
-      [No Name] [+]            |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {2:[No Name] [+]            }|
     ]]}
 
     feed(':%s/foo/bar/gc<CR>')
     screen:expect{grid=[[
-      foo                      |
-      ~                        |
-      ~                        |
-      ~                        |
-      replace wi...q/l/^E/^Y)?^ |
+      {6:foo}                      |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {5:replace wi...q/l/^E/^Y)?}^ |
     ]]}
 
     feed('y')
     screen:expect{grid=[[
       ^bar                      |
-      ~                        |
-      ~                        |
-      ~                        |
-      [No Name] [+]            |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {2:[No Name] [+]            }|
     ]]}
 
     assert_alive()
@@ -1152,4 +1161,26 @@ describe('cmdheight=0', function()
     feed('<C-w>+')
     eq(0, eval('&cmdheight'))
   end)
+
+  it("with non-silent mappings with cmdline", function()
+    command("set cmdheight=0")
+    command("map <f3> :nohlsearch<cr>")
+    feed('iaabbaa<esc>/aa<cr>')
+    screen:expect{grid=[[
+      {7:^aa}bb{7:aa}                   |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+    ]]}
+
+    feed('<f3>')
+    screen:expect{grid=[[
+      ^aabbaa                   |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+    ]]}
+  end)
 end)
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index 5967b630f6..a5a664cb3d 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -8147,6 +8147,366 @@ describe('float window', function()
         ]]}
       end
     end)
+
+    it('it can be resized with messages and cmdheight=0 #20106', function()
+      screen:try_resize(40,9)
+      command 'set cmdheight=0'
+      local buf = meths.create_buf(false,true)
+      local win = meths.open_win(buf, false, {relative='editor', width=40, height=4, anchor='SW', row=9, col=0, style='minimal', border="single", noautocmd=true})
+
+      if multigrid then
+        screen:expect{grid=[[
+        ## grid 1
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+        ## grid 2
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+        ## grid 3
+        ## grid 5
+          {5:┌────────────────────────────────────────┐}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:└────────────────────────────────────────┘}|
+        ]], float_pos={
+          [5] = {{id = 1002}, "SW", 1, 9, 0, true, 50};
+        }, win_viewport={
+          [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+          [5] = {win = {id = 1002}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+        }}
+      else
+        screen:expect{grid=[[
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {5:┌──────────────────────────────────────┐}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {5:└──────────────────────────────────────┘}|
+        ]]}
+      end
+
+      exec_lua([[
+        local win = ...
+        vim.api.nvim_win_set_height(win, 2)
+        vim.api.nvim_echo({ { "" } }, false, {})
+      ]], win)
+
+      if multigrid then
+        screen:expect{grid=[[
+        ## grid 1
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+        ## grid 2
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+        ## grid 3
+        ## grid 5
+          {5:┌────────────────────────────────────────┐}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:└────────────────────────────────────────┘}|
+        ]], float_pos={
+          [5] = {{id = 1002}, "SW", 1, 9, 0, true, 50};
+        }, win_viewport={
+          [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+          [5] = {win = {id = 1002}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+        }}
+      else
+        screen:expect{grid=[[
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {5:┌──────────────────────────────────────┐}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {5:└──────────────────────────────────────┘}|
+        ]]}
+
+      end
+
+      meths.win_close(win, true)
+      if multigrid then
+        screen:expect{grid=[[
+        ## grid 1
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+        ## grid 2
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+        ## grid 3
+        ]], win_viewport={
+          [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+        }}
+      else
+        screen:expect{grid=[[
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+        ]]}
+      end
+    end)
+
+    it('it can be resized with messages and cmdheight=1', function()
+      screen:try_resize(40,9)
+      local buf = meths.create_buf(false,true)
+      local win = meths.open_win(buf, false, {relative='editor', width=40, height=4, anchor='SW', row=8, col=0, style='minimal', border="single", noautocmd=true})
+
+      if multigrid then
+        screen:expect{grid=[[
+        ## grid 1
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [3:----------------------------------------]|
+        ## grid 2
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+        ## grid 3
+                                                  |
+        ## grid 5
+          {5:┌────────────────────────────────────────┐}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:└────────────────────────────────────────┘}|
+        ]], float_pos={
+          [5] = {{id = 1002}, "SW", 1, 8, 0, true, 50};
+        }, win_viewport={
+          [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+          [5] = {win = {id = 1002}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+        }}
+      else
+        screen:expect{grid=[[
+          ^                                        |
+          {0:~                                       }|
+          {5:┌──────────────────────────────────────┐}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {5:└──────────────────────────────────────┘}|
+                                                  |
+        ]]}
+      end
+
+      exec_lua([[
+        -- echo prompt is blocking, so schedule
+        local win = ...
+        vim.schedule(function()
+          vim.api.nvim_win_set_height(win, 2)
+          vim.api.nvim_echo({ { "\n" } }, false, {})
+        end)
+      ]], win)
+
+      if multigrid then
+        screen:expect{grid=[[
+        ## grid 1
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [3:----------------------------------------]|
+          [3:----------------------------------------]|
+        ## grid 2
+                                                  |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+        ## grid 3
+                                                  |
+          {8:Press ENTER or type command to continue}^ |
+        ## grid 5
+          {5:┌────────────────────────────────────────┐}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:└────────────────────────────────────────┘}|
+        ]], float_pos={
+          [5] = {{id = 1002}, "SW", 1, 8, 0, true, 50};
+        }, win_viewport={
+          [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+          [5] = {win = {id = 1002}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+        }}
+      else
+        screen:expect{grid=[[
+                                                  |
+          {0:~                                       }|
+          {5:┌──────────────────────────────────────┐}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {4:                                        }|
+                                                  |
+          {8:Press ENTER or type command to continue}^ |
+        ]]}
+      end
+
+      feed('<cr>')
+      if multigrid then
+        screen:expect{grid=[[
+        ## grid 1
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [3:----------------------------------------]|
+        ## grid 2
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+        ## grid 3
+                                                  |
+        ## grid 5
+          {5:┌────────────────────────────────────────┐}|
+          {5:│}{1:                                        }{5:│}|
+          {5:│}{1:                                        }{5:│}|
+          {5:└────────────────────────────────────────┘}|
+        ]], float_pos={
+          [5] = {{id = 1002}, "SW", 1, 8, 0, true, 50};
+        }, win_viewport={
+          [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+          [5] = {win = {id = 1002}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+        }}
+      else
+        screen:expect{grid=[[
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {5:┌──────────────────────────────────────┐}|
+          {5:│}{1:                                      }{5:│}|
+          {5:│}{1:                                      }{5:│}|
+          {5:└──────────────────────────────────────┘}|
+                                                  |
+        ]]}
+      end
+
+      meths.win_close(win, true)
+      if multigrid then
+        screen:expect{grid=[[
+        ## grid 1
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [3:----------------------------------------]|
+        ## grid 2
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+        ## grid 3
+                                                  |
+        ]], win_viewport={
+          [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+        }}
+
+      else
+        screen:expect{grid=[[
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+                                                  |
+        ]]}
+      end
+    end)
   end
 
   describe('with ext_multigrid', function()
-- 
cgit 


From 93b30582db520ae20d66b000053007c11b62c15d Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Wed, 17 Aug 2022 15:40:21 +0200
Subject: fix(redraw): make redrawdebug=nodelta handle all the cases

Before only win_line lines were considered. this applies nodelta
to all screen elements. Causes some failures, which might indeed
indicate excessive redraws.
---
 test/functional/ui/syntax_conceal_spec.lua | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/syntax_conceal_spec.lua b/test/functional/ui/syntax_conceal_spec.lua
index f790597140..e8798ddd93 100644
--- a/test/functional/ui/syntax_conceal_spec.lua
+++ b/test/functional/ui/syntax_conceal_spec.lua
@@ -947,7 +947,7 @@ describe('Screen', function()
       {0:~                                                    }|
                                                            |
     ]]}
-    eq({{2, 0, {{'c', 0, 3}}}}, grid_lines)
+    eq({{2, 0, {{'c', 0, 3}, {' ', 0, 50}}}, {3, 0, {{' ', 0, 53}}}}, grid_lines)
   end)
 
   it('K_EVENT should not cause extra redraws with concealcursor #13196', function()
@@ -994,10 +994,11 @@ describe('Screen', function()
       {0:~                                                    }|
                                                            |
     ]]}
-    eq({{2, 0, {{'c', 0, 3}}}}, grid_lines)
+    eq({{2, 0, {{'c', 0, 3}, {' ', 0, 50}}}}, grid_lines)
+    grid_lines = {}
     poke_eventloop()  -- causes K_EVENT key
     screen:expect_unchanged()
-    eq({{2, 0, {{'c', 0, 3}}}}, grid_lines)
+    eq({}, grid_lines) -- no redraw was done
   end)
 
   -- Copy of Test_cursor_column_in_concealed_line_after_window_scroll in
-- 
cgit 


From 02f8ca59a80cd3570593c717ff6ceadc33239b89 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Tue, 20 Sep 2022 22:03:16 +0200
Subject: fix(tests): indicate in test logs when nvim exit times out

When it happens it wastes 2 seconds which is NOT included in the
normal busted timing info. It is hard to correct this, but we
can at least print a warning when this happens.
---
 .../fixtures/start/nvim-leftpad/lua/async_leftpad.lua     |  4 +++-
 test/functional/helpers.lua                               | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/fixtures/start/nvim-leftpad/lua/async_leftpad.lua b/test/functional/fixtures/start/nvim-leftpad/lua/async_leftpad.lua
index a312572c5b..45226ce24b 100644
--- a/test/functional/fixtures/start/nvim-leftpad/lua/async_leftpad.lua
+++ b/test/functional/fixtures/start/nvim-leftpad/lua/async_leftpad.lua
@@ -1,3 +1,5 @@
 return function (val, res)
-  vim.loop.new_async(function() _G[res] = require'leftpad'(val) end):send()
+  local handle
+  handle = vim.loop.new_async(function() _G[res] = require'leftpad'(val) handle:close() end)
+  handle:send()
 end
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index d672037a1e..eff54b6d4a 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -380,10 +380,23 @@ local function remove_args(args, args_rm)
   return new_args
 end
 
+function module.check_close(old_session)
+  local start_time = luv.now()
+  old_session:close()
+  luv.update_time()  -- Update cached value of luv.now() (libuv: uv_now()).
+  local end_time = luv.now()
+  local delta = end_time - start_time
+  if delta > 500 then
+    print("nvim took " .. delta .. " milliseconds to exit after last test\n"..
+          "This indicates a likely problem with the test even if it passed!\n")
+    io.stdout:flush()
+  end
+end
+
 --- @param io_extra used for stdin_fd, see :help ui-option
 function module.spawn(argv, merge, env, keep, io_extra)
   if session and not keep then
-    session:close()
+    module.check_close(session)
   end
 
   local child_stream = ChildProcessStream.spawn(
-- 
cgit 


From 2083c1771ad2de44c8e085062a0777e694b0fd4d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 22 Sep 2022 20:25:34 +0800
Subject: fix(window): close floats first when closing buffer in other tab
 (#20284)

---
 test/functional/ui/float_spec.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index a5a664cb3d..5e819f14a3 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -596,6 +596,11 @@ describe('float window', function()
         meths.buf_delete(old_buf, {force = true})
         eq(old_win, curwin().id)
       end)
+      it('if called from non-floating window in another tabpage', function()
+        command('tab split')
+        eq(3, #meths.list_tabpages())
+        meths.buf_delete(old_buf, {force = true})
+      end)
       it('if called from floating window with the same buffer', function()
         meths.set_current_win(same_buf_float)
         command('autocmd WinLeave * let g:win_leave = nvim_get_current_win()')
-- 
cgit 


From 09b64d75bd92a95d89c4f39f9df7918760abe98d Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 27 Mar 2022 19:47:34 -0700
Subject: feat(docs): gen_help_html.lua
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
The :help docs HTML generated is driven by an old awk script
`runtime/doc/makehtml.awk` that is hard to maintain (ad hoc parser and
no one has touched it in decades) and has bugs like:
- https://github.com/neovim/neovim.github.io/issues/96
- https://github.com/neovim/neovim.github.io/issues/97

Solution:
Use Lua + treesitter (https://github.com/vigoux/tree-sitter-vimdoc) to
generate :help docs HTML.  Also validates tag links.

fix https://github.com/neovim/neovim.github.io/issues/96
fix https://github.com/neovim/neovim.github.io/issues/97

TODO:
- delete doc_html build task
- delete runtime/doc/Makefile
- delete makehtml.awk
- delete maketags.awk

OUTPUT:

    $ nvim -V1 -es --clean +"lua require('scripts.gen_help_html')"
    output dir: /…/neovim.github.io/_site/doc/
    generated (207  errors): api.txt         => api.html
    generated (122  errors): arabic.txt      => arabic.html
    generated (285  errors): autocmd.txt     => autocmd.html
    generated (641  errors): builtin.txt     => builtin.html
    generated (623  errors): change.txt      => change.html
    generated (65   errors): channel.txt     => channel.html
    generated (353  errors): cmdline.txt     => cmdline.html
    generated (3    errors): debug.txt       => debug.html
    generated (28   errors): deprecated.txt  => deprecated.html
    generated (193  errors): dev_style.txt   => dev_style.html
    generated (460  errors): develop.txt     => develop.html
    generated (19   errors): diagnostic.txt  => diagnostic.html
    generated (57   errors): diff.txt        => diff.html
    generated (818  errors): digraph.txt     => digraph.html
    generated (330  errors): editing.txt     => editing.html
    generated (368  errors): eval.txt        => eval.html
    generated (184  errors): fold.txt        => fold.html
    generated (61   errors): ft_ada.txt      => ft_ada.html
    generated (0    errors): ft_ps1.txt      => ft_ps1.html
    generated (20   errors): ft_raku.txt     => ft_raku.html
    generated (5    errors): ft_rust.txt     => ft_rust.html
    generated (41   errors): ft_sql.txt      => ft_sql.html
    generated (110  errors): gui.txt         => gui.html
    generated (79   errors): hebrew.txt      => hebrew.html
    generated (17   errors): help.txt        => index.html
    generated (104  errors): helphelp.txt    => helphelp.html
    generated (0    errors): if_cscop.txt    => if_cscop.html
    generated (23   errors): if_perl.txt     => if_perl.html
    generated (16   errors): if_pyth.txt     => if_pyth.html
    generated (9    errors): if_ruby.txt     => if_ruby.html
    generated (216  errors): indent.txt      => indent.html
    generated (634  errors): index.txt       => vimindex.html
    generated (320  errors): insert.txt      => insert.html
    generated (265  errors): intro.txt       => intro.html
    generated (9    errors): job_control.txt => job_control.html
    generated (0    errors): lsp-extension.txt => lsp-extension.html
    generated (214  errors): lsp.txt         => lsp.html
    generated (311  errors): lua.txt         => lua.html
    generated (592  errors): luaref.txt      => luaref.html
    generated (798  errors): luvref.txt      => luvref.html
    generated (663  errors): map.txt         => map.html
    generated (228  errors): mbyte.txt       => mbyte.html
    generated (228  errors): message.txt     => message.html
    generated (0    errors): mlang.txt       => mlang.html
    generated (761  errors): motion.txt      => motion.html
    generated (4    errors): nvim.txt        => nvim.html
    generated (226  errors): nvim_terminal_emulator.txt => nvim_terminal_emulator.html
    generated (988  errors): options.txt     => options.html
    generated (567  errors): pattern.txt     => pattern.html
    generated (15   errors): pi_gzip.txt     => pi_gzip.html
    generated (10   errors): pi_health.txt   => pi_health.html
    generated (27   errors): pi_msgpack.txt  => pi_msgpack.html
    generated (2177 errors): pi_netrw.txt    => pi_netrw.html
    generated (41   errors): pi_paren.txt    => pi_paren.html
    generated (9    errors): pi_spec.txt     => pi_spec.html
    generated (218  errors): pi_tar.txt      => pi_tar.html
    generated (0    errors): pi_tutor.txt    => pi_tutor.html
    generated (235  errors): pi_zip.txt      => pi_zip.html
    generated (265  errors): print.txt       => print.html
    generated (31   errors): provider.txt    => provider.html
    generated (335  errors): quickfix.txt    => quickfix.html
    generated (572  errors): quickref.txt    => quickref.html
    generated (109  errors): recover.txt     => recover.html
    generated (14   errors): remote.txt      => remote.html
    generated (14   errors): remote_plugin.txt => remote_plugin.html
    generated (351  errors): repeat.txt      => repeat.html
    generated (23   errors): rileft.txt      => rileft.html
    generated (12   errors): russian.txt     => russian.html
    generated (6    errors): scroll.txt      => scroll.html
    generated (106  errors): sign.txt        => sign.html
    generated (347  errors): spell.txt       => spell.html
    generated (784  errors): starting.txt    => starting.html
    generated (1499 errors): syntax.txt      => syntax.html
    generated (23   errors): tabpage.txt     => tabpage.html
    generated (257  errors): tagsrch.txt     => tagsrch.html
    generated (31   errors): term.txt        => term.html
    generated (0    errors): testing.txt     => testing.html
    generated (96   errors): tips.txt        => tips.html
    generated (57   errors): treesitter.txt  => treesitter.html
    generated (71   errors): uganda.txt      => uganda.html
    generated (74   errors): ui.txt          => ui.html
    generated (87   errors): undo.txt        => undo.html
    generated (17   errors): userfunc.txt    => userfunc.html
    generated (1    errors): usr_01.txt      => usr_01.html
    generated (89   errors): usr_02.txt      => usr_02.html
    generated (293  errors): usr_03.txt      => usr_03.html
    generated (46   errors): usr_04.txt      => usr_04.html
    generated (96   errors): usr_05.txt      => usr_05.html
    generated (54   errors): usr_06.txt      => usr_06.html
    generated (20   errors): usr_07.txt      => usr_07.html
    generated (241  errors): usr_08.txt      => usr_08.html
    generated (130  errors): usr_09.txt      => usr_09.html
    generated (50   errors): usr_10.txt      => usr_10.html
    generated (33   errors): usr_11.txt      => usr_11.html
    generated (32   errors): usr_12.txt      => usr_12.html
    generated (22   errors): usr_20.txt      => usr_20.html
    generated (75   errors): usr_21.txt      => usr_21.html
    generated (8    errors): usr_22.txt      => usr_22.html
    generated (3    errors): usr_23.txt      => usr_23.html
    generated (163  errors): usr_25.txt      => usr_25.html
    generated (13   errors): usr_26.txt      => usr_26.html
    generated (84   errors): usr_27.txt      => usr_27.html
    generated (173  errors): usr_28.txt      => usr_28.html
    generated (285  errors): usr_29.txt      => usr_29.html
    generated (280  errors): usr_30.txt      => usr_30.html
    generated (11   errors): usr_31.txt      => usr_31.html
    generated (13   errors): usr_32.txt      => usr_32.html
    generated (156  errors): usr_40.txt      => usr_40.html
    generated (134  errors): usr_41.txt      => usr_41.html
    generated (35   errors): usr_42.txt      => usr_42.html
    generated (19   errors): usr_43.txt      => usr_43.html
    generated (60   errors): usr_44.txt      => usr_44.html
    generated (13   errors): usr_45.txt      => usr_45.html
    generated (1    errors): usr_toc.txt     => usr_toc.html
    generated (69   errors): various.txt     => various.html
    generated (68   errors): vi_diff.txt     => vi_diff.html
    generated (437  errors): vim_diff.txt    => vim_diff.html
    generated (296  errors): visual.txt      => visual.html
    generated (181  errors): windows.txt     => windows.html
    generated 119 html pages
    total errors: 23862
    invalid tags: 537
---
 test/functional/lua/help_spec.lua | 54 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 test/functional/lua/help_spec.lua

(limited to 'test')

diff --git a/test/functional/lua/help_spec.lua b/test/functional/lua/help_spec.lua
new file mode 100644
index 0000000000..266f261ab9
--- /dev/null
+++ b/test/functional/lua/help_spec.lua
@@ -0,0 +1,54 @@
+-- Tests for gen_help_html.lua. Validates :help tags/links and HTML doc generation.
+--
+-- TODO: extract parts of gen_help_html.lua into Nvim stdlib?
+
+local helpers = require('test.functional.helpers')(after_each)
+local clear = helpers.clear
+local exec_lua = helpers.exec_lua
+local eq = helpers.eq
+local ok = helpers.ok
+
+describe(':help docs', function()
+  before_each(clear)
+  it('validate', function()
+    -- If this test fails, try these steps (in order):
+    -- 1. Try to fix/cleanup the :help docs, especially Nvim-owned :help docs.
+    -- 2. Try to fix the parser: https://github.com/vigoux/tree-sitter-vimdoc
+    -- 3. File a parser bug, and adjust the tolerance of this test in the meantime.
+
+    local rv = exec_lua([[return require('scripts.gen_help_html').validate('./build/runtime/doc')]])
+    -- Check that parse errors did not increase wildly.
+    -- TODO: yes, there are currently 24k+ parser errors.
+    --       WIP: https://github.com/vigoux/tree-sitter-vimdoc/pull/16
+    ok(rv.err_count < 24000, '<24000', rv.err_count)
+    -- TODO: should be eq(0, …)
+    ok(exec_lua('return vim.tbl_count(...)', rv.invalid_tags) < 538, '<538',
+      exec_lua('return vim.inspect(...)', rv.invalid_tags))
+  end)
+
+  it('gen_help_html.lua generates HTML', function()
+    -- Test:
+    -- 1. Check that parse errors did not increase wildly. Because we explicitly test only a few
+    --    :help files, we can be more precise about the tolerances here.
+    -- 2. exercise gen_help_html.lua, check that it actually works.
+    -- 3. check that its tree-sitter-vimdoc dependency is working.
+
+    local tmpdir = exec_lua('return vim.fs.dirname(vim.fn.tempname())')
+    -- Because gen() is slow (1 min), this test is limited to a few files.
+    local rv = exec_lua([[
+      local to_dir = ...
+      return require('scripts.gen_help_html').gen(
+        './build/runtime/doc',
+        to_dir,
+        { 'pi_health.txt', 'help.txt', 'index.txt', 'nvim.txt', }
+      )
+      ]],
+      tmpdir
+    )
+    eq(4, #rv.helpfiles)
+    ok(rv.err_count < 700, '<700', rv.err_count)
+    -- TODO: should be eq(0, …)
+    ok(exec_lua('return vim.tbl_count(...)', rv.invalid_tags) <= 32, '<=32',
+      exec_lua('return vim.inspect(...)', rv.invalid_tags))
+  end)
+end)
-- 
cgit 


From d7052e8e1f0311113199ae5c25886fa9690367e4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 23 Sep 2022 07:21:51 +0800
Subject: test: add tests for #13549 #20285 #20290

---
 test/functional/editor/tabpage_spec.lua  | 42 ++++++++++++++++++++++++++++++++
 test/functional/terminal/buffer_spec.lua |  6 +++++
 2 files changed, 48 insertions(+)

(limited to 'test')

diff --git a/test/functional/editor/tabpage_spec.lua b/test/functional/editor/tabpage_spec.lua
index 849a02c28b..01779a9a92 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_close(win2, true)
+    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({
diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua
index 23430a620b..9d10f43ec6 100644
--- a/test/functional/terminal/buffer_spec.lua
+++ b/test/functional/terminal/buffer_spec.lua
@@ -4,6 +4,7 @@ local assert_alive = helpers.assert_alive
 local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
 local poke_eventloop = helpers.poke_eventloop
 local eval, feed_command, source = helpers.eval, helpers.feed_command, helpers.source
+local pcall_err = helpers.pcall_err
 local eq, neq = helpers.eq, helpers.neq
 local meths = helpers.meths
 local retry = helpers.retry
@@ -339,6 +340,11 @@ describe(':terminal buffer', function()
     ]]}
     eq('t', funcs.mode(1))
   end)
+
+  it('writing to an existing file with :w fails #13549', function()
+    eq('Vim(write):E13: File exists (add ! to override)',
+       pcall_err(command, 'write test/functional/fixtures/tty-test.c'))
+  end)
 end)
 
 describe('No heap-buffer-overflow when using', function()
-- 
cgit 


From 7a70e9587c866c506182a32839f4c3b27b9a3b40 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 23 Sep 2022 10:17:44 +0800
Subject: test(tabpage_spec): actually test for nvim_win_hide

---
 test/functional/editor/tabpage_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/editor/tabpage_spec.lua b/test/functional/editor/tabpage_spec.lua
index 01779a9a92..f8ca6986bd 100644
--- a/test/functional/editor/tabpage_spec.lua
+++ b/test/functional/editor/tabpage_spec.lua
@@ -90,7 +90,7 @@ describe('tabpage', function()
     eq({2, 1}, funcs.win_screenpos(0))
     local win3 = curwin().id
 
-    meths.win_close(win2, true)
+    meths.win_hide(win2)
     eq(win3, curwin().id)
     eq(1, #meths.list_tabpages())
     eq({1, 1}, funcs.win_screenpos(0))
-- 
cgit 


From caf5738fa9cc12fd448a9c0787a3ebf0c8e696e9 Mon Sep 17 00:00:00 2001
From: shaunsingh <shaunsingh0207@gmail.com>
Date: Sat, 24 Sep 2022 06:46:21 -0400
Subject: fix(lsp): create missing directory before creating file (#19835)

Co-authored-by: Mathias Fussenegger <f.mathias@zignar.net>
---
 test/functional/plugin/lsp_spec.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'test')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index e032f3bc2b..bcae9b4084 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -1977,6 +1977,22 @@ describe('LSP', function()
       exec_lua('vim.lsp.util.apply_workspace_edit(...)', edit, 'utf-16')
       eq(true, exec_lua('return vim.loop.fs_stat(...) ~= nil', tmpfile))
     end)
+    it('Supports file creation in folder that needs to be created with CreateFile payload', function()
+      local tmpfile = helpers.tmpname()
+      os.remove(tmpfile) -- Should not exist, only interested in a tmpname
+      tmpfile = tmpfile .. '/dummy/x/'
+      local uri = exec_lua('return vim.uri_from_fname(...)', tmpfile)
+      local edit = {
+        documentChanges = {
+          {
+            kind = 'create',
+            uri = uri,
+          },
+        }
+      }
+      exec_lua('vim.lsp.util.apply_workspace_edit(...)', edit, 'utf-16')
+      eq(true, exec_lua('return vim.loop.fs_stat(...) ~= nil', tmpfile))
+    end)
     it('createFile does not touch file if it exists and ignoreIfExists is set', function()
       local tmpfile = helpers.tmpname()
       write_file(tmpfile, 'Dummy content')
-- 
cgit 


From 291a6496327e90056ea68085ad52ab74ca1df752 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 24 Sep 2022 21:07:18 +0800
Subject: fix(mapset): remove existing abbreviation of same lhs (#20320)

---
 test/functional/vimscript/map_functions_spec.lua | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/vimscript/map_functions_spec.lua b/test/functional/vimscript/map_functions_spec.lua
index 96b86d053e..ed1863754a 100644
--- a/test/functional/vimscript/map_functions_spec.lua
+++ b/test/functional/vimscript/map_functions_spec.lua
@@ -12,6 +12,7 @@ local meths = helpers.meths
 local nvim = helpers.nvim
 local source = helpers.source
 local command = helpers.command
+local exec_capture = helpers.exec_capture
 local pcall_err = helpers.pcall_err
 
 describe('maparg()', function()
@@ -178,8 +179,9 @@ describe('mapset()', function()
     eq('\nn  lhs           rhs\n                 map description',
        helpers.exec_capture("nmap lhs"))
     local mapargs = funcs.maparg('lhs', 'n', false, true)
-    meths.del_keymap('n', 'lhs')
-    eq('\nNo mapping found', helpers.exec_capture("nmap lhs"))
+    meths.set_keymap('n', 'lhs', 'rhs', {desc = 'MAP DESCRIPTION'})
+    eq('\nn  lhs           rhs\n                 MAP DESCRIPTION',
+       helpers.exec_capture("nmap lhs"))
     funcs.mapset('n', false, mapargs)
     eq('\nn  lhs           rhs\n                 map description',
        helpers.exec_capture("nmap lhs"))
@@ -198,6 +200,22 @@ describe('mapset()', function()
     expect('<<lt><')
   end)
 
+  it('replaces an abbreviation of the same lhs #20320', function()
+    command('inoreabbr foo bar')
+    eq('\ni  foo         * bar', exec_capture('iabbr foo'))
+    feed('ifoo ')
+    expect('bar ')
+    local mapargs = funcs.maparg('foo', 'i', true, true)
+    command('inoreabbr foo BAR')
+    eq('\ni  foo         * BAR', exec_capture('iabbr foo'))
+    feed('foo ')
+    expect('bar BAR ')
+    funcs.mapset('i', true, mapargs)
+    eq('\ni  foo         * bar', exec_capture('iabbr foo'))
+    feed('foo<Esc>')
+    expect('bar BAR bar')
+  end)
+
   it('can restore Lua callback from the dict returned by maparg()', function()
     eq(0, exec_lua([[
       GlobalCount = 0
-- 
cgit 


From 8317b9199edc6936fec829f4908f9c74dc874ce4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 24 Sep 2022 22:28:41 +0800
Subject: fix(input): use click number of last click for mouse drag (#20300)

---
 test/functional/ui/mouse_spec.lua | 96 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 90 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/mouse_spec.lua b/test/functional/ui/mouse_spec.lua
index 8c5475ecce..cb8dfdb8e1 100644
--- a/test/functional/ui/mouse_spec.lua
+++ b/test/functional/ui/mouse_spec.lua
@@ -648,8 +648,10 @@ describe('ui/mouse/input', function()
     ]]}
   end)
 
-  it('two clicks will select the word and enter VISUAL', function()
-    feed('<LeftMouse><2,2><LeftMouse><2,2>')
+  it('two clicks will enter VISUAL and dragging selects words', function()
+    feed('<LeftMouse><2,2>')
+    feed('<LeftRelease><2,2>')
+    feed('<LeftMouse><2,2>')
     screen:expect([[
       testing                  |
       mouse                    |
@@ -657,10 +659,38 @@ describe('ui/mouse/input', function()
       {0:~                        }|
       {2:-- VISUAL --}             |
     ]])
+    feed('<LeftDrag><0,1>')
+    screen:expect([[
+      testing                  |
+      ^m{1:ouse}                    |
+      {1:support} and selection    |
+      {0:~                        }|
+      {2:-- VISUAL --}             |
+    ]])
+    feed('<LeftDrag><4,0>')
+    screen:expect([[
+      ^t{1:esting}                  |
+      {1:mouse}                    |
+      {1:support} and selection    |
+      {0:~                        }|
+      {2:-- VISUAL --}             |
+    ]])
+    feed('<LeftDrag><14,2>')
+    screen:expect([[
+      testing                  |
+      mouse                    |
+      {1:support and selectio}^n    |
+      {0:~                        }|
+      {2:-- VISUAL --}             |
+    ]])
   end)
 
-  it('three clicks will select the line and enter VISUAL LINE', function()
-    feed('<LeftMouse><2,2><LeftMouse><2,2><LeftMouse><2,2>')
+  it('three clicks will enter VISUAL LINE and dragging selects lines', function()
+    feed('<LeftMouse><2,2>')
+    feed('<LeftRelease><2,2>')
+    feed('<LeftMouse><2,2>')
+    feed('<LeftRelease><2,2>')
+    feed('<LeftMouse><2,2>')
     screen:expect([[
       testing                  |
       mouse                    |
@@ -668,10 +698,40 @@ describe('ui/mouse/input', function()
       {0:~                        }|
       {2:-- VISUAL LINE --}        |
     ]])
+    feed('<LeftDrag><0,1>')
+    screen:expect([[
+      testing                  |
+      ^m{1:ouse}                    |
+      {1:support and selection}    |
+      {0:~                        }|
+      {2:-- VISUAL LINE --}        |
+    ]])
+    feed('<LeftDrag><4,0>')
+    screen:expect([[
+      {1:test}^i{1:ng}                  |
+      {1:mouse}                    |
+      {1:support and selection}    |
+      {0:~                        }|
+      {2:-- VISUAL LINE --}        |
+    ]])
+    feed('<LeftDrag><14,2>')
+    screen:expect([[
+      testing                  |
+      mouse                    |
+      {1:support and se}^l{1:ection}    |
+      {0:~                        }|
+      {2:-- VISUAL LINE --}        |
+    ]])
   end)
 
-  it('four clicks will enter VISUAL BLOCK', function()
-    feed('<LeftMouse><2,2><LeftMouse><2,2><LeftMouse><2,2><LeftMouse><2,2>')
+  it('four clicks will enter VISUAL BLOCK and dragging selects blockwise', function()
+    feed('<LeftMouse><2,2>')
+    feed('<LeftRelease><2,2>')
+    feed('<LeftMouse><2,2>')
+    feed('<LeftRelease><2,2>')
+    feed('<LeftMouse><2,2>')
+    feed('<LeftRelease><2,2>')
+    feed('<LeftMouse><2,2>')
     screen:expect([[
       testing                  |
       mouse                    |
@@ -679,6 +739,30 @@ describe('ui/mouse/input', function()
       {0:~                        }|
       {2:-- VISUAL BLOCK --}       |
     ]])
+    feed('<LeftDrag><0,1>')
+    screen:expect([[
+      testing                  |
+      ^m{1:ou}se                    |
+      {1:sup}port and selection    |
+      {0:~                        }|
+      {2:-- VISUAL BLOCK --}       |
+    ]])
+    feed('<LeftDrag><4,0>')
+    screen:expect([[
+      te{1:st}^ing                  |
+      mo{1:use}                    |
+      su{1:ppo}rt and selection    |
+      {0:~                        }|
+      {2:-- VISUAL BLOCK --}       |
+    ]])
+    feed('<LeftDrag><14,2>')
+    screen:expect([[
+      testing                  |
+      mouse                    |
+      su{1:pport and se}^lection    |
+      {0:~                        }|
+      {2:-- VISUAL BLOCK --}       |
+    ]])
   end)
 
   it('right click extends visual selection to the clicked location', function()
-- 
cgit 


From 2a3cb0893b03aeff4d8c0b2116cbddda53bba5a2 Mon Sep 17 00:00:00 2001
From: Louis Sven Goulet <31444858+lorlouis@users.noreply.github.com>
Date: Sat, 24 Sep 2022 21:57:10 -0400
Subject: feat: ":write!" skips "file changed" warning #18665

Problem:
Cannot opt-out of "WARNING: The file has been changed since reading
it!!!", even with ":write!".

Solution:
Change ":write!" to skip the warning.

closes #7270
---
 test/functional/core/fileio_spec.lua | 58 ++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

(limited to 'test')

diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua
index e71131dcf8..a589d088a4 100644
--- a/test/functional/core/fileio_spec.lua
+++ b/test/functional/core/fileio_spec.lua
@@ -23,6 +23,8 @@ local iswin = helpers.iswin
 local assert_alive = helpers.assert_alive
 local expect_exit = helpers.expect_exit
 local write_file = helpers.write_file
+local Screen = require('test.functional.ui.screen')
+local feed_command = helpers.feed_command
 local uname = helpers.uname
 
 describe('fileio', function()
@@ -36,6 +38,7 @@ describe('fileio', function()
     os.remove('Xtest_startup_file2')
     os.remove('Xtest_тест.md')
     os.remove('Xtest-u8-int-max')
+    os.remove('Xtest-overwrite-forced')
     rmdir('Xtest_startup_swapdir')
     rmdir('Xtest_backupdir')
   end)
@@ -151,6 +154,61 @@ describe('fileio', function()
     command('edit ++enc=utf32 Xtest-u8-int-max')
     assert_alive()
   end)
+
+  it(':w! does not show "file has been changed" warning', function()
+    clear()
+    write_file("Xtest-overwrite-forced", 'foobar')
+    command('set nofixendofline')
+    local screen = Screen.new(40,4)
+    screen:set_default_attr_ids({
+      [1] = {bold = true, foreground = Screen.colors.Blue1},
+      [2] = {foreground = Screen.colors.Grey100, background = Screen.colors.Red},
+      [3] = {bold = true, foreground = Screen.colors.SeaGreen4}
+    })
+    screen:attach()
+    command("set display-=msgsep shortmess-=F")
+
+    command("e Xtest-overwrite-forced")
+    screen:expect([[
+      ^foobar                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+      "Xtest-overwrite-forced" [noeol] 1L, 6B |
+    ]])
+
+    -- Get current unix time.
+    local cur_unix_time = os.time(os.date("!*t"))
+    local future_time = cur_unix_time + 999999
+    -- Set the file's access/update time to be
+    -- greater than the time at which it was created.
+    local uv = require("luv")
+    uv.fs_utime('Xtest-overwrite-forced', future_time, future_time)
+    -- use async feed_command because nvim basically hangs on the prompt
+    feed_command("w")
+    screen:expect([[
+      {2:WARNING: The file has been changed since}|
+      {2: reading it!!!}                          |
+      {3:Do you really want to write to it (y/n)^?}|
+                                              |
+    ]])
+
+    feed("n")
+    feed("<cr>")
+    screen:expect([[
+      ^foobar                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+                                              |
+    ]])
+    -- Use a screen test because the warning does not set v:errmsg.
+    command("w!")
+    screen:expect([[
+      ^foobar                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+      <erwrite-forced" [noeol] 1L, 6B written |
+    ]])
+  end)
 end)
 
 describe('tmpdir', function()
-- 
cgit 


From 3169fc54a129f6dd1c0baf2d404e50381cf48e8f Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 25 Sep 2022 00:45:15 +0200
Subject: refactor(treesitter): rename x_position => x_pos

"pos" has a long precedent as "position" in vim, and there is no reason
to use a verbose name here.
---
 test/functional/treesitter/highlight_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua
index 1684337c3c..ae3f42ff0a 100644
--- a/test/functional/treesitter/highlight_spec.lua
+++ b/test/functional/treesitter/highlight_spec.lua
@@ -607,7 +607,7 @@ describe('treesitter highlighting', function()
     eq({
       {capture='Error', metadata = { priority='101' }};
       {capture='type', metadata = { } };
-    }, exec_lua [[ return vim.treesitter.get_captures_at_position(0, 0, 2) ]])
+    }, exec_lua [[ return vim.treesitter.get_captures_at_pos(0, 0, 2) ]])
     end)
 
   it("allows to use captures with dots (don't use fallback when specialization of foo exists)", function()
-- 
cgit 


From fded344f38f0814256b3acd01d94d5942a22f7fc Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 25 Sep 2022 21:38:46 +0800
Subject: fix(extmarks): make virt_lines always start at 0 virtcol

---
 test/functional/ui/decorations_spec.lua | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua
index eff6fe6d23..44b88d702f 100644
--- a/test/functional/ui/decorations_spec.lua
+++ b/test/functional/ui/decorations_spec.lua
@@ -1550,6 +1550,38 @@ if (h->n_buckets < new_n_buckets) { // expand
       }                                                 |
                                                         |
     ]]}
+
+    command 'set number'
+    screen:expect{grid=[[
+      {9:  1 }^if (h->n_buckets < new_n_buckets) { // expand |
+      {9:  2 }  khkey_t *new_keys = (khkey_t *)krealloc((voi|
+      {9:    }d *)h->keys, new_n_buckets * sizeof(khkey_t));|
+      {9:    }{1:>>}{2:  very    tabby}text   with    tabs          |
+      {9:  3 }  h->keys = new_keys;                         |
+      {9:  4 }  if (kh_is_map && val_size) {                |
+      {9:  5 }    char *new_vals = krealloc( h->vals_buf, ne|
+      {9:    }w_n_buckets * val_size);                      |
+      {9:  6 }    h->vals_buf = new_vals;                   |
+      {9:  7 }  }                                           |
+      {9:  8 }}                                             |
+                                                        |
+    ]]}
+
+    command 'set tabstop&'
+    screen:expect{grid=[[
+      {9:  1 }^if (h->n_buckets < new_n_buckets) { // expand |
+      {9:  2 }  khkey_t *new_keys = (khkey_t *)krealloc((voi|
+      {9:    }d *)h->keys, new_n_buckets * sizeof(khkey_t));|
+      {9:    }{1:>>}{2:      very    tabby}text       with    tabs  |
+      {9:  3 }  h->keys = new_keys;                         |
+      {9:  4 }  if (kh_is_map && val_size) {                |
+      {9:  5 }    char *new_vals = krealloc( h->vals_buf, ne|
+      {9:    }w_n_buckets * val_size);                      |
+      {9:  6 }    h->vals_buf = new_vals;                   |
+      {9:  7 }  }                                           |
+      {9:  8 }}                                             |
+                                                        |
+    ]]}
   end)
 
 end)
-- 
cgit 


From f8a1cadccff39923643fdea2e282be9fffa60e99 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 25 Sep 2022 22:29:25 +0800
Subject: fix(filetype): use :setf instead of nvim_buf_set_option (#20334)

---
 test/functional/lua/filetype_spec.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/filetype_spec.lua b/test/functional/lua/filetype_spec.lua
index be57b2db31..2a7be53164 100644
--- a/test/functional/lua/filetype_spec.lua
+++ b/test/functional/lua/filetype_spec.lua
@@ -1,6 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local exec_lua = helpers.exec_lua
 local eq = helpers.eq
+local meths = helpers.meths
 local clear = helpers.clear
 local pathroot = helpers.pathroot
 local command = helpers.command
@@ -94,3 +95,10 @@ describe('vim.filetype', function()
     ]])
   end)
 end)
+
+describe('filetype.lua', function()
+  it('does not override user autocommands that set filetype #20333', function()
+    clear({args={'--clean', '--cmd', 'autocmd BufRead *.md set filetype=notmarkdown', 'README.md'}})
+    eq('notmarkdown', meths.buf_get_option(0, 'filetype'))
+  end)
+end)
-- 
cgit 


From a6c9764edaa349f5f268e5e3bf8b940e137fb5c4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 26 Sep 2022 07:00:37 +0800
Subject: fix(inccommand): deal with unsynced undo (#20041)

---
 test/functional/ui/inccommand_spec.lua | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua
index 49b3c7a655..6fbf9b72c8 100644
--- a/test/functional/ui/inccommand_spec.lua
+++ b/test/functional/ui/inccommand_spec.lua
@@ -3047,6 +3047,43 @@ it(":substitute doesn't crash with inccommand, if undo is empty #12932", functio
   assert_alive()
 end)
 
+it(':substitute with inccommand works properly if undo is not synced #20029', function()
+  local screen = Screen.new(30, 6)
+  clear()
+  common_setup(screen, 'nosplit', 'foo\nbar\nbaz')
+  meths.set_keymap('x', '<F2>', '<Esc>`<Oaaaaa asdf<Esc>`>obbbbb asdf<Esc>V`<k:s/asdf/', {})
+  feed('gg0<C-V>lljj<F2>')
+  screen:expect([[
+    aaaaa                         |
+    foo                           |
+    bar                           |
+    baz                           |
+    bbbbb                         |
+    :'<,'>s/asdf/^                 |
+  ]])
+  feed('hjkl')
+  screen:expect([[
+    aaaaa {12:hjkl}                    |
+    foo                           |
+    bar                           |
+    baz                           |
+    bbbbb {12:hjkl}                    |
+    :'<,'>s/asdf/hjkl^             |
+  ]])
+  feed('<CR>')
+  expect([[
+    aaaaa hjkl
+    foo
+    bar
+    baz
+    bbbbb hjkl]])
+  feed('u')
+  expect([[
+    foo
+    bar
+    baz]])
+end)
+
 it('long :%s/ with inccommand does not collapse cmdline', function()
   local screen = Screen.new(10,5)
   clear()
-- 
cgit 


From ac66f5af06ac1f306b0ddb366ba81093508546c4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 26 Sep 2022 07:15:07 +0800
Subject: fix!: make :undo! notify buffer update callbacks (#20344)

When :undo! was introduced to Nvim the implementation of 'inccommand'
preview callback hasn't been fully decided yet, so not notifying buffer
update callbacks made sense for 'inccommand' preview callback in case it
needs to undo the changes itself.
Now it turns out that the undo-and-forget is done automatically for
'inccommand', so it doesn't make sense for :undo! to avoid notifying
buffer update callbacks anymore.
---
 test/functional/lua/buffer_updates_spec.lua | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/buffer_updates_spec.lua b/test/functional/lua/buffer_updates_spec.lua
index 10de45274c..c6c0964ddb 100644
--- a/test/functional/lua/buffer_updates_spec.lua
+++ b/test/functional/lua/buffer_updates_spec.lua
@@ -118,6 +118,24 @@ describe('lua buffer event callbacks: on_lines', function()
     }
     tick = tick + 1
 
+    tick = tick + 1
+    command('redo')
+    check_events {
+      { "test1", "lines", 1, tick, 3, 5, 4, 32 };
+      { "test2", "lines", 1, tick, 3, 5, 4, 32 };
+      { "test2", "changedtick", 1, tick+1 };
+    }
+    tick = tick + 1
+
+    tick = tick + 1
+    command('undo!')
+    check_events {
+      { "test1", "lines", 1, tick, 3, 4, 5, 13 };
+      { "test2", "lines", 1, tick, 3, 4, 5, 13 };
+      { "test2", "changedtick", 1, tick+1 };
+    }
+    tick = tick + 1
+
     -- simulate next callback returning true
     exec_lua("test_unreg = 'test1'")
 
-- 
cgit 


From 9ffa041a9a5fc8cd9acca97cae16f66ba0c82805 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 26 Sep 2022 07:46:58 +0800
Subject: vim-patch:9.0.0586: missing change in test (#20347)

Problem:    Missing change in test.
Solution:   Add the test change.
https://github.com/vim/vim/commit/124af71a28a633fa655cff41bc21d398481ce45f

vim-patch:9.0.0585: when long message test fails the error message is not visible

Problem:    When long message test fails the error message is not visible.
Solution:   Dump more lines.
https://github.com/vim/vim/commit/6a879878f4e1918a05244e6acd4c73c3135cf941
---
 test/functional/legacy/messages_spec.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/legacy/messages_spec.lua b/test/functional/legacy/messages_spec.lua
index c76ce62ef0..5b671bbfdf 100644
--- a/test/functional/legacy/messages_spec.lua
+++ b/test/functional/legacy/messages_spec.lua
@@ -352,7 +352,7 @@ describe('messages', function()
 
     -- oldtest: Test_quit_long_message()
     it('with control characters can be quit vim-patch:8.2.1844', function()
-      screen:try_resize(40, 6)
+      screen:try_resize(40, 10)
       feed([[:echom range(9999)->join("\x01")<CR>]])
       screen:expect([[
         0{3:^A}1{3:^A}2{3:^A}3{3:^A}4{3:^A}5{3:^A}6{3:^A}7{3:^A}8{3:^A}9{3:^A}10{3:^A}11{3:^A}12|
@@ -360,6 +360,10 @@ describe('messages', function()
         {3:^A}23{3:^A}24{3:^A}25{3:^A}26{3:^A}27{3:^A}28{3:^A}29{3:^A}30{3:^A}31{3:^A}32|
         {3:^A}33{3:^A}34{3:^A}35{3:^A}36{3:^A}37{3:^A}38{3:^A}39{3:^A}40{3:^A}41{3:^A}42|
         {3:^A}43{3:^A}44{3:^A}45{3:^A}46{3:^A}47{3:^A}48{3:^A}49{3:^A}50{3:^A}51{3:^A}52|
+        {3:^A}53{3:^A}54{3:^A}55{3:^A}56{3:^A}57{3:^A}58{3:^A}59{3:^A}60{3:^A}61{3:^A}62|
+        {3:^A}63{3:^A}64{3:^A}65{3:^A}66{3:^A}67{3:^A}68{3:^A}69{3:^A}70{3:^A}71{3:^A}72|
+        {3:^A}73{3:^A}74{3:^A}75{3:^A}76{3:^A}77{3:^A}78{3:^A}79{3:^A}80{3:^A}81{3:^A}82|
+        {3:^A}83{3:^A}84{3:^A}85{3:^A}86{3:^A}87{3:^A}88{3:^A}89{3:^A}90{3:^A}91{3:^A}92|
         {1:-- More --}^                              |
       ]])
       feed('q')
@@ -368,6 +372,10 @@ describe('messages', function()
         {0:~                                       }|
         {0:~                                       }|
         {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
         {0:~                                       }|
                                                 |
       ]])
-- 
cgit 


From 4bb1d1df79bd1f125499e556d5d4e21ac2ff1e5a Mon Sep 17 00:00:00 2001
From: Andrey Bushev <hlam-box@yandex.ru>
Date: Sat, 24 Sep 2022 22:54:30 -0700
Subject: feat(terminal): recognize underdouble and undercurl

---
 test/functional/terminal/helpers.lua        |  4 ++++
 test/functional/terminal/highlight_spec.lua | 10 ++++++++++
 2 files changed, 14 insertions(+)

(limited to 'test')

diff --git a/test/functional/terminal/helpers.lua b/test/functional/terminal/helpers.lua
index bcfd3559e6..d69f3207f1 100644
--- a/test/functional/terminal/helpers.lua
+++ b/test/functional/terminal/helpers.lua
@@ -31,6 +31,8 @@ local function set_bg(num) feed_termcode('[48;5;'..num..'m') end
 local function set_bold() feed_termcode('[1m') end
 local function set_italic() feed_termcode('[3m') end
 local function set_underline() feed_termcode('[4m') end
+local function set_underdouble() feed_termcode('[4:2m') end
+local function set_undercurl() feed_termcode('[4:3m') end
 local function set_strikethrough() feed_termcode('[9m') end
 local function clear_attrs() feed_termcode('[0;10m') end
 -- mouse
@@ -116,6 +118,8 @@ return {
   set_bold = set_bold,
   set_italic = set_italic,
   set_underline = set_underline,
+  set_underdouble = set_underdouble,
+  set_undercurl = set_undercurl,
   set_strikethrough = set_strikethrough,
   clear_attrs = clear_attrs,
   enable_mouse = enable_mouse,
diff --git a/test/functional/terminal/highlight_spec.lua b/test/functional/terminal/highlight_spec.lua
index 28ca07d815..a119d4acd3 100644
--- a/test/functional/terminal/highlight_spec.lua
+++ b/test/functional/terminal/highlight_spec.lua
@@ -26,6 +26,8 @@ describe(':terminal highlight', function()
       [9] = {foreground = 130},
       [10] = {reverse = true},
       [11] = {background = 11},
+      [12] = {bold = true, underdouble = true},
+      [13] = {italic = true, undercurl = true},
     })
     screen:attach({rgb=false})
     command(("enew | call termopen(['%s'])"):format(testprg('tty-test')))
@@ -114,6 +116,14 @@ describe(':terminal highlight', function()
     thelpers.set_underline()
     thelpers.set_strikethrough()
   end)
+  descr('bold and underdouble', 12, function()
+    thelpers.set_bold()
+    thelpers.set_underdouble()
+  end)
+  descr('italics and undercurl', 13, function()
+    thelpers.set_italic()
+    thelpers.set_undercurl()
+  end)
 end)
 
 it(':terminal highlight has lower precedence than editor #9964', function()
-- 
cgit 


From db0ea1ab444c5e45fe02e1f2984aefc2eb613096 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 26 Sep 2022 10:40:34 +0200
Subject: fix(messages): validate msg_grid before silent! message with
 cmdheight=0

fixes #20316
---
 test/functional/ui/cmdline_spec.lua | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index 92eb853686..3669352901 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -1183,4 +1183,17 @@ describe('cmdheight=0', function()
       {1:~                        }|
     ]]}
   end)
+
+  it('with silent! at startup', function()
+    clear{args={'-c', 'set cmdheight=0', '-c', 'autocmd VimEnter * silent! call Foo()'}}
+    screen:attach()
+    -- doesn't crash while not displaying silent! error message
+    screen:expect{grid=[[
+      ^                         |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+    ]]}
+  end)
 end)
-- 
cgit 


From c815aadfccd6bada47ecfb09fe188ee7f7c5caf3 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 26 Sep 2022 11:43:23 +0200
Subject: docs: fix typos (#20150)

Co-authored-by: Miguel Carneiro <mcarneiromorenas@gmail.com>
Co-authored-by: Gregory Anders <greg@gpanders.com>
Co-authored-by: Raphael <glephunter@gmail.com>
Co-authored-by: C.D. MacEachern <craig.daniel.maceachern@gmail.com>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
---
 test/functional/vimscript/map_functions_spec.lua | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/functional/vimscript/map_functions_spec.lua b/test/functional/vimscript/map_functions_spec.lua
index ed1863754a..8645b1e506 100644
--- a/test/functional/vimscript/map_functions_spec.lua
+++ b/test/functional/vimscript/map_functions_spec.lua
@@ -176,15 +176,12 @@ describe('mapset()', function()
 
   it('can restore mapping description from the dict returned by maparg()', function()
     meths.set_keymap('n', 'lhs', 'rhs', {desc = 'map description'})
-    eq('\nn  lhs           rhs\n                 map description',
-       helpers.exec_capture("nmap lhs"))
+    eq('\nn  lhs           rhs\n                 map description', exec_capture("nmap lhs"))
     local mapargs = funcs.maparg('lhs', 'n', false, true)
     meths.set_keymap('n', 'lhs', 'rhs', {desc = 'MAP DESCRIPTION'})
-    eq('\nn  lhs           rhs\n                 MAP DESCRIPTION',
-       helpers.exec_capture("nmap lhs"))
+    eq('\nn  lhs           rhs\n                 MAP DESCRIPTION', exec_capture("nmap lhs"))
     funcs.mapset('n', false, mapargs)
-    eq('\nn  lhs           rhs\n                 map description',
-       helpers.exec_capture("nmap lhs"))
+    eq('\nn  lhs           rhs\n                 map description', exec_capture("nmap lhs"))
   end)
 
   it('can restore "replace_keycodes" from the dict returned by maparg()', function()
-- 
cgit 


From be72af2f9b6aa9ff57ef21eb4e517a74b7c2a2da Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 26 Sep 2022 11:40:06 +0200
Subject: fix(cmdline): don't send invalid cursor with incsearch and
 cmdheight=0

fixes #20306
---
 test/functional/ui/cmdline_spec.lua | 42 +++++++++++++++++++++++++++++++++++++
 test/functional/ui/screen.lua       |  1 +
 2 files changed, 43 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index 3669352901..845291b2eb 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -1196,4 +1196,46 @@ describe('cmdheight=0', function()
       {1:~                        }|
     ]]}
   end)
+
+  it('with multigrid', function()
+    clear{args={'--cmd', 'set cmdheight=0'}}
+    screen:attach{ext_multigrid=true}
+    screen:expect{grid=[[
+    ## grid 1
+      [2:-------------------------]|
+      [2:-------------------------]|
+      [2:-------------------------]|
+      [2:-------------------------]|
+      [2:-------------------------]|
+    ## grid 2
+      ^                         |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+    ## grid 3
+    ]], win_viewport={
+      [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+    }}
+
+    feed '/p'
+    screen:expect{grid=[[
+    ## grid 1
+      [2:-------------------------]|
+      [2:-------------------------]|
+      [2:-------------------------]|
+      [2:-------------------------]|
+      [3:-------------------------]|
+    ## grid 2
+                               |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+    ## grid 3
+      /p^                       |
+    ]], win_viewport={
+      [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
+    }}
+  end)
 end)
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 6ee9e7b393..028fa2825d 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -769,6 +769,7 @@ end
 
 function Screen:_handle_grid_cursor_goto(grid, row, col)
   self._cursor.grid = grid
+  assert(row >= 0 and col >= 0)
   self._cursor.row = row + 1
   self._cursor.col = col + 1
 end
-- 
cgit 


From be693462d5a5fd696b46ea4ea854c924421089b4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 26 Sep 2022 21:23:43 +0800
Subject: fix(ui): allow redrawing statusline when msgsep is used (#20337)

---
 test/functional/ui/cmdline_spec.lua | 128 ++++++++++++++++++++++++++++++++++--
 1 file changed, 124 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index 845291b2eb..d7f2b2335e 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -5,6 +5,7 @@ local source = helpers.source
 local command = helpers.command
 local assert_alive = helpers.assert_alive
 local uname = helpers.uname
+local exec = helpers.exec
 local eval = helpers.eval
 local eq = helpers.eq
 
@@ -821,12 +822,23 @@ describe('statusline is redrawn on entering cmdline', function()
     ]]}
   end)
 
-  it('but not with scrolled messages', function()
-    command('set statusline=%{mode()}')
-    screen:try_resize(35,10)
+  it('with scrolled messages and msgsep', function()
+    screen:try_resize(35,14)
+    exec([[
+      let g:count = 0
+      autocmd CmdlineEnter * let g:count += 1
+      split
+      resize 1
+      setlocal statusline=%{mode()}%{g:count}
+      setlocal winbar=%{mode()}%{g:count}
+    ]])
     feed(':echoerr doesnotexist<cr>')
     screen:expect{grid=[[
+      {9:c1                                 }|
                                          |
+      {3:c1                                 }|
+                                         |
+      {1:~                                  }|
       {1:~                                  }|
       {1:~                                  }|
       {1:~                                  }|
@@ -839,8 +851,27 @@ describe('statusline is redrawn on entering cmdline', function()
     ]]}
     feed(':echoerr doesnotexist<cr>')
     screen:expect{grid=[[
+      {9:c2                                 }|
+                                         |
+      {3:c2                                 }|
                                          |
       {1:~                                  }|
+      {1:~                                  }|
+      {3:                                   }|
+      {4:E121: Undefined variable: doesnotex}|
+      {4:ist}                                |
+      {5:Press ENTER or type command to cont}|
+      {4:E121: Undefined variable: doesnotex}|
+      {4:ist}                                |
+      {5:Press ENTER or type command to cont}|
+      {5:inue}^                               |
+    ]]}
+
+    feed(':echoerr doesnotexist<cr>')
+    screen:expect{grid=[[
+      {9:c3                                 }|
+                                         |
+      {3:c3                                 }|
       {3:                                   }|
       {4:E121: Undefined variable: doesnotex}|
       {4:ist}                                |
@@ -848,6 +879,63 @@ describe('statusline is redrawn on entering cmdline', function()
       {4:E121: Undefined variable: doesnotex}|
       {4:ist}                                |
       {5:Press ENTER or type command to cont}|
+      {4:E121: Undefined variable: doesnotex}|
+      {4:ist}                                |
+      {5:Press ENTER or type command to cont}|
+      {5:inue}^                               |
+    ]]}
+
+    feed('<cr>')
+    screen:expect{grid=[[
+      {9:n3                                 }|
+      ^                                   |
+      {3:n3                                 }|
+                                         |
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {2:[No Name]                          }|
+                                         |
+    ]]}
+  end)
+
+  it('but not with scrolled messages without msgsep', function()
+    screen:try_resize(35,10)
+    exec([[
+      let g:count = 0
+      autocmd CmdlineEnter * let g:count += 1
+      set display-=msgsep
+      set statusline=%{mode()}%{g:count}
+    ]])
+    feed(':echoerr doesnotexist<cr>')
+    screen:expect{grid=[[
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {1:~                                  }|
+      {3:c1                                 }|
+      {4:E121: Undefined variable: doesnotex}|
+      {4:ist}                                |
+      {5:Press ENTER or type command to cont}|
+      {5:inue}^                               |
+    ]]}
+    feed(':echoerr doesnotexist<cr>')
+    screen:expect{grid=[[
+      {1:~                                  }|
+      {1:~                                  }|
+      {3:c1                                 }|
+      {4:E121: Undefined variable: doesnotex}|
+      {4:ist}                                |
+      {5:Press ENTER or type command to cont}|
+      {4:E121: Undefined variable: doesnotex}|
+      {4:ist}                                |
+      {5:Press ENTER or type command to cont}|
       {5:inue}^                               |
     ]]}
 
@@ -875,7 +963,7 @@ describe('statusline is redrawn on entering cmdline', function()
       {1:~                                  }|
       {1:~                                  }|
       {1:~                                  }|
-      {3:n                                  }|
+      {3:n3                                 }|
                                          |
     ]]}
   end)
@@ -1238,4 +1326,36 @@ describe('cmdheight=0', function()
       [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
     }}
   end)
+
+  it('winbar is redrawn on entering cmdline and :redrawstatus #20336', function()
+    exec([[
+      set cmdheight=0
+      set winbar=%{mode()}%=:%{getcmdline()}
+    ]])
+    feed(':')
+    screen:expect([[
+      {3:c                       :}|
+                               |
+      {1:~                        }|
+      {1:~                        }|
+      :^                        |
+    ]])
+    feed('echo')
+    -- not redrawn yet
+    screen:expect([[
+      {3:c                       :}|
+                               |
+      {1:~                        }|
+      {1:~                        }|
+      :echo^                    |
+    ]])
+    command('redrawstatus')
+    screen:expect([[
+      {3:c                   :echo}|
+                               |
+      {1:~                        }|
+      {1:~                        }|
+      :echo^                    |
+    ]])
+  end)
 end)
-- 
cgit 


From 7e98821e56a88487f24584463869432d8373a28e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 27 Sep 2022 06:33:48 +0800
Subject: fix(ui): redraw end of buffer if last line is modified (#20354)

---
 test/functional/ui/decorations_spec.lua | 104 ++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua
index eff6fe6d23..9b48f0ac35 100644
--- a/test/functional/ui/decorations_spec.lua
+++ b/test/functional/ui/decorations_spec.lua
@@ -1281,6 +1281,110 @@ if (h->n_buckets < new_n_buckets) { // expand
     ]]}
   end)
 
+  it('works beyond end of the buffer with virt_lines_above', function()
+    insert(example_text)
+    feed 'G'
+
+    screen:expect{grid=[[
+      if (h->n_buckets < new_n_buckets) { // expand     |
+        khkey_t *new_keys = (khkey_t *)krealloc((void *)|
+      h->keys, new_n_buckets * sizeof(khkey_t));        |
+        h->keys = new_keys;                             |
+        if (kh_is_map && val_size) {                    |
+          char *new_vals = krealloc( h->vals_buf, new_n_|
+      buckets * val_size);                              |
+          h->vals_buf = new_vals;                       |
+        }                                               |
+      ^}                                                 |
+      {1:~                                                 }|
+                                                        |
+    ]]}
+
+    local id = meths.buf_set_extmark(0, ns, 8, 0, {
+      virt_lines={{{"Grugg"}}};
+      virt_lines_above = true,
+    })
+
+    screen:expect{grid=[[
+      if (h->n_buckets < new_n_buckets) { // expand     |
+        khkey_t *new_keys = (khkey_t *)krealloc((void *)|
+      h->keys, new_n_buckets * sizeof(khkey_t));        |
+        h->keys = new_keys;                             |
+        if (kh_is_map && val_size) {                    |
+          char *new_vals = krealloc( h->vals_buf, new_n_|
+      buckets * val_size);                              |
+          h->vals_buf = new_vals;                       |
+        }                                               |
+      ^}                                                 |
+      Grugg                                             |
+                                                        |
+    ]]}
+
+    feed('dd')
+    screen:expect{grid=[[
+      if (h->n_buckets < new_n_buckets) { // expand     |
+        khkey_t *new_keys = (khkey_t *)krealloc((void *)|
+      h->keys, new_n_buckets * sizeof(khkey_t));        |
+        h->keys = new_keys;                             |
+        if (kh_is_map && val_size) {                    |
+          char *new_vals = krealloc( h->vals_buf, new_n_|
+      buckets * val_size);                              |
+          h->vals_buf = new_vals;                       |
+        ^}                                               |
+      Grugg                                             |
+      {1:~                                                 }|
+                                                        |
+    ]]}
+
+    feed('dk')
+    screen:expect{grid=[[
+      if (h->n_buckets < new_n_buckets) { // expand     |
+        khkey_t *new_keys = (khkey_t *)krealloc((void *)|
+      h->keys, new_n_buckets * sizeof(khkey_t));        |
+        h->keys = new_keys;                             |
+        if (kh_is_map && val_size) {                    |
+          ^char *new_vals = krealloc( h->vals_buf, new_n_|
+      buckets * val_size);                              |
+      Grugg                                             |
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+                                                        |
+    ]]}
+
+    feed('dgg')
+    screen:expect{grid=[[
+      ^                                                  |
+      Grugg                                             |
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      --No lines in buffer--                            |
+    ]]}
+
+    meths.buf_del_extmark(0, ns, id)
+    screen:expect{grid=[[
+      ^                                                  |
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      --No lines in buffer--                            |
+    ]]}
+  end)
+
   it('does not cause syntax ml_get error at the end of a buffer #17816', function()
     command([[syntax region foo keepend start='^foo' end='^$']])
     command('syntax sync minlines=100')
-- 
cgit 


From 1d337d4e2f2265b13ecf19a3bc17ad302d3b0d96 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 27 Sep 2022 08:29:21 +0800
Subject: vim-patch:9.0.0595: extra newline in messages after a verbose shell
 message (#20359)

Problem:    Extra newline in messages after a verbose shell message.
Solution:   Output the newline with msg_putchar_attr(). (closes vim/vim#11233)
            Make it possible to filter a screendump before comparing it.
https://github.com/vim/vim/commit/1190139ed01c27539615beea9559a88b2551daf3

Cherry-pick Test_message_more_scrolledback() from patch 9.0.0592 because
Nvim already behaves as intended.
---
 test/functional/legacy/messages_spec.lua | 152 +++++++++++++++++++++++++++----
 1 file changed, 136 insertions(+), 16 deletions(-)

(limited to 'test')

diff --git a/test/functional/legacy/messages_spec.lua b/test/functional/legacy/messages_spec.lua
index 5b671bbfdf..71a53c8381 100644
--- a/test/functional/legacy/messages_spec.lua
+++ b/test/functional/legacy/messages_spec.lua
@@ -4,6 +4,8 @@ local clear = helpers.clear
 local command = helpers.command
 local exec = helpers.exec
 local feed = helpers.feed
+local meths = helpers.meths
+local nvim_dir = helpers.nvim_dir
 
 before_each(clear)
 
@@ -49,19 +51,18 @@ describe('messages', function()
 
   describe('more prompt', function()
     before_each(function()
+      command('set more')
+    end)
+
+    -- oldtest: Test_message_more()
+    it('works', function()
       screen = Screen.new(75, 6)
       screen:set_default_attr_ids({
-        [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
         [1] = {bold = true, foreground = Screen.colors.SeaGreen},  -- MoreMsg
         [2] = {foreground = Screen.colors.Brown},  -- LineNr
-        [3] = {foreground = Screen.colors.Blue},  -- SpecialKey
       })
       screen:attach()
-      command('set more')
-    end)
 
-    -- oldtest: Test_message_more()
-    it('works', function()
       command('call setline(1, range(1, 100))')
 
       feed(':%pfoo<C-H><C-H><C-H>#')
@@ -350,20 +351,139 @@ describe('messages', function()
       ]])
     end)
 
+    -- oldtest: Test_echo_verbose_system()
+    it('verbose message before echo command', function()
+      screen = Screen.new(60, 10)
+      screen:set_default_attr_ids({
+        [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+        [1] = {bold = true, foreground = Screen.colors.SeaGreen},  -- MoreMsg
+      })
+      screen:attach()
+
+      command('cd '..nvim_dir)
+      meths.set_option('shell', './shell-test')
+      meths.set_option('shellcmdflag', 'REP 20')
+      meths.set_option('shellxquote', '')  -- win: avoid extra quotes
+
+      -- display a page and go back, results in exactly the same view
+      feed([[:4 verbose echo system('foo')<CR>]])
+      screen:expect([[
+        Executing command: "'./shell-test' 'REP' '20' 'foo'"        |
+                                                                    |
+        0: foo                                                      |
+        1: foo                                                      |
+        2: foo                                                      |
+        3: foo                                                      |
+        4: foo                                                      |
+        5: foo                                                      |
+        6: foo                                                      |
+        {1:-- More --}^                                                  |
+      ]])
+      feed('<Space>')
+      screen:expect([[
+        7: foo                                                      |
+        8: foo                                                      |
+        9: foo                                                      |
+        10: foo                                                     |
+        11: foo                                                     |
+        12: foo                                                     |
+        13: foo                                                     |
+        14: foo                                                     |
+        15: foo                                                     |
+        {1:-- More --}^                                                  |
+      ]])
+      feed('b')
+      screen:expect([[
+        Executing command: "'./shell-test' 'REP' '20' 'foo'"        |
+                                                                    |
+        0: foo                                                      |
+        1: foo                                                      |
+        2: foo                                                      |
+        3: foo                                                      |
+        4: foo                                                      |
+        5: foo                                                      |
+        6: foo                                                      |
+        {1:-- More --}^                                                  |
+      ]])
+
+      -- do the same with 'cmdheight' set to 2
+      feed('q')
+      command('set ch=2')
+      command('mode')  -- FIXME: bottom is invalid after scrolling
+      screen:expect([[
+        ^                                                            |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+                                                                    |
+                                                                    |
+      ]])
+      feed([[:4 verbose echo system('foo')<CR>]])
+      screen:expect([[
+        Executing command: "'./shell-test' 'REP' '20' 'foo'"        |
+                                                                    |
+        0: foo                                                      |
+        1: foo                                                      |
+        2: foo                                                      |
+        3: foo                                                      |
+        4: foo                                                      |
+        5: foo                                                      |
+        6: foo                                                      |
+        {1:-- More --}^                                                  |
+      ]])
+      feed('<Space>')
+      screen:expect([[
+        7: foo                                                      |
+        8: foo                                                      |
+        9: foo                                                      |
+        10: foo                                                     |
+        11: foo                                                     |
+        12: foo                                                     |
+        13: foo                                                     |
+        14: foo                                                     |
+        15: foo                                                     |
+        {1:-- More --}^                                                  |
+      ]])
+      feed('b')
+      screen:expect([[
+        Executing command: "'./shell-test' 'REP' '20' 'foo'"        |
+                                                                    |
+        0: foo                                                      |
+        1: foo                                                      |
+        2: foo                                                      |
+        3: foo                                                      |
+        4: foo                                                      |
+        5: foo                                                      |
+        6: foo                                                      |
+        {1:-- More --}^                                                  |
+      ]])
+    end)
+
     -- oldtest: Test_quit_long_message()
     it('with control characters can be quit vim-patch:8.2.1844', function()
-      screen:try_resize(40, 10)
+      screen = Screen.new(40, 10)
+      screen:set_default_attr_ids({
+        [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+        [1] = {bold = true, foreground = Screen.colors.SeaGreen},  -- MoreMsg
+        [2] = {foreground = Screen.colors.Blue},  -- SpecialKey
+      })
+      screen:attach()
+
       feed([[:echom range(9999)->join("\x01")<CR>]])
       screen:expect([[
-        0{3:^A}1{3:^A}2{3:^A}3{3:^A}4{3:^A}5{3:^A}6{3:^A}7{3:^A}8{3:^A}9{3:^A}10{3:^A}11{3:^A}12|
-        {3:^A}13{3:^A}14{3:^A}15{3:^A}16{3:^A}17{3:^A}18{3:^A}19{3:^A}20{3:^A}21{3:^A}22|
-        {3:^A}23{3:^A}24{3:^A}25{3:^A}26{3:^A}27{3:^A}28{3:^A}29{3:^A}30{3:^A}31{3:^A}32|
-        {3:^A}33{3:^A}34{3:^A}35{3:^A}36{3:^A}37{3:^A}38{3:^A}39{3:^A}40{3:^A}41{3:^A}42|
-        {3:^A}43{3:^A}44{3:^A}45{3:^A}46{3:^A}47{3:^A}48{3:^A}49{3:^A}50{3:^A}51{3:^A}52|
-        {3:^A}53{3:^A}54{3:^A}55{3:^A}56{3:^A}57{3:^A}58{3:^A}59{3:^A}60{3:^A}61{3:^A}62|
-        {3:^A}63{3:^A}64{3:^A}65{3:^A}66{3:^A}67{3:^A}68{3:^A}69{3:^A}70{3:^A}71{3:^A}72|
-        {3:^A}73{3:^A}74{3:^A}75{3:^A}76{3:^A}77{3:^A}78{3:^A}79{3:^A}80{3:^A}81{3:^A}82|
-        {3:^A}83{3:^A}84{3:^A}85{3:^A}86{3:^A}87{3:^A}88{3:^A}89{3:^A}90{3:^A}91{3:^A}92|
+        0{2:^A}1{2:^A}2{2:^A}3{2:^A}4{2:^A}5{2:^A}6{2:^A}7{2:^A}8{2:^A}9{2:^A}10{2:^A}11{2:^A}12|
+        {2:^A}13{2:^A}14{2:^A}15{2:^A}16{2:^A}17{2:^A}18{2:^A}19{2:^A}20{2:^A}21{2:^A}22|
+        {2:^A}23{2:^A}24{2:^A}25{2:^A}26{2:^A}27{2:^A}28{2:^A}29{2:^A}30{2:^A}31{2:^A}32|
+        {2:^A}33{2:^A}34{2:^A}35{2:^A}36{2:^A}37{2:^A}38{2:^A}39{2:^A}40{2:^A}41{2:^A}42|
+        {2:^A}43{2:^A}44{2:^A}45{2:^A}46{2:^A}47{2:^A}48{2:^A}49{2:^A}50{2:^A}51{2:^A}52|
+        {2:^A}53{2:^A}54{2:^A}55{2:^A}56{2:^A}57{2:^A}58{2:^A}59{2:^A}60{2:^A}61{2:^A}62|
+        {2:^A}63{2:^A}64{2:^A}65{2:^A}66{2:^A}67{2:^A}68{2:^A}69{2:^A}70{2:^A}71{2:^A}72|
+        {2:^A}73{2:^A}74{2:^A}75{2:^A}76{2:^A}77{2:^A}78{2:^A}79{2:^A}80{2:^A}81{2:^A}82|
+        {2:^A}83{2:^A}84{2:^A}85{2:^A}86{2:^A}87{2:^A}88{2:^A}89{2:^A}90{2:^A}91{2:^A}92|
         {1:-- More --}^                              |
       ]])
       feed('q')
-- 
cgit 


From c7d30c152d1639523d05154e245ea60ed9a51a2b Mon Sep 17 00:00:00 2001
From: smolck <46855713+smolck@users.noreply.github.com>
Date: Sat, 14 Aug 2021 12:19:05 -0500
Subject: fix(api): notify dict watchers on nvim_set_var and vim.g setter

Co-authored-by: bfredl <bjorn.linse@gmail.com>
Co-authored-by: Christian Clason <c.clason@uni-graz.at>
---
 .../functional/ex_cmds/dict_notifications_spec.lua | 63 ++++++++++++++++++++++
 1 file changed, 63 insertions(+)

(limited to 'test')

diff --git a/test/functional/ex_cmds/dict_notifications_spec.lua b/test/functional/ex_cmds/dict_notifications_spec.lua
index 21adcf37da..afa6b519d5 100644
--- a/test/functional/ex_cmds/dict_notifications_spec.lua
+++ b/test/functional/ex_cmds/dict_notifications_spec.lua
@@ -4,6 +4,7 @@ local clear, nvim, source = helpers.clear, helpers.nvim, helpers.source
 local insert = helpers.insert
 local eq, next_msg = helpers.eq, helpers.next_msg
 local exc_exec = helpers.exc_exec
+local exec_lua = helpers.exec_lua
 local command = helpers.command
 local eval = helpers.eval
 
@@ -21,6 +22,8 @@ describe('VimL dictionary notifications', function()
   -- t:) and a dictionary variable, so we generate them in the following
   -- function.
   local function gentests(dict_expr, dict_init)
+    local is_g = dict_expr == 'g:'
+
     local function update(opval, key)
       if not key then
         key = 'watched'
@@ -32,6 +35,28 @@ describe('VimL dictionary notifications', function()
       end
     end
 
+    local function update_with_api(opval, key)
+      if not key then
+        key = 'watched'
+      end
+      if opval == '' then
+        exec_lua(('vim.api.nvim_del_var(\'%s\')'):format(key))
+      else
+        exec_lua(('vim.api.nvim_set_var(\'%s\', %s)'):format(key, opval))
+      end
+    end
+
+    local function update_with_vim_g(opval, key)
+      if not key then
+        key = 'watched'
+      end
+      if opval == '' then
+        exec_lua(('vim.g.%s = nil'):format(key))
+      else
+        exec_lua(('vim.g.%s %s'):format(key, opval))
+      end
+    end
+
     local function verify_echo()
       -- helper to verify that no notifications are sent after certain change
       -- to a dict
@@ -76,6 +101,18 @@ describe('VimL dictionary notifications', function()
         update('', 'watched2')
         update('')
         verify_echo()
+        if is_g then
+          update_with_api('"test"')
+          update_with_api('"test2"', 'watched2')
+          update_with_api('', 'watched2')
+          update_with_api('')
+          verify_echo()
+          update_with_vim_g('= "test"')
+          update_with_vim_g('= "test2"', 'watched2')
+          update_with_vim_g('', 'watched2')
+          update_with_vim_g('')
+          verify_echo()
+        end
       end)
 
       it('is not triggered when unwatched keys are updated', function()
@@ -83,6 +120,16 @@ describe('VimL dictionary notifications', function()
         update('.= "noop2"', 'unwatched')
         update('', 'unwatched')
         verify_echo()
+        if is_g then
+          update_with_api('"noop"', 'unwatched')
+          update_with_api('vim.g.unwatched .. "noop2"', 'unwatched')
+          update_with_api('', 'unwatched')
+          verify_echo()
+          update_with_vim_g('= "noop"', 'unwatched')
+          update_with_vim_g('= vim.g.unwatched .. "noop2"', 'unwatched')
+          update_with_vim_g('', 'unwatched')
+          verify_echo()
+        end
       end)
 
       it('is triggered by remove()', function()
@@ -92,6 +139,22 @@ describe('VimL dictionary notifications', function()
         verify_value({old = 'test'})
       end)
 
+      if is_g then
+        it('is triggered by remove() when updated with nvim_*_var', function()
+          update_with_api('"test"')
+          verify_value({new = 'test'})
+          nvim('command', 'call remove('..dict_expr..', "watched")')
+          verify_value({old = 'test'})
+        end)
+
+        it('is triggered by remove() when updated with vim.g', function()
+          update_with_vim_g('= "test"')
+          verify_value({new = 'test'})
+          nvim('command', 'call remove('..dict_expr..', "watched")')
+          verify_value({old = 'test'})
+        end)
+      end
+
       it('is triggered by extend()', function()
         update('= "xtend"')
         verify_value({new = 'xtend'})
-- 
cgit 


From e6c214033a4fadf60faf99e95f8e9787e3c5e630 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 28 Sep 2022 06:22:11 +0800
Subject: fix(window): fix equalization with cmdheight=0 (#20369)

---
 test/functional/ui/cmdline_spec.lua | 57 +++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index d7f2b2335e..1528b5307d 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -1358,4 +1358,61 @@ describe('cmdheight=0', function()
       :echo^                    |
     ]])
   end)
+
+  it('window equalization with laststatus=0 #20367', function()
+    screen:try_resize(60, 9)
+    command('set cmdheight=0 laststatus=0')
+    command('vsplit')
+    screen:expect([[
+      ^                              │                             |
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+    ]])
+    feed(':')
+    command('split')
+    feed('<Esc>')
+    screen:expect([[
+      ^                              │                             |
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {2:[No Name]                     }│{1:~                            }|
+                                    │{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+    ]])
+    command('resize 2')
+    screen:expect([[
+      ^                              │                             |
+      {1:~                             }│{1:~                            }|
+      {2:[No Name]                     }│{1:~                            }|
+                                    │{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+    ]])
+    feed(':')
+    command('wincmd =')
+    feed('<Esc>')
+    screen:expect([[
+      ^                              │                             |
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {2:[No Name]                     }│{1:~                            }|
+                                    │{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+      {1:~                             }│{1:~                            }|
+    ]])
+  end)
 end)
-- 
cgit 


From 35e2c4a2edd28f72c48c70530c5486365c2502a4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 28 Sep 2022 18:27:59 +0800
Subject: fix(lua): fix architecture-dependent behavior in usercmd "reg"
 (#20384)

I don't think using an integer as a NUL-terminated string can work on
big-endian systems, at least.

This is also not tested. Add a test.

Also fix a mistake in the docs of nvim_parse_cmd.
---
 test/functional/api/command_spec.lua | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'test')

diff --git a/test/functional/api/command_spec.lua b/test/functional/api/command_spec.lua
index 44a19d8348..f19d7a362b 100644
--- a/test/functional/api/command_spec.lua
+++ b/test/functional/api/command_spec.lua
@@ -423,6 +423,7 @@ describe('nvim_create_user_command', function()
         nargs = 0,
         bang = true,
         count = 2,
+        register = true,
       })
     ]]
     eq({
@@ -460,6 +461,42 @@ describe('nvim_create_user_command', function()
       vim.cmd('CommandWithNoArgs')
       return result
     ]])
+    -- register can be specified
+    eq({
+      args = "",
+      fargs = {},
+      bang = false,
+      line1 = 1,
+      line2 = 1,
+      mods = "",
+      smods = {
+        browse = false,
+        confirm = false,
+        emsg_silent = false,
+        hide = false,
+        horizontal = false,
+        keepalt = false,
+        keepjumps = false,
+        keepmarks = false,
+        keeppatterns = false,
+        lockmarks = false,
+        noautocmd = false,
+        noswapfile = false,
+        sandbox = false,
+        silent = false,
+        split = "",
+        tab = -1,
+        unsilent = false,
+        verbose = -1,
+        vertical = false,
+      },
+      range = 0,
+      count = 2,
+      reg = "+",
+    }, exec_lua [[
+      vim.cmd('CommandWithNoArgs +')
+      return result
+    ]])
 
   end)
 
-- 
cgit 


From bafeb32b95c61b91220b3090e4293478a74ce31d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 28 Sep 2022 21:55:22 +0800
Subject: fix(spell): correct spell move behavior without "noplainbuffer"
 (#20386)

---
 test/functional/ui/spell_spec.lua | 94 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/spell_spec.lua b/test/functional/ui/spell_spec.lua
index de77100cc0..1aa73e7b13 100644
--- a/test/functional/ui/spell_spec.lua
+++ b/test/functional/ui/spell_spec.lua
@@ -19,6 +19,10 @@ describe("'spell'", function()
       [0] = {bold=true, foreground=Screen.colors.Blue},
       [1] = {special = Screen.colors.Red, undercurl = true},
       [2] = {special = Screen.colors.Blue1, undercurl = true},
+      [3] = {foreground = tonumber('0x6a0dad')},
+      [4] = {foreground = Screen.colors.Magenta},
+      [5] = {bold = true, foreground = Screen.colors.SeaGreen},
+      [6] = {foreground = Screen.colors.Red},
     })
   end)
 
@@ -68,4 +72,94 @@ describe("'spell'", function()
                                                                                     |
       ]])
   end)
+
+  it('"noplainbuffer" and syntax #20385', function()
+    command('set filetype=c')
+    command('syntax on')
+    command('set spell')
+    insert([[
+      #include <stdbool.h>
+      bool func(void);]])
+    screen:expect([[
+      {3:#include }{4:<stdbool.h>}                                                            |
+      {5:bool} func({5:void})^;                                                                |
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+                                                                                      |
+    ]])
+    feed('[s')
+    screen:expect([[
+      {3:#include }{4:<stdbool.h>}                                                            |
+      {5:bool} func({5:void})^;                                                                |
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {6:search hit TOP, continuing at BOTTOM}                                            |
+    ]])
+    -- "noplainbuffer" shouldn't change spellchecking behavior with syntax enabled
+    command('set spelloptions+=noplainbuffer')
+    screen:expect_unchanged()
+    feed(']s')
+    screen:expect([[
+      {3:#include }{4:<stdbool.h>}                                                            |
+      {5:bool} func({5:void})^;                                                                |
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {6:search hit BOTTOM, continuing at TOP}                                            |
+    ]])
+    -- no spellchecking with "noplainbuffer" and syntax disabled
+    command('syntax off')
+    screen:expect([[
+      #include <stdbool.h>                                                            |
+      bool func(void)^;                                                                |
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {6:search hit BOTTOM, continuing at TOP}                                            |
+    ]])
+    feed('[s')
+    screen:expect([[
+      #include <stdbool.h>                                                            |
+      bool func(void)^;                                                                |
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {6:search hit TOP, continuing at BOTTOM}                                            |
+    ]])
+    -- everything is spellchecked without "noplainbuffer" with syntax disabled
+    command('set spelloptions&')
+    screen:expect([[
+      #include <{1:stdbool}.h>                                                            |
+      {1:bool} {1:func}(void)^;                                                                |
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {6:search hit TOP, continuing at BOTTOM}                                            |
+    ]])
+    feed(']s')
+    screen:expect([[
+      #include <{1:^stdbool}.h>                                                            |
+      {1:bool} {1:func}(void);                                                                |
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {0:~                                                                               }|
+      {6:search hit BOTTOM, continuing at TOP}                                            |
+    ]])
+  end)
 end)
-- 
cgit 


From 16336c486ecb5a60e85a870904316308c7d7fc3f Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 25 Sep 2022 02:20:47 +0200
Subject: feat(gen_help_html.lua): adapt to new parser

- adapt to parser changes from https://github.com/vigoux/tree-sitter-vimdoc/pull/16
- numerous other generator improvements
---
 test/functional/core/startup_spec.lua     |  4 ++-
 test/functional/helpers.lua               | 13 +++++--
 test/functional/lua/help_spec.lua         | 31 +++++++----------
 test/functional/options/defaults_spec.lua | 58 ++++++++++++++++++-------------
 4 files changed, 60 insertions(+), 46 deletions(-)

(limited to 'test')

diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua
index 4f9df4010e..a32c801c97 100644
--- a/test/functional/core/startup_spec.lua
+++ b/test/functional/core/startup_spec.lua
@@ -354,7 +354,9 @@ describe('startup', function()
 
   local function pack_clear(cmd)
     -- add packages after config dir in rtp but before config/after
-    clear{args={'--cmd', 'set packpath=test/functional/fixtures', '--cmd', 'let paths=split(&rtp, ",")', '--cmd', 'let &rtp = paths[0]..",test/functional/fixtures,test/functional/fixtures/middle,"..join(paths[1:],",")', '--cmd', cmd}, env={XDG_CONFIG_HOME='test/functional/fixtures/'}}
+    clear{args={'--cmd', 'set packpath=test/functional/fixtures', '--cmd', 'let paths=split(&rtp, ",")', '--cmd', 'let &rtp = paths[0]..",test/functional/fixtures,test/functional/fixtures/middle,"..join(paths[1:],",")', '--cmd', cmd}, env={XDG_CONFIG_HOME='test/functional/fixtures/'},
+          args_rm={'runtimepath'},
+    }
   end
 
 
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index eff54b6d4a..3aec834bea 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -29,6 +29,7 @@ local module = {
 }
 
 local start_dir = lfs.currentdir()
+local runtime_set = 'set runtimepath^=./build/lib/nvim/'
 module.nvim_prog = (
   os.getenv('NVIM_PRG')
   or global_helpers.test_build_dir .. '/bin/nvim'
@@ -40,6 +41,8 @@ module.nvim_set = (
   ..' belloff= wildoptions-=pum joinspaces noshowcmd noruler nomore redrawdebug=invalid')
 module.nvim_argv = {
   module.nvim_prog, '-u', 'NONE', '-i', 'NONE',
+  -- XXX: find treesitter parsers.
+  '--cmd', runtime_set,
   '--cmd', module.nvim_set,
   '--cmd', 'mapclear',
   '--cmd', 'mapclear!',
@@ -345,14 +348,17 @@ end
 
 --  Removes Nvim startup args from `args` matching items in `args_rm`.
 --
---  "-u", "-i", "--cmd" are treated specially: their "values" are also removed.
+--  - Special case: "-u", "-i", "--cmd" are treated specially: their "values" are also removed.
+--  - Special case: "runtimepath" will remove only { '--cmd', 'set runtimepath^=…', }
+--
 --  Example:
 --      args={'--headless', '-u', 'NONE'}
 --      args_rm={'--cmd', '-u'}
 --  Result:
 --      {'--headless'}
 --
---  All cases are removed.
+--  All matching cases are removed.
+--
 --  Example:
 --      args={'--cmd', 'foo', '-N', '--cmd', 'bar'}
 --      args_rm={'--cmd', '-u'}
@@ -373,6 +379,9 @@ local function remove_args(args, args_rm)
       last = ''
     elseif tbl_contains(args_rm, arg) then
       last = arg
+    elseif arg == runtime_set and tbl_contains(args_rm, 'runtimepath') then
+      table.remove(new_args)  -- Remove the preceding "--cmd".
+      last = ''
     else
       table.insert(new_args, arg)
     end
diff --git a/test/functional/lua/help_spec.lua b/test/functional/lua/help_spec.lua
index 266f261ab9..2ddabc15ae 100644
--- a/test/functional/lua/help_spec.lua
+++ b/test/functional/lua/help_spec.lua
@@ -12,29 +12,26 @@ describe(':help docs', function()
   before_each(clear)
   it('validate', function()
     -- If this test fails, try these steps (in order):
-    -- 1. Try to fix/cleanup the :help docs, especially Nvim-owned :help docs.
-    -- 2. Try to fix the parser: https://github.com/vigoux/tree-sitter-vimdoc
+    -- 1. Fix/cleanup the :help docs.
+    -- 2. Fix the parser: https://github.com/neovim/tree-sitter-vimdoc
     -- 3. File a parser bug, and adjust the tolerance of this test in the meantime.
 
     local rv = exec_lua([[return require('scripts.gen_help_html').validate('./build/runtime/doc')]])
+    -- Check that we actually found helpfiles.
+    ok(rv.helpfiles > 100, '>100 :help files', rv.helpfiles)
     -- Check that parse errors did not increase wildly.
-    -- TODO: yes, there are currently 24k+ parser errors.
-    --       WIP: https://github.com/vigoux/tree-sitter-vimdoc/pull/16
-    ok(rv.err_count < 24000, '<24000', rv.err_count)
-    -- TODO: should be eq(0, …)
-    ok(exec_lua('return vim.tbl_count(...)', rv.invalid_tags) < 538, '<538',
-      exec_lua('return vim.inspect(...)', rv.invalid_tags))
+    -- TODO: Fix all parse errors in :help files.
+    ok(rv.err_count < 1300, '<1300 parse errors', rv.err_count)
+    eq({}, rv.invalid_links, exec_lua([[return 'found invalid :help tag links:\n'..vim.inspect(...)]], rv.invalid_links))
   end)
 
   it('gen_help_html.lua generates HTML', function()
-    -- Test:
-    -- 1. Check that parse errors did not increase wildly. Because we explicitly test only a few
-    --    :help files, we can be more precise about the tolerances here.
-    -- 2. exercise gen_help_html.lua, check that it actually works.
-    -- 3. check that its tree-sitter-vimdoc dependency is working.
+    -- 1. Test that gen_help_html.lua actually works.
+    -- 2. Test that parse errors did not increase wildly. Because we explicitly test only a few
+    --    :help files, we can be precise about the tolerances here.
 
     local tmpdir = exec_lua('return vim.fs.dirname(vim.fn.tempname())')
-    -- Because gen() is slow (1 min), this test is limited to a few files.
+    -- Because gen() is slow (~30s), this test is limited to a few files.
     local rv = exec_lua([[
       local to_dir = ...
       return require('scripts.gen_help_html').gen(
@@ -46,9 +43,7 @@ describe(':help docs', function()
       tmpdir
     )
     eq(4, #rv.helpfiles)
-    ok(rv.err_count < 700, '<700', rv.err_count)
-    -- TODO: should be eq(0, …)
-    ok(exec_lua('return vim.tbl_count(...)', rv.invalid_tags) <= 32, '<=32',
-      exec_lua('return vim.inspect(...)', rv.invalid_tags))
+    ok(rv.err_count < 16, '<16 parse errors', rv.err_count)
+    eq({}, rv.invalid_links, exec_lua([[return 'found invalid :help tag links:\n'..vim.inspect(...)]], rv.invalid_links))
   end)
 end)
diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index 4e2f2ab63e..130ed73c34 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -220,7 +220,9 @@ describe('startup defaults', function()
   end)
 
   it("'packpath'", function()
-    clear()
+    clear{
+      args_rm={'runtimepath'},
+    }
     -- Defaults to &runtimepath.
     eq(meths.get_option('runtimepath'), meths.get_option('packpath'))
 
@@ -332,17 +334,19 @@ describe('XDG defaults', function()
 
   describe('with too long XDG variables', function()
     before_each(function()
-      clear({env={
-        XDG_CONFIG_HOME=(root_path .. ('/x'):rep(4096)),
-        XDG_CONFIG_DIRS=(root_path .. ('/a'):rep(2048)
-                         .. env_sep.. root_path .. ('/b'):rep(2048)
-                         .. (env_sep .. root_path .. '/c'):rep(512)),
-        XDG_DATA_HOME=(root_path .. ('/X'):rep(4096)),
-        XDG_RUNTIME_DIR=(root_path .. ('/X'):rep(4096)),
-        XDG_STATE_HOME=(root_path .. ('/X'):rep(4096)),
-        XDG_DATA_DIRS=(root_path .. ('/A'):rep(2048)
-                       .. env_sep .. root_path .. ('/B'):rep(2048)
-                       .. (env_sep .. root_path .. '/C'):rep(512)),
+      clear({
+        args_rm={'runtimepath'},
+        env={
+          XDG_CONFIG_HOME=(root_path .. ('/x'):rep(4096)),
+          XDG_CONFIG_DIRS=(root_path .. ('/a'):rep(2048)
+                           .. env_sep.. root_path .. ('/b'):rep(2048)
+                           .. (env_sep .. root_path .. '/c'):rep(512)),
+          XDG_DATA_HOME=(root_path .. ('/X'):rep(4096)),
+          XDG_RUNTIME_DIR=(root_path .. ('/X'):rep(4096)),
+          XDG_STATE_HOME=(root_path .. ('/X'):rep(4096)),
+          XDG_DATA_DIRS=(root_path .. ('/A'):rep(2048)
+                         .. env_sep .. root_path .. ('/B'):rep(2048)
+                         .. (env_sep .. root_path .. '/C'):rep(512)),
       }})
     end)
 
@@ -405,13 +409,15 @@ describe('XDG defaults', function()
 
   describe('with XDG variables that can be expanded', function()
     before_each(function()
-      clear({env={
-        XDG_CONFIG_HOME='$XDG_DATA_HOME',
-        XDG_CONFIG_DIRS='$XDG_DATA_DIRS',
-        XDG_DATA_HOME='$XDG_CONFIG_HOME',
-        XDG_RUNTIME_DIR='$XDG_RUNTIME_DIR',
-        XDG_STATE_HOME='$XDG_CONFIG_HOME',
-        XDG_DATA_DIRS='$XDG_CONFIG_DIRS',
+      clear({
+        args_rm={'runtimepath'},
+        env={
+          XDG_CONFIG_HOME='$XDG_DATA_HOME',
+          XDG_CONFIG_DIRS='$XDG_DATA_DIRS',
+          XDG_DATA_HOME='$XDG_CONFIG_HOME',
+          XDG_RUNTIME_DIR='$XDG_RUNTIME_DIR',
+          XDG_STATE_HOME='$XDG_CONFIG_HOME',
+          XDG_DATA_DIRS='$XDG_CONFIG_DIRS',
       }})
     end)
 
@@ -478,12 +484,14 @@ describe('XDG defaults', function()
 
   describe('with commas', function()
     before_each(function()
-      clear({env={
-        XDG_CONFIG_HOME=', , ,',
-        XDG_CONFIG_DIRS=',-,-,' .. env_sep .. '-,-,-',
-        XDG_DATA_HOME=',=,=,',
-        XDG_STATE_HOME=',=,=,',
-        XDG_DATA_DIRS=',≡,≡,' .. env_sep .. '≡,≡,≡',
+      clear({
+        args_rm={'runtimepath'},
+        env={
+          XDG_CONFIG_HOME=', , ,',
+          XDG_CONFIG_DIRS=',-,-,' .. env_sep .. '-,-,-',
+          XDG_DATA_HOME=',=,=,',
+          XDG_STATE_HOME=',=,=,',
+          XDG_DATA_DIRS=',≡,≡,' .. env_sep .. '≡,≡,≡',
       }})
     end)
 
-- 
cgit 


From a80ab395aa7beedf8f39870d331b4b32cc6e5d2d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 29 Sep 2022 08:56:00 +0800
Subject: test: add a Lua test for #17501 (#20392)

---
 test/functional/lua/vim_spec.lua | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index 3184f01ef4..294ff5d3ca 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -1390,11 +1390,23 @@ describe('lua stdlib', function()
   end)
 
   it('vim.env', function()
-    exec_lua [[
-    vim.fn.setenv("A", 123)
-    ]]
-    eq('123', funcs.luaeval "vim.env.A")
-    eq(true, funcs.luaeval "vim.env.B == nil")
+    exec_lua([[vim.fn.setenv('A', 123)]])
+    eq('123', funcs.luaeval('vim.env.A'))
+    exec_lua([[vim.env.A = 456]])
+    eq('456', funcs.luaeval('vim.env.A'))
+    exec_lua([[vim.env.A = nil]])
+    eq(NIL, funcs.luaeval('vim.env.A'))
+
+    eq(true, funcs.luaeval('vim.env.B == nil'))
+
+    command([[let $HOME = 'foo']])
+    eq('foo', funcs.expand('~'))
+    eq('foo', funcs.luaeval('vim.env.HOME'))
+    exec_lua([[vim.env.HOME = nil]])
+    eq('foo', funcs.expand('~'))
+    exec_lua([[vim.env.HOME = 'bar']])
+    eq('bar', funcs.expand('~'))
+    eq('bar', funcs.luaeval('vim.env.HOME'))
   end)
 
   it('vim.v', function()
-- 
cgit 


From 1cf44d6f5794c7b6bd181dfb2ce51f5ff4381ee8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 29 Sep 2022 15:48:39 +0800
Subject: fix(column): move sign sentinel after inserting/deleting lines
 (#20400)

---
 test/functional/ui/sign_spec.lua | 85 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/sign_spec.lua b/test/functional/ui/sign_spec.lua
index dbc92ca222..ff3e143126 100644
--- a/test/functional/ui/sign_spec.lua
+++ b/test/functional/ui/sign_spec.lua
@@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, command = helpers.clear, helpers.feed, helpers.command
 local source = helpers.source
+local meths = helpers.meths
 
 describe('Signs', function()
   local screen
@@ -592,4 +593,88 @@ describe('Signs', function()
       ]])
     end)
   end)
+
+  it('signcolumn width is updated when removing all signs after deleting lines', function()
+    meths.buf_set_lines(0, 0, 1, true, {'a', 'b', 'c', 'd', 'e'})
+    command('sign define piet text=>>')
+    command('sign place 10001 line=1 name=piet')
+    command('sign place 10002 line=5 name=piet')
+    command('2delete')
+    command('sign unplace 10001')
+    screen:expect([[
+      {2:  }a                                                  |
+      {2:  }^c                                                  |
+      {2:  }d                                                  |
+      >>e                                                  |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+                                                           |
+    ]])
+    command('sign unplace 10002')
+    screen:expect([[
+      a                                                    |
+      ^c                                                    |
+      d                                                    |
+      e                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+                                                           |
+    ]])
+  end)
+
+  it('signcolumn width is updated when removing all signs after inserting lines', function()
+    meths.buf_set_lines(0, 0, 1, true, {'a', 'b', 'c', 'd', 'e'})
+    command('sign define piet text=>>')
+    command('sign place 10001 line=1 name=piet')
+    command('sign place 10002 line=5 name=piet')
+    command('copy .')
+    command('sign unplace 10001')
+    screen:expect([[
+      {2:  }a                                                  |
+      {2:  }^a                                                  |
+      {2:  }b                                                  |
+      {2:  }c                                                  |
+      {2:  }d                                                  |
+      >>e                                                  |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+                                                           |
+    ]])
+    command('sign unplace 10002')
+    screen:expect([[
+      a                                                    |
+      ^a                                                    |
+      b                                                    |
+      c                                                    |
+      d                                                    |
+      e                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+                                                           |
+    ]])
+  end)
 end)
-- 
cgit 


From 45707c1eae62667e5c482a09f6d9a62e01db0e21 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 29 Sep 2022 16:04:14 +0800
Subject: fix(api): fix nvim_cmd crash with filename expansion (#20397)

---
 test/functional/api/vim_spec.lua | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 44775ef85c..c2f3a5ec5e 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -14,6 +14,7 @@ local funcs = helpers.funcs
 local iswin = helpers.iswin
 local meths = helpers.meths
 local matches = helpers.matches
+local pesc = helpers.pesc
 local mkdir_p = helpers.mkdir_p
 local ok, nvim_async, feed = helpers.ok, helpers.nvim_async, helpers.feed
 local is_os = helpers.is_os
@@ -3912,11 +3913,23 @@ describe('API', function()
       eq({'aa'}, meths.buf_get_lines(0, 0, 1, false))
       assert_alive()
     end)
+    it('supports filename expansion', function()
+      meths.cmd({ cmd = 'argadd', args = { '%:p:h:t', '%:p:h:t' } }, {})
+      local arg = funcs.expand('%:p:h:t')
+      eq({ arg, arg }, funcs.argv())
+    end)
     it("'make' command works when argument count isn't 1 #19696", function()
       command('set makeprg=echo')
-      meths.cmd({ cmd = 'make' }, {})
+      command('set shellquote=')
+      matches('^:!echo ',
+              meths.cmd({ cmd = 'make' }, { output = true }))
+      assert_alive()
+      matches('^:!echo foo bar',
+              meths.cmd({ cmd = 'make', args = { 'foo', 'bar' } }, { output = true }))
       assert_alive()
-      meths.cmd({ cmd = 'make', args = { 'foo', 'bar' } }, {})
+      local arg_pesc = pesc(funcs.expand('%:p:h:t'))
+      matches(('^:!echo %s %s'):format(arg_pesc, arg_pesc),
+              meths.cmd({ cmd = 'make', args = { '%:p:h:t', '%:p:h:t' } }, { output = true }))
       assert_alive()
     end)
     it('doesn\'t display messages when output=true', function()
-- 
cgit 


From 563bc39aac10185a03e74faa8f992ce2d10f68e8 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 29 Sep 2022 12:08:49 +0200
Subject: feat(docs): fixes for :help HTML generator

Generate correct leading whitespace for argument, taglink, tag, etc.
---
 test/functional/lua/help_spec.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/lua/help_spec.lua b/test/functional/lua/help_spec.lua
index 2ddabc15ae..a00aaea9d2 100644
--- a/test/functional/lua/help_spec.lua
+++ b/test/functional/lua/help_spec.lua
@@ -21,7 +21,7 @@ describe(':help docs', function()
     ok(rv.helpfiles > 100, '>100 :help files', rv.helpfiles)
     -- Check that parse errors did not increase wildly.
     -- TODO: Fix all parse errors in :help files.
-    ok(rv.err_count < 1300, '<1300 parse errors', rv.err_count)
+    ok(rv.err_count < 250, '<250 parse errors', rv.err_count)
     eq({}, rv.invalid_links, exec_lua([[return 'found invalid :help tag links:\n'..vim.inspect(...)]], rv.invalid_links))
   end)
 
@@ -43,7 +43,7 @@ describe(':help docs', function()
       tmpdir
     )
     eq(4, #rv.helpfiles)
-    ok(rv.err_count < 16, '<16 parse errors', rv.err_count)
+    ok(rv.err_count <= 6, '<=6 parse errors', rv.err_count)
     eq({}, rv.invalid_links, exec_lua([[return 'found invalid :help tag links:\n'..vim.inspect(...)]], rv.invalid_links))
   end)
 end)
-- 
cgit 


From e46eef75ac2c3336928269e28a1fa138f7327207 Mon Sep 17 00:00:00 2001
From: Famiu Haque <famiuhaque@protonmail.com>
Date: Wed, 28 Sep 2022 17:43:18 +0600
Subject: feat(nvim_cmd): allow using first argument as count

Allows `nvim_cmd` to use the first argument as count for applicable
commands. Also adds support for non-String arguments to `nvim_cmd`.
---
 test/functional/api/vim_spec.lua | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'test')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index c2f3a5ec5e..ca1c5070a6 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -1,6 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local lfs = require('lfs')
+local luv = require('luv')
 
 local fmt = string.format
 local assert_alive = helpers.assert_alive
@@ -3962,5 +3963,23 @@ describe('API', function()
         15                                      |
       ]]}
     end)
+    it('works with non-String args', function()
+      eq('2', meths.cmd({cmd = 'echo', args = {2}}, {output = true}))
+      eq('1', meths.cmd({cmd = 'echo', args = {true}}, {output = true}))
+    end)
+    describe('first argument as count', function()
+      before_each(clear)
+
+      it('works', function()
+        command('vsplit | enew')
+        meths.cmd({cmd = 'bdelete', args = {meths.get_current_buf()}}, {})
+        eq(1, meths.get_current_buf().id)
+      end)
+      it('works with :sleep using milliseconds', function()
+        local start = luv.now()
+        meths.cmd({cmd = 'sleep', args = {'100m'}}, {})
+        ok(luv.now() - start <= 300)
+      end)
+    end)
   end)
 end)
-- 
cgit 


From cb62592bcb03d7934416cf46bede3b8296254c87 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 27 Sep 2022 14:40:10 +0800
Subject: fix(api)!: nvim_parse_cmd omit "count" "range" "reg" if not supported

---
 test/functional/api/vim_spec.lua | 66 ++++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 22 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index c2f3a5ec5e..703a5fb9e0 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -3177,9 +3177,6 @@ describe('API', function()
         cmd = 'echo',
         args = { 'foo' },
         bang = false,
-        range = {},
-        count = -1,
-        reg = '',
         addr = 'none',
         magic = {
             file = false,
@@ -3220,8 +3217,6 @@ describe('API', function()
         args = { '/math.random/math.max/' },
         bang = false,
         range = { 4, 6 },
-        count = -1,
-        reg = '',
         addr = 'line',
         magic = {
             file = false,
@@ -3263,7 +3258,6 @@ describe('API', function()
         bang = false,
         range = { 1 },
         count = 1,
-        reg = '',
         addr = 'buf',
         magic = {
             file = false,
@@ -3304,7 +3298,6 @@ describe('API', function()
         args = {},
         bang = false,
         range = {},
-        count = -1,
         reg = '+',
         addr = 'line',
         magic = {
@@ -3339,6 +3332,45 @@ describe('API', function()
           vertical = false,
         }
       }, meths.parse_cmd('put +', {}))
+      eq({
+        cmd = 'put',
+        args = {},
+        bang = false,
+        range = {},
+        reg = '',
+        addr = 'line',
+        magic = {
+            file = false,
+            bar = true
+        },
+        nargs = '0',
+        nextcmd = '',
+        mods = {
+          browse = false,
+          confirm = false,
+          emsg_silent = false,
+          filter = {
+              pattern = "",
+              force = false
+          },
+          hide = false,
+          horizontal = false,
+          keepalt = false,
+          keepjumps = false,
+          keepmarks = false,
+          keeppatterns = false,
+          lockmarks = false,
+          noautocmd = false,
+          noswapfile = false,
+          sandbox = false,
+          silent = false,
+          split = "",
+          tab = -1,
+          unsilent = false,
+          verbose = -1,
+          vertical = false,
+        }
+      }, meths.parse_cmd('put', {}))
     end)
     it('works with range, count and register', function()
       eq({
@@ -3388,8 +3420,6 @@ describe('API', function()
         args = {},
         bang = true,
         range = {},
-        count = -1,
-        reg = '',
         addr = 'line',
         magic = {
             file = true,
@@ -3430,8 +3460,6 @@ describe('API', function()
         args = { 'foo.txt' },
         bang = false,
         range = {},
-        count = -1,
-        reg = '',
         addr = '?',
         magic = {
             file = true,
@@ -3470,8 +3498,6 @@ describe('API', function()
         args = { 'foo.txt' },
         bang = false,
         range = {},
-        count = -1,
-        reg = '',
         addr = '?',
         magic = {
             file = true,
@@ -3513,8 +3539,6 @@ describe('API', function()
         args = { 'test', 'it' },
         bang = true,
         range = { 4, 6 },
-        count = -1,
-        reg = '',
         addr = 'line',
         magic = {
             file = false,
@@ -3555,8 +3579,6 @@ describe('API', function()
         args = { 'a.txt' },
         bang = false,
         range = {},
-        count = -1,
-        reg = '',
         addr = 'arg',
         magic = {
             file = true,
@@ -3597,9 +3619,6 @@ describe('API', function()
         cmd = 'MyCommand',
         args = { 'test it' },
         bang = false,
-        range = {},
-        count = -1,
-        reg = '',
         addr = 'none',
         magic = {
             file = false,
@@ -3691,8 +3710,6 @@ describe('API', function()
         args = {'x'},
         bang = true,
         range = {3, 4},
-        count = -1,
-        reg = '',
         addr = 'line',
         magic = {
           file = false,
@@ -3730,6 +3747,11 @@ describe('API', function()
       eq('', funcs.getreg('/'))
       eq('', funcs.histget('search'))
     end)
+    it('result can be used directly by nvim_cmd #20051', function()
+      eq("foo", meths.cmd(meths.parse_cmd('echo "foo"', {}), { output = true }))
+      meths.cmd(meths.parse_cmd("set cursorline", {}), {})
+      eq(true, meths.get_option_value("cursorline", {}))
+    end)
   end)
   describe('nvim_cmd', function()
     it('works', function ()
-- 
cgit 


From df646572c53f55268a5dbb61628d7c3b302d5663 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Fri, 30 Sep 2022 09:53:52 +0200
Subject: docs: fix typos (#20394)

Co-authored-by: Raphael <glephunter@gmail.com>
Co-authored-by: smjonas <jonas.strittmatter@gmx.de>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
---
 test/functional/api/extmark_spec.lua               | 22 +++++++++++-----------
 test/functional/api/keymap_spec.lua                |  2 +-
 test/functional/ex_cmds/quit_spec.lua              |  2 +-
 test/functional/legacy/030_fileformats_spec.lua    |  2 +-
 .../legacy/055_list_and_dict_types_spec.lua        |  2 +-
 test/functional/legacy/072_undo_file_spec.lua      |  2 +-
 .../083_tag_search_with_file_encoding_spec.lua     |  2 +-
 test/functional/legacy/autocmd_option_spec.lua     |  6 +++---
 test/functional/lua/api_spec.lua                   |  2 +-
 test/functional/lua/buffer_updates_spec.lua        |  2 +-
 test/functional/lua/uri_spec.lua                   | 14 +++++++-------
 test/functional/lua/vim_spec.lua                   |  2 +-
 test/functional/options/keymap_spec.lua            |  2 +-
 test/functional/provider/clipboard_spec.lua        | 12 ++++++------
 test/functional/ui/bufhl_spec.lua                  |  2 +-
 test/functional/ui/float_spec.lua                  |  4 ++--
 test/functional/ui/inccommand_user_spec.lua        |  2 +-
 test/functional/ui/options_spec.lua                |  2 +-
 test/functional/ui/screen.lua                      |  6 +++---
 .../vimscript/container_functions_spec.lua         |  2 +-
 test/functional/vimscript/json_functions_spec.lua  |  2 +-
 21 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/extmark_spec.lua b/test/functional/api/extmark_spec.lua
index bc8d811c6d..00f5b25b8a 100644
--- a/test/functional/api/extmark_spec.lua
+++ b/test/functional/api/extmark_spec.lua
@@ -1046,7 +1046,7 @@ describe('API/extmarks', function()
     check_undo_redo(ns, marks[3], 0, 4, 0, 8)
   end)
 
-  it('substitions over multiple lines with newline in pattern', function()
+  it('substitutes over multiple lines with newline in pattern', function()
     feed('A<cr>67890<cr>xx<esc>')
     set_extmark(ns, marks[1], 0, 3)
     set_extmark(ns, marks[2], 0, 4)
@@ -1078,7 +1078,7 @@ describe('API/extmarks', function()
     check_undo_redo(ns, marks[6], 1, 2, 0, 5)
   end)
 
-  it('substitions with multiple newlines in pattern', function()
+  it('substitutes with multiple newlines in pattern', function()
     feed('A<cr>67890<cr>xx<esc>')
     set_extmark(ns, marks[1], 0, 4)
     set_extmark(ns, marks[2], 0, 5)
@@ -1093,7 +1093,7 @@ describe('API/extmarks', function()
     check_undo_redo(ns, marks[5], 2, 0, 0, 6)
   end)
 
-  it('substitions over multiple lines with replace in substition', function()
+  it('substitutes over multiple lines with replace in substitution', function()
     feed('A<cr>67890<cr>xx<esc>')
     set_extmark(ns, marks[1], 0, 1)
     set_extmark(ns, marks[2], 0, 2)
@@ -1111,7 +1111,7 @@ describe('API/extmarks', function()
     eq({1, 3}, get_extmark_by_id(ns, marks[3]))
   end)
 
-  it('substitions over multiple lines with replace in substition', function()
+  it('substitutes over multiple lines with replace in substitution', function()
     feed('A<cr>x3<cr>xx<esc>')
     set_extmark(ns, marks[1], 1, 0)
     set_extmark(ns, marks[2], 1, 1)
@@ -1122,7 +1122,7 @@ describe('API/extmarks', function()
     check_undo_redo(ns, marks[3], 1, 2, 2, 0)
   end)
 
-  it('substitions over multiple lines with replace in substition', function()
+  it('substitutes over multiple lines with replace in substitution', function()
     feed('A<cr>x3<cr>xx<esc>')
     set_extmark(ns, marks[1], 0, 1)
     set_extmark(ns, marks[2], 0, 2)
@@ -1140,7 +1140,7 @@ describe('API/extmarks', function()
     check_undo_redo(ns, marks[3], 0, 4, 1, 3)
   end)
 
-  it('substitions with newline in match and sub, delta is 0', function()
+  it('substitutes with newline in match and sub, delta is 0', function()
     feed('A<cr>67890<cr>xx<esc>')
     set_extmark(ns, marks[1], 0, 3)
     set_extmark(ns, marks[2], 0, 4)
@@ -1157,7 +1157,7 @@ describe('API/extmarks', function()
     check_undo_redo(ns, marks[6], 2, 0, 2, 0)
   end)
 
-  it('substitions with newline in match and sub, delta > 0', function()
+  it('substitutes with newline in match and sub, delta > 0', function()
     feed('A<cr>67890<cr>xx<esc>')
     set_extmark(ns, marks[1], 0, 3)
     set_extmark(ns, marks[2], 0, 4)
@@ -1174,7 +1174,7 @@ describe('API/extmarks', function()
     check_undo_redo(ns, marks[6], 2, 0, 3, 0)
   end)
 
-  it('substitions with newline in match and sub, delta < 0', function()
+  it('substitutes with newline in match and sub, delta < 0', function()
     feed('A<cr>67890<cr>xx<cr>xx<esc>')
     set_extmark(ns, marks[1], 0, 3)
     set_extmark(ns, marks[2], 0, 4)
@@ -1193,7 +1193,7 @@ describe('API/extmarks', function()
     check_undo_redo(ns, marks[7], 3, 0, 2, 0)
   end)
 
-  it('substitions with backrefs, newline inserted into sub', function()
+  it('substitutes with backrefs, newline inserted into sub', function()
     feed('A<cr>67890<cr>xx<cr>xx<esc>')
     set_extmark(ns, marks[1], 0, 3)
     set_extmark(ns, marks[2], 0, 4)
@@ -1210,7 +1210,7 @@ describe('API/extmarks', function()
     check_undo_redo(ns, marks[6], 2, 0, 3, 0)
   end)
 
-  it('substitions a ^', function()
+  it('substitutes a ^', function()
     set_extmark(ns, marks[1], 0, 0)
     set_extmark(ns, marks[2], 0, 1)
     feed([[:s:^:x<cr>]])
@@ -1397,7 +1397,7 @@ describe('API/extmarks', function()
     eq({{id, 1, 0}}, bufmeths.get_extmarks(buf, ns, 0, -1, {}))
   end)
 
-  it('does not crash with append/delete/undo seqence', function()
+  it('does not crash with append/delete/undo sequence', function()
     meths.exec([[
       let ns = nvim_create_namespace('myplugin')
       call nvim_buf_set_extmark(0, ns, 0, 0, {})
diff --git a/test/functional/api/keymap_spec.lua b/test/functional/api/keymap_spec.lua
index fedcbfa76a..30c351b26a 100644
--- a/test/functional/api/keymap_spec.lua
+++ b/test/functional/api/keymap_spec.lua
@@ -885,7 +885,7 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     eq({'<space>'}, meths.buf_get_lines(0, 0, -1, false))
   end)
 
-  it('lua expr mapping returning nil is equivalent to returnig an empty string', function()
+  it('lua expr mapping returning nil is equivalent to returning an empty string', function()
     exec_lua [[
       vim.api.nvim_set_keymap ('i', 'aa', '', {callback = function() return nil end, expr = true })
     ]]
diff --git a/test/functional/ex_cmds/quit_spec.lua b/test/functional/ex_cmds/quit_spec.lua
index fe138a24c8..3680801dae 100644
--- a/test/functional/ex_cmds/quit_spec.lua
+++ b/test/functional/ex_cmds/quit_spec.lua
@@ -7,7 +7,7 @@ describe(':qa', function()
   end)
 
   it('verify #3334', function()
-    -- just testing if 'qa' passed as a program argument wont result in memory
+    -- just testing if 'qa' passed as a program argument won't result in memory
     -- errors
   end)
 end)
diff --git a/test/functional/legacy/030_fileformats_spec.lua b/test/functional/legacy/030_fileformats_spec.lua
index 15dbd05cf5..e88afd9c47 100644
--- a/test/functional/legacy/030_fileformats_spec.lua
+++ b/test/functional/legacy/030_fileformats_spec.lua
@@ -255,7 +255,7 @@ describe('fileformats option', function()
 
     -- Assert buffer contents.  This has to be done manually as
     -- helpers.expect() calls helpers.dedent() which messes up the white space
-    -- and carrige returns.
+    -- and carriage returns.
     eq(
       'unix\n'..
       'unix\n'..
diff --git a/test/functional/legacy/055_list_and_dict_types_spec.lua b/test/functional/legacy/055_list_and_dict_types_spec.lua
index 4d71a526c1..c0ff3ed17a 100644
--- a/test/functional/legacy/055_list_and_dict_types_spec.lua
+++ b/test/functional/legacy/055_list_and_dict_types_spec.lua
@@ -907,7 +907,7 @@ describe('list and dictionary types', function()
     feed('o<C-R>=a<CR><esc>')
     feed_command('lang C')
     feed_command('redir => a')
-    -- The test failes if this is not in one line.
+    -- The test fails if this is not in one line.
     feed_command("try|foobar|catch|let a = matchstr(v:exception,'^[^ ]*')|endtry")
     feed_command('redir END')
     feed('o<C-R>=a<CR><esc>')
diff --git a/test/functional/legacy/072_undo_file_spec.lua b/test/functional/legacy/072_undo_file_spec.lua
index b4927e779e..80665027c3 100644
--- a/test/functional/legacy/072_undo_file_spec.lua
+++ b/test/functional/legacy/072_undo_file_spec.lua
@@ -69,7 +69,7 @@ describe('72', function()
     feed_command('set undofile ul=100')
     feed('uuuuuu:w >>test.out<cr>')
 
-    ---- Open the output to see if it meets the expections
+    ---- Open the output to see if it meets the expectations
     feed_command('e! test.out')
 
     -- Assert buffer contents.
diff --git a/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua b/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua
index e94b46ca66..54620c7104 100644
--- a/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua
+++ b/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua
@@ -26,7 +26,7 @@ describe('tag search with !_TAG_FILE_ENCODING', function()
       '!_TAG_FILE_ENCODING	cp932	//\n' ..
       '\130`\130a\130b	Xtags2.txt	/\130`\130a\130b\n'
       )
-    -- The last file is very long but repetetive and can be generated on the
+    -- The last file is very long but repetitive and can be generated on the
     -- fly.
     local text = helpers.dedent([[
       !_TAG_FILE_SORTED	1	//
diff --git a/test/functional/legacy/autocmd_option_spec.lua b/test/functional/legacy/autocmd_option_spec.lua
index 5e586d3a6a..e00b468c16 100644
--- a/test/functional/legacy/autocmd_option_spec.lua
+++ b/test/functional/legacy/autocmd_option_spec.lua
@@ -211,7 +211,7 @@ describe('au OptionSet', function()
         expected_combination({'backup', 0, 0, '', 1, 'local', 'setlocal'})
       end)
 
-      it('should trigger if the current buffer is different from the targetted buffer', function()
+      it('should trigger if the current buffer is different from the targeted buffer', function()
         local new_buffer = make_buffer()
         local new_bufnr = buf.get_number(new_buffer)
 
@@ -590,7 +590,7 @@ describe('au OptionSet', function()
         expected_combination({'backup', 0, 0, '', 1, 'local', 'setlocal'})
       end)
 
-      it('should trigger if the current buffer is different from the targetted buffer', function()
+      it('should trigger if the current buffer is different from the targeted buffer', function()
         set_hook('buftype')
 
         local new_buffer = make_buffer()
@@ -616,7 +616,7 @@ describe('au OptionSet', function()
         expected_combination({'backup', 0, 0, '', 1, 'local', 'setlocal'})
       end)
 
-      it('should not trigger if the current window is different from the targetted window', function()
+      it('should not trigger if the current window is different from the targeted window', function()
         set_hook('cursorcolumn')
 
         local new_winnr = get_new_window_number()
diff --git a/test/functional/lua/api_spec.lua b/test/functional/lua/api_spec.lua
index f173a15d32..03832978a4 100644
--- a/test/functional/lua/api_spec.lua
+++ b/test/functional/lua/api_spec.lua
@@ -166,7 +166,7 @@ describe('luaeval(vim.api.…)', function()
     eq({v={}}, funcs.luaeval('vim.api.nvim__id_dictionary({v={[vim.type_idx]=vim.types.array, [vim.val_idx]=10, [5]=1, foo=2}})'))
 
     -- If API requests dictionary, then empty table will be the one. This is not
-    -- the case normally because empty table is an empty arrray.
+    -- the case normally because empty table is an empty array.
     eq({}, funcs.luaeval('vim.api.nvim__id_dictionary({})'))
     eq(4, eval([[type(luaeval('vim.api.nvim__id_dictionary({})'))]]))
   end)
diff --git a/test/functional/lua/buffer_updates_spec.lua b/test/functional/lua/buffer_updates_spec.lua
index c6c0964ddb..2fd44b8b5f 100644
--- a/test/functional/lua/buffer_updates_spec.lua
+++ b/test/functional/lua/buffer_updates_spec.lua
@@ -333,7 +333,7 @@ describe('lua: nvim_buf_attach on_bytes', function()
       start_txt = meths.buf_get_lines(0, 0, -1, true)
     end
     local shadowbytes = table.concat(start_txt, '\n') .. '\n'
-    -- TODO: while we are brewing the real strong coffe,
+    -- TODO: while we are brewing the real strong coffee,
     -- verify should check buf_get_offset after every check_events
     if verify then
       local len = meths.buf_get_offset(0, meths.buf_line_count(0))
diff --git a/test/functional/lua/uri_spec.lua b/test/functional/lua/uri_spec.lua
index 4635f17557..2cb0b26c6d 100644
--- a/test/functional/lua/uri_spec.lua
+++ b/test/functional/lua/uri_spec.lua
@@ -11,7 +11,7 @@ describe('URI methods', function()
 
   describe('file path to uri', function()
     describe('encode Unix file path', function()
-      it('file path includes only ascii charactors', function()
+      it('file path includes only ascii characters', function()
         exec_lua("filepath = '/Foo/Bar/Baz.txt'")
 
         eq('file:///Foo/Bar/Baz.txt', exec_lua("return vim.uri_from_fname(filepath)"))
@@ -23,7 +23,7 @@ describe('URI methods', function()
         eq('file:///Foo%20/Bar/Baz.txt', exec_lua("return vim.uri_from_fname(filepath)"))
       end)
 
-      it('file path including Unicode charactors', function()
+      it('file path including Unicode characters', function()
         exec_lua("filepath = '/xy/åäö/ɧ/汉语/↥/🤦/🦄/å/بِيَّ.txt'")
 
         -- The URI encoding should be case-insensitive
@@ -32,7 +32,7 @@ describe('URI methods', function()
     end)
 
     describe('encode Windows filepath', function()
-      it('file path includes only ascii charactors', function()
+      it('file path includes only ascii characters', function()
         exec_lua([[filepath = 'C:\\Foo\\Bar\\Baz.txt']])
 
         eq('file:///C:/Foo/Bar/Baz.txt', exec_lua("return vim.uri_from_fname(filepath)"))
@@ -44,7 +44,7 @@ describe('URI methods', function()
         eq('file:///C:/Foo%20/Bar/Baz.txt', exec_lua("return vim.uri_from_fname(filepath)"))
       end)
 
-      it('file path including Unicode charactors', function()
+      it('file path including Unicode characters', function()
         exec_lua([[filepath = 'C:\\xy\\åäö\\ɧ\\汉语\\↥\\🤦\\🦄\\å\\بِيَّ.txt']])
 
         eq('file:///C:/xy/%c3%a5%c3%a4%c3%b6/%c9%a7/%e6%b1%89%e8%af%ad/%e2%86%a5/%f0%9f%a4%a6/%f0%9f%a6%84/a%cc%8a/%d8%a8%d9%90%d9%8a%d9%8e%d9%91.txt', exec_lua("return vim.uri_from_fname(filepath)"))
@@ -72,7 +72,7 @@ describe('URI methods', function()
         eq('/Foo /Bar/Baz.txt', exec_lua("return vim.uri_to_fname(uri)"))
       end)
 
-      it('file path including Unicode charactors', function()
+      it('file path including Unicode characters', function()
         local test_case = [[
         local uri = 'file:///xy/%C3%A5%C3%A4%C3%B6/%C9%A7/%E6%B1%89%E8%AF%AD/%E2%86%A5/%F0%9F%A4%A6/%F0%9F%A6%84/a%CC%8A/%D8%A8%D9%90%D9%8A%D9%8E%D9%91.txt'
         return vim.uri_to_fname(uri)
@@ -83,7 +83,7 @@ describe('URI methods', function()
     end)
 
     describe('decode Windows filepath', function()
-      it('file path includes only ascii charactors', function()
+      it('file path includes only ascii characters', function()
         local test_case = [[
         local uri = 'file:///C:/Foo/Bar/Baz.txt'
         return vim.uri_to_fname(uri)
@@ -119,7 +119,7 @@ describe('URI methods', function()
         eq('C:\\Foo \\Bar\\Baz.txt', exec_lua(test_case))
       end)
 
-      it('file path including Unicode charactors', function()
+      it('file path including Unicode characters', function()
         local test_case = [[
         local uri = 'file:///C:/xy/%C3%A5%C3%A4%C3%B6/%C9%A7/%E6%B1%89%E8%AF%AD/%E2%86%A5/%F0%9F%A4%A6/%F0%9F%A6%84/a%CC%8A/%D8%A8%D9%90%D9%8A%D9%8E%D9%91.txt'
         return vim.uri_to_fname(uri)
diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index 294ff5d3ca..6451453ce0 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -905,7 +905,7 @@ describe('lua stdlib', function()
     ]]))
 
     -- vim.empty_dict() gives new value each time
-    -- equality is not overriden (still by ref)
+    -- equality is not overridden (still by ref)
     -- non-empty table uses the usual heuristics (ignores the tag)
     eq({false, {"foo"}, {namey="bar"}}, exec_lua([[
       local aa = vim.empty_dict()
diff --git a/test/functional/options/keymap_spec.lua b/test/functional/options/keymap_spec.lua
index a814c35a39..4fdc6ef4be 100644
--- a/test/functional/options/keymap_spec.lua
+++ b/test/functional/options/keymap_spec.lua
@@ -184,7 +184,7 @@ describe("'keymap' / :lmap", function()
     feed('il<esc>')
     expect('alllaaa')
   end)
-  -- This is a problem introduced when introducting :lmap and macro
+  -- This is a problem introduced when introducing :lmap and macro
   -- compatibility. There are no plans to fix this as the complexity involved
   -- seems too great.
   pending('mappings not applied to macro replay of :lnoremap', function()
diff --git a/test/functional/provider/clipboard_spec.lua b/test/functional/provider/clipboard_spec.lua
index fbaef3ae00..401dc84ccc 100644
--- a/test/functional/provider/clipboard_spec.lua
+++ b/test/functional/provider/clipboard_spec.lua
@@ -310,18 +310,18 @@ describe('clipboard (with fake clipboard.vim)', function()
     insert([[
       text:
       first line
-      secound line
+      second line
       third line]])
 
     feed('G"+dd"*dddd"+p"*pp')
     expect([[
       text:
       third line
-      secound line
+      second line
       first line]])
     -- linewise selection should be encoded as an extra newline
     eq({{'third line', ''}, 'V'}, eval("g:test_clip['+']"))
-    eq({{'secound line', ''}, 'V'}, eval("g:test_clip['*']"))
+    eq({{'second line', ''}, 'V'}, eval("g:test_clip['*']"))
   end)
 
   it('handles null bytes when pasting and in getreg', function()
@@ -477,7 +477,7 @@ describe('clipboard (with fake clipboard.vim)', function()
       expect("indeed star")
     end)
 
-    it('unamed operations work even if the provider fails', function()
+    it('unnamed operations work even if the provider fails', function()
       insert('the text')
       feed('yy')
       feed_command("let g:cliperror = 1")
@@ -511,7 +511,7 @@ describe('clipboard (with fake clipboard.vim)', function()
       eq('textstar', meths.get_current_line())
     end)
 
-    it('Block paste works currectly', function()
+    it('Block paste works correctly', function()
       insert([[
         aabbcc
         ddeeff
@@ -559,7 +559,7 @@ describe('clipboard (with fake clipboard.vim)', function()
       eq({{'really unnamed', ''}, 'V'}, eval("g:test_clip['+']"))
       eq({{'really unnamed', ''}, 'V'}, eval("g:test_clip['*']"))
 
-      -- unnamedplus takes predecence when pasting
+      -- unnamedplus takes precedence when pasting
       eq('+', eval('v:register'))
       feed_command("let g:test_clip['+'] = ['the plus','']")
       feed_command("let g:test_clip['*'] = ['the star','']")
diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua
index 7c0831bd09..46bfae8de2 100644
--- a/test/functional/ui/bufhl_spec.lua
+++ b/test/functional/ui/bufhl_spec.lua
@@ -762,7 +762,7 @@ describe('Buffer highlighting', function()
       local s1 = {{'Köttbullar', 'Comment'}, {'Kräuterbutter'}}
       local s2 = {{'こんにちは', 'Comment'}}
 
-      -- TODO: only a virtual text from the same ns curretly overrides
+      -- TODO: only a virtual text from the same ns currently overrides
       -- an existing virtual text. We might add a prioritation system.
       set_virtual_text(id1, 0, s1, {})
       eq({{1, 0, 0, {
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index 5e819f14a3..1a9a13f7d4 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -569,7 +569,7 @@ describe('float window', function()
     end)
   end)
 
-  describe('with mulitple tabpages but only one listed buffer,', function()
+  describe('with multiple tabpages but only one listed buffer,', function()
     local float_opts = {relative = 'editor', row = 1, col = 1, width = 1, height = 1}
     local unlisted_buf, old_buf, old_win
     before_each(function()
@@ -2761,7 +2761,7 @@ describe('float window', function()
             }, "NW", 2, 1, 32, true }
         }}
       else
-        -- note: appears misalinged due to cursor
+        -- note: appears misaligned due to cursor
         screen:expect{grid=[[
           ^example text that is wider than the window   |
                                           {1:some info!  } |
diff --git a/test/functional/ui/inccommand_user_spec.lua b/test/functional/ui/inccommand_user_spec.lua
index 0b25d4f8d2..43e9b94feb 100644
--- a/test/functional/ui/inccommand_user_spec.lua
+++ b/test/functional/ui/inccommand_user_spec.lua
@@ -220,7 +220,7 @@ local setup_replace_cmd = [[
   end
 
   -- ":<range>Replace <pat1> <pat2>"
-  -- Replaces all occurences of <pat1> in <range> with <pat2>
+  -- Replaces all occurrences of <pat1> in <range> with <pat2>
   vim.api.nvim_create_user_command(
     'Replace',
     replace,
diff --git a/test/functional/ui/options_spec.lua b/test/functional/ui/options_spec.lua
index bd0d2104db..6f9cea8f24 100644
--- a/test/functional/ui/options_spec.lua
+++ b/test/functional/ui/options_spec.lua
@@ -194,7 +194,7 @@ end)
 describe('UI can set terminal option', function()
   local screen
   before_each(function()
-    -- by default we implicity "--cmd 'set bg=light'" which ruins everything
+    -- by default we implicitly "--cmd 'set bg=light'" which ruins everything
     clear{args_rm={'--cmd'}}
     screen = Screen.new(20,5)
   end)
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 028fa2825d..c44e147c4d 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -519,7 +519,7 @@ function Screen:_wait(check, flags)
   end
 
   assert(timeout >= minimal_timeout)
-  local did_miminal_timeout = false
+  local did_minimal_timeout = false
 
   local function notification_cb(method, args)
     assert(method == 'redraw', string.format(
@@ -536,7 +536,7 @@ function Screen:_wait(check, flags)
 
     if not err then
       success_seen = true
-      if did_miminal_timeout then
+      if did_minimal_timeout then
         self._session:stop()
       end
     elseif success_seen and #args > 0 then
@@ -558,7 +558,7 @@ function Screen:_wait(check, flags)
   end
 
   if not success_seen and not eof then
-    did_miminal_timeout = true
+    did_minimal_timeout = true
     eof = run_session(self._session, flags.request_cb, notification_cb, nil, timeout-minimal_timeout)
   end
 
diff --git a/test/functional/vimscript/container_functions_spec.lua b/test/functional/vimscript/container_functions_spec.lua
index 04a3248c49..5bef3fce05 100644
--- a/test/functional/vimscript/container_functions_spec.lua
+++ b/test/functional/vimscript/container_functions_spec.lua
@@ -8,7 +8,7 @@ local clear = helpers.clear
 before_each(clear)
 
 describe('extend()', function()
-  it('suceeds to extend list with itself', function()
+  it('succeeds to extend list with itself', function()
     meths.set_var('l', {1, {}})
     eq({1, {}, 1, {}}, eval('extend(l, l)'))
     eq({1, {}, 1, {}}, meths.get_var('l'))
diff --git a/test/functional/vimscript/json_functions_spec.lua b/test/functional/vimscript/json_functions_spec.lua
index 5d1597f53d..70d0934756 100644
--- a/test/functional/vimscript/json_functions_spec.lua
+++ b/test/functional/vimscript/json_functions_spec.lua
@@ -343,7 +343,7 @@ describe('json_decode() function', function()
        exc_exec('call json_decode("\\t\\"abc\\\\u0000")'))
   end)
 
-  it('fails to parse unknown escape sequnces', function()
+  it('fails to parse unknown escape sequences', function()
     eq('Vim(call):E474: Unknown escape sequence: \\a"',
        exc_exec('call json_decode("\\t\\"\\\\a\\"")'))
   end)
-- 
cgit 


From b4d42bb9058308c38e3fe9d59458ce65b3f65eb0 Mon Sep 17 00:00:00 2001
From: Enan Ajmain <3nan.ajmain@gmail.com>
Date: Wed, 20 Jul 2022 01:43:26 +0600
Subject: fix: make_filter_cmd for :! powershell

Problem:
`Start-Process` requires the command to be split into the shell
command and its arguments. Previously it was done by parsing, which
didn't handle cases such as
  - commands with escaped space in their filepath
  - quoted commands with space in their filepath

Solution:
Use
  - `pwsh -Command` instead of `Start-Process`
  - `Get-Content` instead of `-RedirectStandardInput`
  - `Out-File` instead of `-RedirectStandardOutput`
---
 test/functional/helpers.lua               | 6 +++---
 test/functional/vimscript/system_spec.lua | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 3aec834bea..4fcc190dee 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -562,16 +562,16 @@ function module.set_shell_powershell(fake)
     assert(found)
   end
   local shell = found and (iswin() and 'powershell' or 'pwsh') or module.testprg('pwsh-test')
-  local set_encoding = '[Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;'
+  local set_encoding = '[Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new();'
   local cmd = set_encoding..'Remove-Item -Force '..table.concat(iswin()
-    and {'alias:cat', 'alias:echo', 'alias:sleep'}
+    and {'alias:cat', 'alias:echo', 'alias:sleep', 'alias:sort'}
     or  {'alias:echo'}, ',')..';'
   module.exec([[
     let &shell = ']]..shell..[['
     set shellquote= shellxquote=
     let &shellcmdflag = '-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command ]]..cmd..[['
     let &shellpipe = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
-    let &shellredir = '-RedirectStandardOutput %s -NoNewWindow -Wait'
+    let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
   ]])
   return found
 end
diff --git a/test/functional/vimscript/system_spec.lua b/test/functional/vimscript/system_spec.lua
index a778e2f435..d0061d051e 100644
--- a/test/functional/vimscript/system_spec.lua
+++ b/test/functional/vimscript/system_spec.lua
@@ -642,12 +642,12 @@ describe('shell :!', function()
     if iswin() then
       feed(':4verbose %!sort /R<cr>')
       screen:expect{
-        any=[[Executing command: .?Start%-Process sort %-ArgumentList "/R" %-RedirectStandardInput .* %-RedirectStandardOutput .* %-NoNewWindow %-Wait]]
+        any=[[Executing command: .?Get%-Content .* | & sort /R 2>&1 | Out%-File %-Encoding UTF8 .*; exit $LastExitCode]]
       }
     else
       feed(':4verbose %!sort -r<cr>')
       screen:expect{
-        any=[[Executing command: .?Start%-Process sort %-ArgumentList "%-r" %-RedirectStandardInput .* %-RedirectStandardOutput .* %-NoNewWindow %-Wait]]
+        any=[[Executing command: .?Get%-Content .* | & sort %-r 2>&1 | Out%-File %-Encoding UTF8 .*; exit $LastExitCode]]
       }
     end
     feed('<CR>')
-- 
cgit 


From f2482b3b533c8ed131a33aaead332c226a9e6aca Mon Sep 17 00:00:00 2001
From: Enan Ajmain <3nan.ajmain@gmail.com>
Date: Wed, 20 Jul 2022 20:55:28 +0600
Subject: fix: :! pwsh redirection for `command not found`

Problem:
If the shell command passed to the filtered bang command isn't found,
the error isn't redirected to the temp.out file when shell is set to
powershell.

Solution: Use anonymous function with Invoke-Command operator (&).
---
 test/functional/vimscript/system_spec.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/vimscript/system_spec.lua b/test/functional/vimscript/system_spec.lua
index d0061d051e..ed822add72 100644
--- a/test/functional/vimscript/system_spec.lua
+++ b/test/functional/vimscript/system_spec.lua
@@ -642,12 +642,12 @@ describe('shell :!', function()
     if iswin() then
       feed(':4verbose %!sort /R<cr>')
       screen:expect{
-        any=[[Executing command: .?Get%-Content .* | & sort /R 2>&1 | Out%-File %-Encoding UTF8 .*; exit $LastExitCode]]
+        any=[[Executing command: .?& { Get%-Content .* | & sort /R } 2>&1 | Out%-File %-Encoding UTF8 .*; exit $LastExitCode"]]
       }
     else
       feed(':4verbose %!sort -r<cr>')
       screen:expect{
-        any=[[Executing command: .?Get%-Content .* | & sort %-r 2>&1 | Out%-File %-Encoding UTF8 .*; exit $LastExitCode]]
+        any=[[Executing command: .?& { Get%-Content .* | & sort %-r } 2>&1 | Out%-File %-Encoding UTF8 .*; exit $LastExitCode"]]
       }
     end
     feed('<CR>')
-- 
cgit 


From d367ed9b23d481998d297d812f54b950e5511c24 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Fri, 30 Sep 2022 17:09:47 +0200
Subject: NVIM v0.8.0

BREAKING CHANGES
- Remove 'insertmode' 'remap' and 'terse' options
- highlight: Rename attributes to match Vim (#19159)
- highlight: Error on invalid names and allow '.' and '@'
- terminal: Drop winpty, require Windows 10 #18253
- treesitter: Use @foo.bar style highlight groups
- treesitter: Do not merge queries by default (#20105)

FEATURES
- runtime: Enable filetype.lua by default (#19216)
- Add `undo!`
- Add "prerelease" to version dict
- Click support for 'statusline', 'winbar' #18650
- Add preview functionality to user commands
- allow cmdheight=0 (EXPERIMENTAL) #16251
- Stdpath('run'), /tmp/nvim.user/ #18993
- Add 'mousescroll' option (#12355)
- Allow :wincmd to accept a count (#19815)
- Multibuffer preview support for inccommand
- Man: Port to Lua (#19912)
- api: Ui options relevant for remote TUI
- api: Add `nvim_parse_cmd` And `nvim_cmd`
- api: Support handling stdin stream in remote ui
- api: Add `group_name` to `nvim_get_autocmds`
- api: Enable nvim_exec_autocmds to pass arbitrary data (#18613)
- api: Support pattern array for exec_autocmds
- api: Add `unsilent` to command APIs
- api: Add replace_keycodes to nvim_set_keymap (#19598)
- api: Add support for :horizontal modifier
- api: Add "move" to nvim_input_mouse
- api/ui: "ui_watched" option for ui-side extmarks
- build: Add_glob_target runs only on changed files #19070
- checkhealth: Check for slow shell #17829
- defaults: Session data in $XDG_STATE_HOME #15583
- defaults: Search selection by * and # in visual mode (#18538)
- defaults: Nnoremap & :&&<CR> #19365
- defaults: enable mouse by default (set mouse=nvi)  #19290
- diagnostic: Pass diagnostics as data to DiagnosticChanged autocmd (#20173)
- docs: Gen_help_html.lua
- edit: Insert an unsimplified key using CTRL-SHIFT-V
- treesitter: Full support for spelling
- filetype: Convert more patterns to filetype.lua
- filetype: Remove side effects from vim.filetype.match (#18894)
- filetype: Expand environment variables in filetype patterns (#20145)
- fs: Add vim.fs functions: parents() dirname() basename() dir() find() normalize()
- highlight: Implement CurSearch highlight
- highlight: Support scoped @spam.eggs.baked_beans groups
- input: Delay all simplifications
- l10n: Turkish translations #19441
- l10n: Improve zh_CN translations (#19483)
- lsp: Remove capabilities sanitization (#17814)
- lsp: Show feedback on empty hover response (#18308)
- lsp: Options to filter and auto-apply code actions (#18221)
- lsp: Add vim.lsp.buf.format (#18193)
- lsp: Add logging level "OFF" (#18379)
- lsp: Add LspAttach and LspDetach autocommands
- lsp: Add filter to vim.lsp.get_active_clients()
- lsp: Option to reuse_win for jump actions (#18577)
- lsp: Add a start function (#18631)
- lsp: Send didChangeConfiguration after init (#18847)
- lsp: Defaults: tagfunc, omnifunc, formatexpr (#19003, #19677)
- lsp: Allow passing custom list handler to LSP functions that return lists (#19213)
- lsp: Provide feedback if server can't compute rename result (#19546)
- lsp: Add range option to code_action; deprecate range_code_action (#19551)
- lsp: Disable exit_timeout by default (#19672)
- lsp: Add tcp support
- lua: Vim.deprecate() #18320
- lua: Vim.cmd() with kwargs acts like nvim_cmd() #18523
- lua: Allow some vim script functions to run in fast callbacks
- lua: Measure require in --startuptime
- lua: Allow vim.cmd to be indexed (#19238)
- lua: Print source locations of lua callbacks (#19597)
- lua: Add vim.iconv (#18286)
- lua: Vim.ui_attach to get ui events from lua (EXPERIMENTAL)
- man.vim: List command flags in "gO" outline #17558
- mappings: Do not replace existing mapping for simplified form
- mappings: Allow special keys and modifiers in <Cmd> mapping
- mapset: Support restoring "replace_keycodes" and "desc"
- mapset: Support restoring Lua callback (#20024)
- marks: Restore viewport on jump #15831
- nvim_create_user_command: Pass structured modifiers to commands
- pum: Pretend 'mousemoveevent' is set when showing right-click menu
- server: Set $NVIM, unset $NVIM_LISTEN_ADDRESS #11009
- server: Instance "name", store pipes in stdpath(state)
- term: Add support for libvterm >= 0.2
- terminal: Implement <c-\><c-o> for terminal mode
- terminal: Recognize underdouble and undercurl
- terminfo: Bump built-in terminfo entries (#18570)
- treesitter: Allow customizing language symbol name
- treesitter: Add ability to retreive a tree/node given a range
- treesitter: Upstream node methods from nvim-treesitter
- treesitter: Include language in invalid query error (#14053)
- treesitter: Bundle Lua parser and queries
- treesitter: Add viml parser and queries
- treesitter: Add injections
- treesitter: Add vim.treesitter.start(), enable for Lua
- treesitter: Bundle :help parser and queries
- tui: Query terminal for CSI u support (#18181)
- tui: Recognize keypad keys when using kitty keyboard protocol
- tui: Try terminfo for [re]set_cursor_color OSC #19255
- tui: Allow grid and host to disagree on ambiguous-width chars (#19686)
- tui: Recognize sidescroll events (#19992)
- tui: Support 'mousemoveevent'
- ui: Add `'winbar'`
- ui: Clear message history explicitly with msg_history_clear event
- ui: Make right-click menu work properly with ext_multigrid
- ui: Allow to set the highlight namespace per window
- ui: Use msg_grid based implementation for cmdheight=0
- ui-ext: Make 'mousemoveevent' a ui_option
- eval: Make Lua Funcref work as method and in substitute() (#20217)
- eval: Input() support any type for "cancelreturn" in a dict (#19357)

BUG FIXES
- Show autocmd output when F is in shortmess (#18251)
- Has() should preserve v:shell_error #18280
- Suppress "is a directory" messages with shortmess 'F' (#18296)
- Display global statusline correctly with ext_messages
- Correct nlua_wait error message #18867
- Right-click in clickable statusline #19252
- Remote UI may get invalid 'pumblend' value #19379
- Assertion failure when requiring missing module in autocmd
- api: Nvim_eval_statusline should validate input #18347
- api: Check error after getting win/buf handle (#19052)
- api: Check for inclusive buffer line index out of bounds correctly (#19056)
- api: Change default value of 'pattern' in nvim_exec_autocmds (#19115)
- api: Do not switch win/buf if getting option in current win/buf (#19383)
- api: Make nvim_set_hl(ns=0, ...) redraw screen properly
- api: Nvim_set_hl bail out on invalid group name (#20021)
- api: Notify dict watchers on nvim_set_var and vim.g setter
- api/command: Fargs behavior when no arguments are passed (#19862)
- autocmds: Separate command from desc (#18617)
- buffer: Disable buffer-updates before removing from window #18933
- build: Missing definitions for sizeof macros #16393
- build: Only pass -municode if MINGW #19049
- build: Strip trailing newline from variable (#19084)
- build: Don't disable byte precompilation on debug builds
- build: Fails if git is missing #19366
- charclass: Make behavior with empty str match latest Vim (#19749)
- checkhealth: Skip vim.health #18816
- ci: Remove 2000ms blocking wait in many plugin/lsp_spec.lua tests
- cmd: Make :-tabmove work with modifiers (#18447)
- cmdheight=0: Various issues part3 #19816
- cmdline: Fix passing -1 as char
- cmdline: Trigger CmdlineEnter and ModeChanged earlier (#19474)
- cmdline: Do not trigger completion at wrong time (#19920)
- cmdline: Don't send invalid cursor with incsearch and cmdheight=0
- column: Move sign sentinel after inserting/deleting lines (#20400)
- completion: Remove wrong FUNC_ATTR_NONNULL_ALL (#19627)
- diagnostic: Use nvim_exec_autocmds to trigger DiagnosticChanged (#18188)
- diagnostic: Check for negative column value (#18868)
- diagnostic: Remove buf from cache on `BufWipeout` (#20099)
- diagnostic: Populate data key in DiagnosticChanged autocmd in reset (#20207)
- docs: Correct obsolete note about 'writedelay' in dev docs
- docs: Remove internal function from docs
- edit.c: Indentkeys double indent after "!" #12894
- eval: Check for v:lua when calling callback (#19855)
- eval/f_getmatches: Return empty list for invalid win argument (#18893)
- events: Make CursorHold behave as documented
- ex_cmds: Correct flags for :const (#19387)
- exceptions: Restore `did_throw` (#20000)
- exmode: Do not throttle messages when pressing enter to print line
- extmarks: Make virt_lines always start at 0 virtcol
- filetype: Fix and improve filetype patterns
- fillchars: Change fallback after setcellwidths()
- float: Make `screen*()` functions respect floating windows
- float: Fix glitch when making float window with border a split
- float: Fix mouse drag position if float window turned to a split
- folds: Fix fold regression with :move (#18685)
- folds: Fix fold remains when :delete makes buffer empty (#19673)
- ftdetect: Source plugins in autogroup (#18237)
- gen_vimdoc.py: Handle missing luajit
- getchar: Flush screen before doing a blocking wait
- handlers: More specific error messages (#16772)
- health: Correct shada file path #18603
- health: Handle non-existent log file #18610
- highlight: Use ctermbg/fg instead of bg/fg when use_rgb=false #18982
- highlight: Add missing 'nocombine' to nvim_get_hl apis (#19586)
- highlight: Set the window namespace when redrawing statusline
- hl: Set Normal hl group sg_attr value #18820
- hl: Return cterm fg/bg even if they match Normal #18981
- inccommand: Do not try to preview an ambiguous command (#18827)
- inccommand: Avoid crash if callback changes inccommand option (#18830)
- inccommand: Clear cmdpreview state if preview is not shown (#18923)
- inccommand: Skip split window if not enough room #18937
- inccommand: Never preview if parsing command failed (#18944)
- inccommand: Parse the command to check if it is previewable
- inccommand: Deal with unsynced undo (#20041)
- input: Allow Ctrl-C to interrupt a recursive mapping even if mapped (#18885)
- input: Fix macro recording with ALT and special key (#18917)
- input: Use correct grid when restoring cursor for <expr> mapping (#19047)
- input: Do no reinterpret mouse keys with ALT modifiers
- input: Use click number of last click for mouse drag (#20300)
- inspect: Escape identifiers that are lua keywords (#19898)
- keywordprg: Default to :help if set to empty string (#19983)
- l10n: Improve zh_CN and zh_TW translations (#19969)
- log: Back even again
- logging: Skip recursion, fix crash #18764
- logging: Make logmsg() thread-safe again
- logging: Try harder to resolve Nvim "name" #19016
- lsp: Unify progress message handling (#18040)
- lsp: Fix unnecessary buffers being added on empty diagnostics (#18275)
- lsp: Fix infinite loop in resolved_capabilities deprecation message (#18333)
- lsp: Add missing bufnr argument (#18382)
- lsp: Fix rename capability checks and multi client support (#18441)
- lsp: Detach spawned LSP server processes (#18477)
- lsp: Perform client side filtering of code actions (#18392)
- lsp: Only send diagnostics from current buffer in code_action() (#18639)
- lsp: Respect global syntax setting in open float preview (#15225)
- lsp: Include cancellable in progress message table (#18809)
- lsp: Adjust offset encoding in lsp.buf.rename() (#18829)
- lsp: Set buflisted before switching to buffer (#18854)
- lsp: Fix multi client handling in code action (#18869)
- lsp: Small bugs in snippet-parser #18998
- lsp: Pcall nvim_del_augroup_by_name (#19302)
- lsp: Abort pending changes after flush when debouncing (#19314)
- lsp: Don't attach a client in lsp.start() if there is none (#19328)
- lsp: Account for initializing servers in vim.lsp.start (#19329)
- lsp: Move augroup define to if statement (#19406)
- lsp: Set workspace.configuration capability (#19548)
- lsp: Send didOpen if name changes on write (#19583)
- lsp: Prevent unexpected position jumps (#19370)
- lsp: Avoid  ^M character in hover window on Windows (#19640)
- lsp: Set end_col in formatexpr (#19676)
- lsp: Handle multiple clients with incremental sync (#19658)
- lsp: Fix some type annotations in lsp.rpc (#19714)
- lsp: Avoid pipe leaks if lsp cmd isn't executable (#19717)
- lsp: Handle nil client in onexit callback (#19722)
- lsp: Fix nil value error in get_group (#19735)
- lsp: Clean the diagnostic cache when buffer delete (#19449)
- lsp: When buffer detach remove buffer from client attached buffers (#20081)
- lsp: Schedule removal of client object (#20148)
- lsp: Support `false` result in handlers (#20252)
- lsp: Out of bounds error in lsp.util.apply_text_edits (#20137)
- lsp: Use correct function name in deprecated message (#20308)
- lsp: Create missing directory before creating file (#19835)
- lua: Don't mutate opts parameter of vim.keymap.del (#18227)
- lua: Stop pending highlight.on_yank timer, if any (#18824)
- lua: Highlight.on_yank can close timer in twice #18976
- lua: Clear got_int when calling vim.on_key() callback (#18979)
- lua: Don't leak memory on error
- lua: Double entries in :lua completion #19410
- lua: Make it possible to cancel vim.wait() with Ctrl-C (#19217)
- lua: Make ui_attach()/ui_detach() take effect immediately (#20037)
- lua: Make vim.str_utfindex and vim.str_byteindex handle NUL bytes
- lua: Free vim.ui_attach callback before lua close (#20205)
- lua: Fix architecture-dependent behavior in usercmd "reg" (#20384)
- mac: Use same $LANG fallback mechanism as Vim
- mac: Add CoreServices to flake.nix #18358
- man.vim: Q in "$MANPAGER mode" does not quit #18443
- maparg: Remove double allocation (#20033)
- mappings: Fix double-free when unmapping simplifiable Lua mapping
- mapset: Remove existing abbreviation of same lhs (#20320)
- mark: Set mark fnum from buffer (#19195)
- mark: Mark without a view restores at topline #19224
- mark: Fix unexpected cursor movements (#19253)
- mark: Give correct error message when mark is in another buffer (#19454)
- menu: Make :menu still print header when there are no menus
- messages: Add color when showing nvim_echo in :messages history
- messages: Do not crash on cmdheight=0 and g< redisplay
- messages: Validate msg_grid before silent! message with cmdheight=0
- mksession: Don't store floats in session #18635
- mouse: Click on global statusline with splits (#19390)
- mouse: Fix using uninitialized memory with K_MOUSEMOVE (#19480)
- mpack: Make sure a `bool` always is a `bool`
- normal: Fix segfault with bracket command jumping to a mark
- options: Properly free string options (#19510)
- options: Mark `winhighlight` as list style  (#19477)
- packaging: Remove excess forward slash in Wix Patch (#18121)
- paste: Ignore mappings in Cmdline mode (#18114)
- path: Path_is_url returns false for "foo:/" #19797
- powershell: Filter ":!" commands with args #19268
- pum: Make right drag in anchor grid to select work in multigrid UI (#19382)
- query: Fix unnatural order for inherits in treesitter queries (#20298)
- redraw: Make sure :redraw! redraws command line
- redraw: Handle switching to a tabpage with larger p_ch value
- redraw: Avoid unnecessary redraws and glitches with floats+messages
- redraw: Make redrawdebug=nodelta handle all the cases
- rpc: Break nvim_error_event feedback loop between two nvim instances
- runtime/genvimvim: Omit s[ubstitute] from vimCommand #18480
- screen: Restart win_update() if a decor provider changes signcols (#18768)
- screen: Check for col instead of vcol when drawing fold (#19572)
- session: Respect sessionoptions=terminal #19497
- shared: Avoid indexing unindexable values in vim.tbl_get() (#18337)
- signs: Priority of extmark signs (#19718)
- source: Make changing 'shellslash' change expand() result
- source: Fix expand('<sfile>') no longer works for Lua
- spell: Make setting 'encoding' clear word list
- spell: Correct spell move behavior without "noplainbuffer" (#20386)
- startup: Nvim with --clean should not load user rplugins
- substitute: Subtract number of backslashes later
- tabpage: Check if ROWS_AVAIL changed for resize (#19620)
- terminal: Invalid pointer comparison #18453
- terminal: Do not trim whitespace that is actually in the terminal (#16423)
- terminal: Scrollback delete lines immediately #18832
- terminal: Coverity USE_AFTER_FREE #18978
- terminal: Crash if TermClose deletes own buffer #19222
- terminal: Avoid reading over the end of cell.chars (#19580)
- terminal: Skip aucmd_win when checking terminal size (#19668)
- terminal: Adopt altscreen test for libvterm 0.2 changes
- terminfo: Disable smglr for vtpcon and conemu (#18855)
- termopen: Avoid ambiguity in URI when CWD is root dir (#16988)
- tests: Fix some screen.lua warnings
- tests: Fix some issues with ui/inccommand_spec.lua causing slowness
- tests: Unreliable parser_spec #18911
- tests: Check for EOF on exit of nvim properly
- tests: Missing clear() #18927
- tests: Remove misleading $TEST_PATH segment #19050
- tests: Remove irrelevant usage of display-=msgsep
- tests: Use pending_c_parser when needed
- tests: Indicate in test logs when nvim exit times out
- tmpdir: Invalid tempname() if username has slashes #19323
- treesitter: Create new parser if language is not the same as cached parser (#18149)
- treesitter: Bump match limit up
- treesitter: Offset directive associates range with capture (#18276)
- treesitter: Correct region for string parser (#18794)
- treesitter: New iter if folded
- treesitter: Don't error when node argument of predicate is nil (#19355)
- treesitter: Free memory on removing parser (#19933)
- treesitter: More efficient node:root()
- treesitter: Make it get_captures_at_position
- treesitter: Do not link @error by default
- treesitter: Don't support legacy syntax in start()
- treesitter: Use the right loading order for base queries (#20117)
- treesitter: Prevent endless loop on self-inheritence
- treesitter: Return full metadata for get_captures_at_position (#20203)
- ts: Do not clobber spelloptions (#20095)
- tui: Update modifyOtherKeys reporting (#18158)
- tui: Disable extended keys before exiting alternate screen (#18318)
- tui: Piping nodejs to nvim breaks input handling #18932
- tui: Resize at startup #17795
- tui: Add fixups for hterm family #19078
- tui: Handle padding requirements for visual bell (#20238)
- ui: Require window-local value to show winbar on floating windows (#18773)
- ui: Do not call showmode() when setting window height (#18969)
- ui: Set redraw_cmdline when setting window height (#19630)
- ui: Don't allow decor provider with ns_id==0
- ui: Ui compositor does not correctly free event callbacks
- ui: Allow redrawing statusline when msgsep is used (#20337)
- ui: Redraw end of buffer if last line is modified (#20354)
- unittests: Coredump when running unit tests #18663
- usercmd: Also check for whitespace after escaped character (#19942)
- version.c: Mark N/A vim patches #18587
- vim.ui.input: Accept nil or empty "opts"  #19109
- window: Close floats first when closing buffer in other tab (#20284)
- window: Fix equalization with cmdheight=0 (#20369)
- windows: Stdpath("state") => "nvim-data" #18546
- windows: Exepath, stdpath return wrong slashes #19111
- winhl: Do not crash when unsetting winhl in just opened window
- Make :undo! notify buffer update callbacks (#20344)
- eval: Make Vim functions return inner window width and height (#19743)

BUILD SYSTEM
- Bump Doxyfile to minimum required version 1.9.0 #18118
- Bump msgpack to 4.0.0
- Enable EXITFREE on Debug builds (#17783)
- Add formatting targets for c and lua files (#19488)
- clang-format: Align with project style #18192
- clint: Remove all python2-isms with pyupgrade
- clint: Remove "function size is too large" warning
- clint: Remove rules for includes, whitespace, tabs #18611
- cmake: Simplify and speed up the uninstall target
- cmake: Simplify def_cmd_target function
- cmake: Use glob_wrapper instead of file(GLOB in main CMakeLists
- cmake: Fix static `libintl` test on macOS
- deps: Bump LuaJIT, Luv and libuv
- deps: Support universal builds on macOS
- deps: Bump tree-sitter to v0.20.7 (#20067)
- deps: Bump tree-sitter parsers
- deps: Bump required libvterm to v0.3 (#20222)
- deps: Require libtermkey version 0.22
- deps: update neovim-qt, win32tools.zip

PERFORMANCE
- Only redraw for CurSearch when it is currently in use
- highlight: Allocate permanent names in an arena for fun and cache locality
- highlight: Use binary search to lookup RGB color names
- map: Visit only one hash bucket instead of all, like an actual hash table
- memory: Get rid of extraneous heap allocations
- memory: implement arena memory allocation with a shared freelist
- memory: Use an arena for RPC decoding and some API return values
- messages: Don't call ui_flush() per message line in various places
- treesitter: Use a reuse list for query cursors
- ui: Reduce allocations when encoding and decoding "redraw" events
- ui: Avoid ui_flush() work in headless mode

REFACTOR
- checkhealth: Rename to vim.health, move logic to Lua #18720
- Add pure attribute to pure functions
- Replace char_u variables and functions with char
- Enable -Wconversion warning for all Nvim source files
- Add warnings for deprecated functions (#18662)
- Change type of linenr_T from long to int32_t
- Use nvim_get/set_option_value for vim.{b,w}o
- Remove functions marked for deprecation in 0.8 (#19299)
- Rename function prefix mb to the more accurate utf_cp (#19590)
- Remove some unused includes
- Change remaining sourcing_name/sourcing_lnum to exestack
- Change FALSE/TRUE to false/true
- api: Use a hashy hash for looking up api method and event names
- api: Use a unpacker based on libmpack instead of msgpack-c
- api: restructure api/vim.c and api/private/helpers.c code in separate files
- api: Remove redundant fields of CmdParseInfo
- aucmd: Call define_autocmd() directly for default autocmds
- ci: Cleanup release.yml #19132
- cmd: Format do_one_cmd()
- cmd: Hoist out some code into functions
- cmd: Unify execute_cmd with do_one_cmd
- decor: Use decor levels properly
- drawline.c: Factor out utf8 multibyte check
- eval: Use Hashy McHashFace instead of gperf
- eval.c: Resolve all clint issues (#19774)
- eval/funcs.c: Resolve all clint errors
- events: Remove unnecessary fudging of updating_screen
- ex_cd: Add an early return to fix clint warning
- ex_docmd.c: Resolve most clint errors (#19775)
- filetype: Allow vim.filetype.match to accept buf and filename (#19114)
- highlight: Make hlattrs2dict always use pre-allocated dict
- log: Simplify log_path_init #18898
- log: Use msg_schedule_semsg #18950
- lsp: Remove redundant client cleanup (#18744)
- lsp: Make the use of local aliases more consistent
- lsp: Use autocmd api (#19407)
- lsp: Factor out read_loop function
- lsp: Encapsulate rpc uv handle
- lsp: Extract rpc client from rpc.start
- lua: Replace hard-coded gsub with vim.pesc() (#18407)
- lua: Reformat with stylua 0.14.0 (#19264)
- lua: Git-blame-ignore stylua update PR (#19273)
- lua: Replace vim.cmd use with API calls (#19283)
- map: Simplify free_all_mem handling
- map: Statically initialize maphash array
- map: Simplify add_map params
- normal: Convert function comments to doxygen format
- object: Get rid of redundant FIXED_TEMP_ARRAY
- ops: Doxygen docstrings #17743
- option: DRY get/set option value #19038
- plines: Use a struct for chartabsize state
- provider: Use list comprehension #19027
- regexp_nfa.c: Match where Vim calls fopen() (#18778)
- runtime: Convert dist#ft functions to lua (#18247)
- runtime: Convert more dist#ft functions to lua (#18430)
- runtime: Convert the remaining dist#ft functions to lua (#18623)
- runtime: Port remaining patterns from filetype.vim to filetype.lua (#18814)
- runtime: Refactor filetype.lua (#18813)
- runtime: Port scripts.vim to lua (#18710)
- setcellwidths: Use TV_LIST_ITEM_NEXT properly
- signs: Handle non-sign attrs separately (#19784)
- tests: Introduce testprg()
- treesitter: Get_{nodes,captures}_at_{position,cursor}
- typval: Change FC_CFUNC abstraction into FC_LUAREF
- ui: Simplify stdin handling
- uncrustify: Format all c code under /src/nvim/
- vim.opt: Remove del arg
- vim.opt: Unify vim.bo/wo building
- vim.opt: Optimize append/prepend/remove
- Format runtime with stylua
---
 test/functional/fixtures/api_level_10.mpack | Bin 0 -> 30761 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/functional/fixtures/api_level_10.mpack

(limited to 'test')

diff --git a/test/functional/fixtures/api_level_10.mpack b/test/functional/fixtures/api_level_10.mpack
new file mode 100644
index 0000000000..2a1f51045d
Binary files /dev/null and b/test/functional/fixtures/api_level_10.mpack differ
-- 
cgit 


From 9353e2f7ef6d0919257548e1a43988404900bf03 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 1 Oct 2022 21:29:54 +0800
Subject: vim-patch:8.2.2542: highlight of char beyond line end is not correct
 (#20424)

Problem:    Highlight of char beyond line end is not correct. (Chuan Wei Foo)
Solution:   Fix counting NUL as one cell.  Draw one more character if the EOL
            is part of the match. (closes vim/vim#7883)
https://github.com/vim/vim/commit/41f0895c6e3c7b921e3c102ad42be52b1be48018

Reorder test_search.vim to match Vim.
---
 test/functional/legacy/search_spec.lua | 30 +++++++++++++++++++++++++++++-
 test/functional/ui/searchhl_spec.lua   | 22 +++++++++++-----------
 2 files changed, 40 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/functional/legacy/search_spec.lua b/test/functional/legacy/search_spec.lua
index 67991f5d48..5a94fca794 100644
--- a/test/functional/legacy/search_spec.lua
+++ b/test/functional/legacy/search_spec.lua
@@ -644,7 +644,35 @@ end)
 
 describe('Search highlight', function()
   before_each(clear)
-  it('Search highlight is combined with Visual highlight vim-patch:8.2.2797', function()
+
+  -- oldtest: Test_hlsearch_dump()
+  it('beyond line end vim-patch:8.2.2542', function()
+    local screen = Screen.new(50, 6)
+    screen:set_default_attr_ids({
+      [1] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [2] = {background = Screen.colors.Yellow},  -- Search
+      [3] = {background = Screen.colors.Grey90},  -- CursorLine
+    })
+    screen:attach()
+    exec([[
+      set hlsearch noincsearch cursorline
+      call setline(1, ["xxx", "xxx", "xxx"])
+      /.*
+      2
+    ]])
+    feed([[/\_.*<CR>]])
+    screen:expect([[
+      {2:xxx }                                              |
+      {2:xxx }                                              |
+      {2:^xxx }{3:                                              }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      /\_.*                                             |
+    ]])
+  end)
+
+  -- oldtest: Test_hlsearch_and_visual()
+  it('is combined with Visual highlight vim-patch:8.2.2797', function()
     local screen = Screen.new(40, 6)
     screen:set_default_attr_ids({
       [1] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua
index c5c88323a2..18bbb56a61 100644
--- a/test/functional/ui/searchhl_spec.lua
+++ b/test/functional/ui/searchhl_spec.lua
@@ -221,10 +221,10 @@ describe('search highlighting', function()
       feed('gg/foo\\nbar<CR>')
       screen:expect([[
         one                                     |
-        {2:^foo}                                     |
+        {2:^foo }                                    |
         {2:bar}                                     |
         baz                                     |
-        {1:foo}                                     |
+        {1:foo }                                    |
         {1:bar}                                     |
         /foo\nbar                               |
       ]])
@@ -232,20 +232,20 @@ describe('search highlighting', function()
       feed('gg/efg\\nhij<CR>')
       screen:expect([[
         ---                                     |
-        abcd{2:^efg}                                 |
+        abcd{2:^efg }                                |
         {2:hij}kl                                   |
         ---                                     |
-        abcd{1:efg}                                 |
+        abcd{1:efg }                                |
         {1:hij}kl                                   |
         /efg\nhij                               |
       ]])
       feed('n')
       screen:expect([[
         ---                                     |
-        abcd{1:efg}                                 |
+        abcd{1:efg }                                |
         {1:hij}kl                                   |
         ---                                     |
-        abcd{2:^efg}                                 |
+        abcd{2:^efg }                                |
         {2:hij}kl                                   |
         /efg\nhij                               |
       ]])
@@ -548,9 +548,9 @@ describe('search highlighting', function()
     feed('/line\\na<cr>')
     screen:expect([[
                                               |
-      a  repeated {2:^line}                        |
-      {2:a}  repeated {2:line}                        |
-      {2:a}  repeated {2:line}                        |
+      a  repeated {2:^line }                       |
+      {2:a}  repeated {2:line }                       |
+      {2:a}  repeated {2:line }                       |
       {2:a}  repeated line                        |
       {1:~                                       }|
       {4:search hit BOTTOM, continuing at TOP}    |
@@ -560,9 +560,9 @@ describe('search highlighting', function()
     feed('4Grb')
     screen:expect([[
                                               |
-      a  repeated {2:line}                        |
+      a  repeated {2:line }                       |
       {2:a}  repeated line                        |
-      ^b  repeated {2:line}                        |
+      ^b  repeated {2:line }                       |
       {2:a}  repeated line                        |
       {1:~                                       }|
       {4:search hit BOTTOM, continuing at TOP}    |
-- 
cgit 


From 85c7d4f7a92326dcd70317b048bafe96c8051701 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 1 Oct 2022 18:32:08 +0800
Subject: vim-patch:9.0.0620: matchaddpos() can only add up to 8 matches

Problem:    matchaddpos() can only add up to 8 matches.
Solution:   Allocate the array of positions. (closes vim/vim#11248)
https://github.com/vim/vim/commit/50faf02f43d7f1a56ec2023028fca7c72dbce83e
---
 test/functional/legacy/match_spec.lua | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 test/functional/legacy/match_spec.lua

(limited to 'test')

diff --git a/test/functional/legacy/match_spec.lua b/test/functional/legacy/match_spec.lua
new file mode 100644
index 0000000000..271f844f9d
--- /dev/null
+++ b/test/functional/legacy/match_spec.lua
@@ -0,0 +1,38 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear = helpers.clear
+local exec = helpers.exec
+
+before_each(clear)
+
+describe('matchaddpos()', function()
+  -- oldtest: Test_matchaddpos_dump()
+  it('can add more than 8 match positions vim-patch:9.0.0620', function()
+    local screen = Screen.new(60, 14)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {background = Screen.colors.Yellow},  -- Search
+    })
+    screen:attach()
+    exec([[
+      call setline(1, ['1234567890123']->repeat(14))
+      call matchaddpos('Search', range(1, 12)->map({i, v -> [v, v]}))
+    ]])
+    screen:expect([[
+      {1:^1}234567890123                                               |
+      1{1:2}34567890123                                               |
+      12{1:3}4567890123                                               |
+      123{1:4}567890123                                               |
+      1234{1:5}67890123                                               |
+      12345{1:6}7890123                                               |
+      123456{1:7}890123                                               |
+      1234567{1:8}90123                                               |
+      12345678{1:9}0123                                               |
+      123456789{1:0}123                                               |
+      1234567890{1:1}23                                               |
+      12345678901{1:2}3                                               |
+      1234567890123                                               |
+                                                                  |
+    ]])
+  end)
+end)
-- 
cgit 


From cb310d2901a0eb63721ac5930daaadee91929208 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 1 Oct 2022 21:59:53 +0800
Subject: vim-patch:9.0.0622: matchaddpos() can get slow when adding many
 matches

Problem:    matchaddpos() can get slow when adding many matches.
Solution:   Update the next available match ID when manually picking an ID and
            remove check if the available ID can be used. (idea by Rick Howe)
https://github.com/vim/vim/commit/9f573a8df02d9f699a43d2afbd1d2841d700b9ad
---
 .../legacy/063_match_and_matchadd_spec.lua         | 100 +--------------------
 1 file changed, 1 insertion(+), 99 deletions(-)

(limited to 'test')

diff --git a/test/functional/legacy/063_match_and_matchadd_spec.lua b/test/functional/legacy/063_match_and_matchadd_spec.lua
index d164d9c02f..235a826640 100644
--- a/test/functional/legacy/063_match_and_matchadd_spec.lua
+++ b/test/functional/legacy/063_match_and_matchadd_spec.lua
@@ -3,10 +3,8 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 
-local eval, clear, command = helpers.eval, helpers.clear, helpers.command
-local eq, neq = helpers.eq, helpers.neq
+local clear, command = helpers.clear, helpers.command
 local insert = helpers.insert
-local pcall_err = helpers.pcall_err
 
 describe('063: Test for ":match", "matchadd()" and related functions', function()
   setup(clear)
@@ -19,105 +17,9 @@ describe('063: Test for ":match", "matchadd()" and related functions', function(
       [1] = {background = Screen.colors.Red},
     })
 
-    -- Check that "matcharg()" returns the correct group and pattern if a match
-    -- is defined.
     command("highlight MyGroup1 term=bold ctermbg=red guibg=red")
     command("highlight MyGroup2 term=italic ctermbg=green guibg=green")
     command("highlight MyGroup3 term=underline ctermbg=blue guibg=blue")
-    command("match MyGroup1 /TODO/")
-    command("2match MyGroup2 /FIXME/")
-    command("3match MyGroup3 /XXX/")
-    eq({'MyGroup1', 'TODO'}, eval('matcharg(1)'))
-    eq({'MyGroup2', 'FIXME'}, eval('matcharg(2)'))
-    eq({'MyGroup3', 'XXX'}, eval('matcharg(3)'))
-
-    -- Check that "matcharg()" returns an empty list if the argument is not 1,
-    -- 2 or 3 (only 0 and 4 are tested).
-    eq({}, eval('matcharg(0)'))
-    eq({}, eval('matcharg(4)'))
-
-    -- Check that "matcharg()" returns ['', ''] if a match is not defined.
-    command("match")
-    command("2match")
-    command("3match")
-    eq({'', ''}, eval('matcharg(1)'))
-    eq({'', ''}, eval('matcharg(2)'))
-    eq({'', ''}, eval('matcharg(3)'))
-
-    -- Check that "matchadd()" and "getmatches()" agree on added matches and
-    -- that default values apply.
-    command("let m1 = matchadd('MyGroup1', 'TODO')")
-    command("let m2 = matchadd('MyGroup2', 'FIXME', 42)")
-    command("let m3 = matchadd('MyGroup3', 'XXX', 60, 17)")
-    eq({{group = 'MyGroup1', pattern = 'TODO', priority = 10, id = 4},
-        {group = 'MyGroup2', pattern = 'FIXME', priority = 42, id = 5},
-        {group = 'MyGroup3', pattern = 'XXX', priority = 60, id = 17}},
-      eval('getmatches()'))
-
-    -- Check that "matchdelete()" deletes the matches defined in the previous
-    -- test correctly.
-    command("call matchdelete(m1)")
-    command("call matchdelete(m2)")
-    command("call matchdelete(m3)")
-    eq({}, eval('getmatches()'))
-
-    --- Check that "matchdelete()" returns 0 if successful and otherwise -1.
-    command("let m = matchadd('MyGroup1', 'TODO')")
-    eq(0, eval('matchdelete(m)'))
-
-    -- matchdelete throws error and returns -1 on failure
-    neq(true, pcall(function() eval('matchdelete(42)') end))
-    eq('Vim(let):E803: ID not found: 42', pcall_err(command, 'let r2 = matchdelete(42)'))
-
-    -- Check that "clearmatches()" clears all matches defined by ":match" and
-    -- "matchadd()".
-    command("let m1 = matchadd('MyGroup1', 'TODO')")
-    command("let m2 = matchadd('MyGroup2', 'FIXME', 42)")
-    command("let m3 = matchadd('MyGroup3', 'XXX', 60, 17)")
-    command("match MyGroup1 /COFFEE/")
-    command("2match MyGroup2 /HUMPPA/")
-    command("3match MyGroup3 /VIM/")
-    command("call clearmatches()")
-    eq({}, eval('getmatches()'))
-
-    -- Check that "setmatches()" restores a list of matches saved by
-    -- "getmatches()" without changes. (Matches with equal priority must also
-    -- remain in the same order.)
-    command("let m1 = matchadd('MyGroup1', 'TODO')")
-    command("let m2 = matchadd('MyGroup2', 'FIXME', 42)")
-    command("let m3 = matchadd('MyGroup3', 'XXX', 60, 17)")
-    command("match MyGroup1 /COFFEE/")
-    command("2match MyGroup2 /HUMPPA/")
-    command("3match MyGroup3 /VIM/")
-    command("let ml = getmatches()")
-    local ml = eval("ml")
-    command("call clearmatches()")
-    command("call setmatches(ml)")
-    eq(ml, eval('getmatches()'))
-
-    -- Check that "setmatches()" can correctly restore the matches from matchaddpos()
-    command("call clearmatches()")
-    command("call setmatches(ml)")
-    eq(ml, eval('getmatches()'))
-
-    -- Check that "setmatches()" will not add two matches with the same ID. The
-    -- expected behaviour (for now) is to add the first match but not the
-    -- second and to return -1.
-    eq('Vim(let):E801: ID already taken: 1',
-       pcall_err(command, "let r1 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}])"))
-    eq({{group = 'MyGroup1', pattern = 'TODO', priority = 10, id = 1}}, eval('getmatches()'))
-
-    -- Check that "setmatches()" returns 0 if successful and otherwise -1.
-    -- (A range of valid and invalid input values are tried out to generate the
-    -- return values.)
-    eq(0,eval("setmatches([])"))
-    eq(0,eval("setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}])"))
-    command("call clearmatches()")
-    eq('Vim(let):E714: List required', pcall_err(command, 'let rf1 = setmatches(0)'))
-    eq('Vim(let):E474: List item 0 is either not a dictionary or an empty one',
-       pcall_err(command, 'let rf2 = setmatches([0])'))
-    eq('Vim(let):E474: List item 0 is missing one of the required keys',
-       pcall_err(command, "let rf3 = setmatches([{'wrong key': 'wrong value'}])"))
 
     -- Check that "matchaddpos()" positions matches correctly
     insert('abcdefghijklmnopq')
-- 
cgit 


From 0643645d5c9e34f7c385925b98bbcf8f64260385 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 2 Oct 2022 16:32:33 +0800
Subject: fix(folds): fix fold marker multibyte comparison (#20439)

---
 test/functional/ui/fold_spec.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua
index 6bb8bb81c6..3c143d87ca 100644
--- a/test/functional/ui/fold_spec.lua
+++ b/test/functional/ui/fold_spec.lua
@@ -4,6 +4,7 @@ local clear, feed, eq = helpers.clear, helpers.feed, helpers.eq
 local command = helpers.command
 local feed_command = helpers.feed_command
 local insert = helpers.insert
+local expect = helpers.expect
 local funcs = helpers.funcs
 local meths = helpers.meths
 local source = helpers.source
@@ -1911,4 +1912,19 @@ describe("folded lines", function()
     command('%delete')
     eq(0, funcs.foldlevel(1))
   end)
+
+  it('multibyte fold markers work #20438', function()
+    meths.win_set_option(0, 'foldmethod', 'marker')
+    meths.win_set_option(0, 'foldmarker', '«,»')
+    insert([[
+      bbbbb
+      bbbbb
+      bbbbb]])
+    feed('zfgg')
+    expect([[
+      bbbbb/*«*/
+      bbbbb
+      bbbbb/*»*/]])
+    eq(1, funcs.foldlevel(1))
+  end)
 end)
-- 
cgit 


From 71497c164db3180bbec539765f987b483662f73f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 4 Oct 2022 07:31:06 +0800
Subject: test: add test for :function followed by <lambda>

---
 test/functional/vimscript/eval_spec.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'test')

diff --git a/test/functional/vimscript/eval_spec.lua b/test/functional/vimscript/eval_spec.lua
index d4fa7afe89..1fbdedb815 100644
--- a/test/functional/vimscript/eval_spec.lua
+++ b/test/functional/vimscript/eval_spec.lua
@@ -17,6 +17,7 @@ local clear = helpers.clear
 local eq = helpers.eq
 local exc_exec = helpers.exc_exec
 local exec = helpers.exec
+local exec_capture = helpers.exec_capture
 local eval = helpers.eval
 local command = helpers.command
 local write_file = helpers.write_file
@@ -247,3 +248,16 @@ describe("uncaught exception", function()
     eq('123', eval('result'))
   end)
 end)
+
+describe('lambda function', function()
+  before_each(clear)
+
+  it('can be shown using :function followed by <lambda> #20466', function()
+    command('let A = {-> 1}')
+    local num = exec_capture('echo A'):match("function%('<lambda>(%d+)'%)")
+    eq(([[
+   function <lambda>%s(...)
+1  return 1
+   endfunction]]):format(num), exec_capture(('function <lambda>%s'):format(num)))
+  end)
+end)
-- 
cgit 


From 28fbdd338586e066aa3e540333513b04c54361bc Mon Sep 17 00:00:00 2001
From: Shougo <Shougo.Matsu@gmail.com>
Date: Tue, 4 Oct 2022 22:22:42 +0900
Subject: fix(ui): msg_ext_set_kind for nvim_echo (#20476)

---
 test/functional/ui/messages_spec.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 6b8fa99b38..d6dfcf2aa9 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -869,7 +869,7 @@ stack traceback:
       {1:~                        }|
       {1:~                        }|
     ]], messages={
-      { content = { { "wow, ", 7 }, { "such\n\nvery ", 2 }, { "color", 10 } }, kind = "" }
+      { content = { { "wow, ", 7 }, { "such\n\nvery ", 2 }, { "color", 10 } }, kind = "echomsg" }
     }}
 
     feed ':ls<cr>'
@@ -880,7 +880,7 @@ stack traceback:
       {1:~                        }|
       {1:~                        }|
     ]], messages={
-      { content = { { '\n  1 %a   "[No Name]"                    line 1' } }, kind = "echomsg" }
+      { content = { { '\n  1 %a   "[No Name]"                    line 1' } }, kind = "" }
     }}
 
     feed ':messages<cr>'
-- 
cgit 


From 088abbeb6e6aecfc34b42db9b8d1396f493a2466 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 29 Sep 2022 13:46:44 +0200
Subject: feat(docs): nested lists in HTML, update :help parser

- Docs HTML: improvements in https://github.com/neovim/tree-sitter-vimdoc
  allow us to many hacks in `gen_help_html.lua`.
- Docs HTML: support nested lists.
- Docs HTML: avoid extra newlines (too much whitespace) in old
  (preformatted) layout.
- Docs HTML: disable golden-grid for narrow viewport.
- Workaround for https://github.com/neovim/neovim/issues/20404

closes https://github.com/neovim/neovim/issues/20404
---
 test/functional/lua/help_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/lua/help_spec.lua b/test/functional/lua/help_spec.lua
index a00aaea9d2..6743648819 100644
--- a/test/functional/lua/help_spec.lua
+++ b/test/functional/lua/help_spec.lua
@@ -21,7 +21,7 @@ describe(':help docs', function()
     ok(rv.helpfiles > 100, '>100 :help files', rv.helpfiles)
     -- Check that parse errors did not increase wildly.
     -- TODO: Fix all parse errors in :help files.
-    ok(rv.err_count < 250, '<250 parse errors', rv.err_count)
+    ok(rv.err_count < 280, '<280 parse errors', rv.err_count)
     eq({}, rv.invalid_links, exec_lua([[return 'found invalid :help tag links:\n'..vim.inspect(...)]], rv.invalid_links))
   end)
 
-- 
cgit 


From ddc363dce9020bce7d5bd931929f0d11cc87ad6d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 4 Oct 2022 21:52:01 +0800
Subject: vim-patch:9.0.0656: cannot specify another character to use instead
 of '@'

Problem:    Cannot specify another character to use instead of '@' at the end
            of the window.
Solution:   Add "lastline" to 'fillchars'. (Martin Tournoij, closes vim/vim#11264,
            closes vim/vim#10963)
https://github.com/vim/vim/commit/4ba5f1dab656103e8f4a4505452d1816b9e83c1e

Use latest code in drawscreen.c instead.
---
 test/functional/legacy/display_spec.lua | 88 +++++++++++++++++++++++----------
 1 file changed, 61 insertions(+), 27 deletions(-)

(limited to 'test')

diff --git a/test/functional/legacy/display_spec.lua b/test/functional/legacy/display_spec.lua
index f0ffaf2c48..28dbb4bc2e 100644
--- a/test/functional/legacy/display_spec.lua
+++ b/test/functional/legacy/display_spec.lua
@@ -9,6 +9,7 @@ local command = helpers.command
 describe('display', function()
   before_each(clear)
 
+  -- oldtest: Test_display_scroll_at_topline()
   it('scroll when modified at topline vim-patch:8.2.1488', function()
     local screen = Screen.new(20, 4)
     screen:attach()
@@ -26,6 +27,7 @@ describe('display', function()
     ]])
   end)
 
+  -- oldtest: Test_display_scroll_update_visual()
   it('scrolling when modified at topline in Visual mode vim-patch:8.2.4626', function()
     local screen = Screen.new(60, 8)
     screen:attach()
@@ -56,8 +58,8 @@ describe('display', function()
     ]])
   end)
 
-  it('@@@ in the last line shows correctly in a narrow window vim-patch:8.2.4718', function()
-    local screen = Screen.new(60, 10)
+  local function run_test_display_lastline(euro)
+    local screen = Screen.new(75, 10)
     screen:set_default_attr_ids({
       [1] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
       [2] = {bold = true, reverse = true},  -- StatusLine
@@ -65,39 +67,71 @@ describe('display', function()
     })
     screen:attach()
     exec([[
-      call setline(1, ['aaa', 'b'->repeat(100)])
+      call setline(1, ['aaa', 'b'->repeat(200)])
       set display=truncate
+
       vsplit
       100wincmd <
     ]])
-    screen:expect([[
-      ^a│aaa                                                       |
-      a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
-      a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                |
-      b│{1:~                                                         }|
-      b│{1:~                                                         }|
-      b│{1:~                                                         }|
-      b│{1:~                                                         }|
-      {1:@}│{1:~                                                         }|
-      {2:< }{3:[No Name] [+]                                             }|
-                                                                  |
-    ]])
+    local fillchar = '@'
+    if euro then
+      command('set fillchars=lastline:€')
+      fillchar = '€'
+    end
+    screen:expect((([[
+      ^a│aaa                                                                      |
+      a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      b│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                   |
+      b│{1:~                                                                        }|
+      b│{1:~                                                                        }|
+      b│{1:~                                                                        }|
+      {1:@}│{1:~                                                                        }|
+      {2:< }{3:[No Name] [+]                                                            }|
+                                                                                 |
+    ]]):gsub('@', fillchar)))
+
     command('set display=lastline')
     screen:expect_unchanged()
+
     command('100wincmd >')
-    screen:expect([[
-      ^aaa                                                       │a|
-      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
-      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                │a|
-      {1:~                                                         }│b|
-      {1:~                                                         }│b|
-      {1:~                                                         }│b|
-      {1:~                                                         }│b|
-      {1:~                                                         }│{1:@}|
-      {2:[No Name] [+]                                              }{3:<}|
-                                                                  |
-    ]])
+    screen:expect((([[
+      ^aaa                                                                      │a|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                   │b|
+      {1:~                                                                        }│b|
+      {1:~                                                                        }│b|
+      {1:~                                                                        }│b|
+      {1:~                                                                        }│{1:@}|
+      {2:[No Name] [+]                                                             }{3:<}|
+                                                                                 |
+    ]]):gsub('@', fillchar)))
+
     command('set display=truncate')
     screen:expect_unchanged()
+
+    command('close')
+    command('3split')
+    screen:expect((([[
+      ^aaa                                                                        |
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      {1:@@@                                                                        }|
+      {2:[No Name] [+]                                                              }|
+      aaa                                                                        |
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                         |
+      {3:[No Name] [+]                                                              }|
+                                                                                 |
+    ]]):gsub('@', fillchar)))
+  end
+
+  -- oldtest: Test_display_lastline()
+  it('display "lastline" works correctly', function()
+    run_test_display_lastline()
+  end)
+  it('display "lastline" works correctly with multibyte fillchar', function()
+    run_test_display_lastline(true)
   end)
 end)
-- 
cgit 


From 98bb2c19309ced1131afce4fc2cdae518d0a2dcd Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 5 Oct 2022 06:48:40 +0800
Subject: vim-patch:9.0.0661: multi-byte "lastline" in 'fillchars' does not
 work properly

Problem:    Multi-byte "lastline" item in 'fillchars' does not work properly
            when the window is two columns wide.
Solution:   Compute the text length correctly. (closes vim/vim#11280)
https://github.com/vim/vim/commit/18b3500b8c517e44c23197e558aa36aed1c6916c
---
 test/functional/legacy/display_spec.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'test')

diff --git a/test/functional/legacy/display_spec.lua b/test/functional/legacy/display_spec.lua
index 28dbb4bc2e..9160129a02 100644
--- a/test/functional/legacy/display_spec.lua
+++ b/test/functional/legacy/display_spec.lua
@@ -125,6 +125,21 @@ describe('display', function()
       {3:[No Name] [+]                                                              }|
                                                                                  |
     ]]):gsub('@', fillchar)))
+
+    command('close')
+    command('2vsplit')
+    screen:expect((([[
+      ^aa│aaa                                                                     |
+      a │bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      bb│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      bb│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                |
+      bb│{1:~                                                                       }|
+      bb│{1:~                                                                       }|
+      bb│{1:~                                                                       }|
+      {1:@@}│{1:~                                                                       }|
+      {2:<  }{3:[No Name] [+]                                                           }|
+                                                                                 |
+    ]]):gsub('@', fillchar)))
   end
 
   -- oldtest: Test_display_lastline()
-- 
cgit 


From fc1f84c4c57ba0ba284b0652d412b0402ef928a7 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Wed, 5 Oct 2022 11:23:11 +0200
Subject: test(api): migrate screenchar() test in in window API to screen test

This produces actual output in case of regressions.
---
 test/functional/api/window_spec.lua | 106 +++++++++++++++++++++++++-----------
 1 file changed, 74 insertions(+), 32 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index 901d24327c..7c65cf9c37 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -15,25 +15,6 @@ local command = helpers.command
 local pcall_err = helpers.pcall_err
 local assert_alive = helpers.assert_alive
 
--- check if str is visible at the beginning of some line
-local function is_visible(str)
-    local slen = string.len(str)
-    local nlines = eval("&lines")
-    for i = 1,nlines do
-        local iseq = true
-        for j = 1,slen do
-            if string.byte(str,j) ~= eval("screenchar("..i..","..j..")") then
-                iseq = false
-                break
-            end
-        end
-        if iseq then
-            return true
-        end
-    end
-    return false
-end
-
 describe('API/win', function()
   before_each(clear)
 
@@ -79,27 +60,61 @@ describe('API/win', function()
     end)
 
     it('updates the screen, and also when the window is unfocused', function()
+      local screen = Screen.new(30, 9)
+      screen:set_default_attr_ids({
+        [1] = {bold = true, foreground = Screen.colors.Blue},
+        [2] = {bold = true, reverse = true};
+        [3] = {reverse = true};
+      })
+      screen:attach()
+
       insert("prologue")
       feed('100o<esc>')
       insert("epilogue")
       local win = curwin()
       feed('gg')
-      poke_eventloop() -- let nvim process the 'gg' command
 
+      screen:expect{grid=[[
+        ^prologue                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+      ]]}
       -- cursor position is at beginning
       eq({1, 0}, window('get_cursor', win))
-      eq(true, is_visible("prologue"))
-      eq(false, is_visible("epilogue"))
 
       -- move cursor to end
       window('set_cursor', win, {101, 0})
-      eq(false, is_visible("prologue"))
-      eq(true, is_visible("epilogue"))
+      screen:expect{grid=[[
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+        ^epilogue                      |
+                                      |
+      ]]}
 
       -- move cursor to the beginning again
       window('set_cursor', win, {1, 0})
-      eq(true, is_visible("prologue"))
-      eq(false, is_visible("epilogue"))
+      screen:expect{grid=[[
+        ^prologue                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+                                      |
+      ]]}
 
       -- move focus to new window
       nvim('command',"new")
@@ -107,18 +122,45 @@ describe('API/win', function()
 
       -- sanity check, cursor position is kept
       eq({1, 0}, window('get_cursor', win))
-      eq(true, is_visible("prologue"))
-      eq(false, is_visible("epilogue"))
+      screen:expect{grid=[[
+        ^                              |
+        {1:~                             }|
+        {1:~                             }|
+        {2:[No Name]                     }|
+        prologue                      |
+                                      |
+                                      |
+        {3:[No Name] [+]                 }|
+                                      |
+      ]]}
 
       -- move cursor to end
       window('set_cursor', win, {101, 0})
-      eq(false, is_visible("prologue"))
-      eq(true, is_visible("epilogue"))
+      screen:expect{grid=[[
+        ^                              |
+        {1:~                             }|
+        {1:~                             }|
+        {2:[No Name]                     }|
+                                      |
+                                      |
+        epilogue                      |
+        {3:[No Name] [+]                 }|
+                                      |
+      ]]}
 
       -- move cursor to the beginning again
       window('set_cursor', win, {1, 0})
-      eq(true, is_visible("prologue"))
-      eq(false, is_visible("epilogue"))
+      screen:expect{grid=[[
+        ^                              |
+        {1:~                             }|
+        {1:~                             }|
+        {2:[No Name]                     }|
+        prologue                      |
+                                      |
+                                      |
+        {3:[No Name] [+]                 }|
+                                      |
+      ]]}
 
       -- curwin didn't change back
       neq(win, curwin())
-- 
cgit 


From 9d8546e0c515f6ed2f45525ed79c7a98ac9d135d Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Wed, 5 Oct 2022 12:29:37 +0200
Subject: test(shada): fix shada syntax definitions test

These tests contained errors due to synstack() and friends do not ensure
syntax state is fully synced. Actually expecting what the user will
see with a screen test does ensure it is fully synced.
---
 test/functional/plugin/shada_spec.lua | 71 ++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/test/functional/plugin/shada_spec.lua b/test/functional/plugin/shada_spec.lua
index 6f22f865e6..dda8077f05 100644
--- a/test/functional/plugin/shada_spec.lua
+++ b/test/functional/plugin/shada_spec.lua
@@ -1,4 +1,5 @@
 local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
 local eq, meths, nvim_eval, nvim_command, nvim, exc_exec, funcs, nvim_feed, curbuf =
   helpers.eq, helpers.meths, helpers.eval, helpers.command, helpers.nvim, helpers.exc_exec,
@@ -2538,13 +2539,26 @@ describe('ftplugin/shada.vim', function()
 end)
 
 describe('syntax/shada.vim', function()
-  local epoch = os.date('%Y-%m-%dT%H:%M:%S', 0)
+  local epoch = os.date('!%Y-%m-%dT%H:%M:%S', 0)
   before_each(reset)
 
   it('works', function()
     nvim_command('syntax on')
     nvim_command('setlocal syntax=shada')
     nvim_command('set laststatus&')
+    local screen = Screen.new(60, 37)
+    screen:set_default_attr_ids {
+      [1] = {bold = true, foreground = Screen.colors.Brown};
+      [2] = {foreground = tonumber('0x6a0dad')};
+      [3] = {foreground = Screen.colors.Fuchsia};
+      [4] = {foreground = Screen.colors.Blue1};
+      [5] = {bold = true, foreground = Screen.colors.SeaGreen4};
+      [6] = {foreground = Screen.colors.SlateBlue};
+      [7] = {bold = true, reverse = true};
+      [8] = {bold = true, foreground = Screen.colors.Blue};
+    }
+    screen:attach()
+
     curbuf('set_lines', 0, 1, true, {
       'Header with timestamp ' .. epoch .. ':',
       '  % Key  Value',
@@ -2580,6 +2594,46 @@ describe('syntax/shada.vim', function()
       '  % Key  Description________  Value',
       '  + se   place cursor at end  TRUE',
     })
+    screen:expect{grid=[=[
+      {1:^Header} with timestamp 1970{1:-}01{1:-}01{1:T}00{1::}00{1::}00:                  |
+      {2:  % Key  Value}                                              |
+       {1: +} {3:t  }  {1:"}{3:test}{1:"}                                             |
+      {1:Jump} with timestamp 1970{1:-}01{1:-}01{1:T}00{1::}00{1::}00:                    |
+      {2:  % Key________  Description  Value}                         |
+       {1: +} {3:n          }  {4:name       }  {3:'A'}                           |
+       {1: +} {3:f          }  {4:file name  }  {1:["}{3:foo}{1:"]}                       |
+       {1: +} {3:l          }  {4:line number}  {3:2}                             |
+       {1: +} {3:c          }  {4:column     }  {3:-200}                          |
+      {1:Register} with timestamp 1970{1:-}01{1:-}01{1:T}00{1::}00{1::}00:                |
+      {2:  % Key  Description  Value}                                 |
+       {1: +} {3:rc }  {4:contents   }  {1:@}                                     |
+       {1: | -} {1:{"}{3:abcdefghijklmnopqrstuvwxyz}{1:":} {3:1.0}{1:}}                   |
+       {1: +} {3:rt }  {4:type       }  {1:CHARACTERWISE}                         |
+       {1: +} {3:rt }  {4:type       }  {1:LINEWISE}                              |
+       {1: +} {3:rt }  {4:type       }  {1:BLOCKWISE}                             |
+      {1:Replacement string} with timestamp 1970{1:-}01{1:-}01{1:T}00{1::}00{1::}00:      |
+      {2:  @ Description__________  Value}                            |
+       {1: -} {4::s replacement string}  {1:CMD}                              |
+       {1: -} {4::s replacement string}  {1:SEARCH}                           |
+       {1: -} {4::s replacement string}  {1:EXPR}                             |
+       {1: -} {4::s replacement string}  {1:INPUT}                            |
+       {1: -} {4::s replacement string}  {1:DEBUG}                            |
+      {1:Buffer list} with timestamp 1970{1:-}01{1:-}01{1:T}00{1::}00{1::}00:             |
+      {4:  # Expected array of maps}                                  |
+        = {1:[{="}{3:a}{1:":} {1:+(}{5:10}{1:)"}{3:ac}{6:\0}{3:df}{6:\n}{3:gi}{6:\"}{3:tt\.}{1:",} {1:TRUE:} {1:FALSE},} {1:[NIL,} {1:+(}{5:-}|
+      {5:10}{1:)""]]}                                                     |
+      {1:Buffer list} with timestamp 1970{1:-}01{1:-}01{1:T}00{1::}00{1::}00:             |
+      {2:  % Key  Description  Value}                                 |
+                                                                  |
+      {2:  % Key  Description  Value}                                 |
+      {1:Header} with timestamp 1970{1:-}01{1:-}01{1:T}00{1::}00{1::}00:                  |
+      {2:  % Key  Description________  Value}                         |
+       {1: +} {3:se }  {4:place cursor at end}  {1:TRUE}                          |
+      {8:~                                                           }|
+      {7:[No Name] [+]                                               }|
+                                                                  |
+    ]=]}
+
     nvim_command([[
       function GetSyntax()
         let lines = []
@@ -2613,7 +2667,7 @@ describe('syntax/shada.vim', function()
       year = htsnum(os.date('%Y', 0)),
       month = htsnum(os.date('%m', 0)),
       day = htsnum(os.date('%d', 0)),
-      hour = htsnum(os.date('%H', 0)),
+      hour = htsnum(os.date('!%H', 0)),
       minute = htsnum(os.date('%M', 0)),
       second = htsnum(os.date('%S', 0)),
     }
@@ -2768,9 +2822,8 @@ describe('syntax/shada.vim', function()
         {{'ShaDaEntryArray', 'ShaDaMsgpackShaDaKeyword'}, 'INPUT'},
       },
       {
-        {{'ShaDaEntryArrayEntryStart'}, '  - '},
-        {{'ShaDaEntryArrayDescription'}, ':s replacement string  '},
-        {{'ShaDaMsgpackShaDaKeyword'}, 'DEBUG'},
+        as(), ad(':s replacement string  '),
+        {{'ShaDaEntryArray', 'ShaDaMsgpackShaDaKeyword'}, 'DEBUG'},
       },
       {
         hname('Buffer list'), h(' with timestamp '),
@@ -2872,10 +2925,10 @@ describe('syntax/shada.vim', function()
         mlh('  % Key  Description________  Value'),
       },
       {
-        {{'ShaDaEntryMapLongEntryStart'}, '  + '},
-        {{'ShaDaEntryMapLongKey'}, 'se   '},
-        {{'ShaDaEntryMapLongDescription'}, 'place cursor at end  '},
-        {{'ShaDaMsgpackKeyword'}, 'TRUE'},
+        mles('  + '),
+        mlk('se   '),
+        mld('place cursor at end  '),
+        {{'ShaDaEntryMapLong', 'ShaDaMsgpackKeyword'}, 'TRUE'},
       },
     }
     eq(exp, act)
-- 
cgit 


From 824a31cd0d55752b01a9bdd1f38f756e079e25e8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 5 Oct 2022 21:29:56 +0800
Subject: vim-patch:8.2.3885: arglist test fails

Problem:    Arglist test fails.
Solution:   Adjust for locking the arglist for ":all".
https://github.com/vim/vim/commit/679140c56bbabf12a199d94f584b1b9dfc9809fd
---
 test/functional/legacy/006_argument_list_spec.lua |  85 --------
 test/functional/legacy/arglist_spec.lua           | 228 ----------------------
 2 files changed, 313 deletions(-)
 delete mode 100644 test/functional/legacy/006_argument_list_spec.lua

(limited to 'test')

diff --git a/test/functional/legacy/006_argument_list_spec.lua b/test/functional/legacy/006_argument_list_spec.lua
deleted file mode 100644
index d269bf8ec9..0000000000
--- a/test/functional/legacy/006_argument_list_spec.lua
+++ /dev/null
@@ -1,85 +0,0 @@
--- Test for autocommand that redefines the argument list, when doing ":all".
-
-local helpers = require('test.functional.helpers')(after_each)
-local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
-local command, dedent, eq = helpers.command, helpers.dedent, helpers.eq
-local curbuf_contents = helpers.curbuf_contents
-local poke_eventloop = helpers.poke_eventloop
-
-describe('argument list', function()
-  setup(clear)
-
-  it('is working', function()
-    insert([[
-      start of test file Xxx
-          this is a test
-          this is a test
-          this is a test
-          this is a test
-      end of test file Xxx]])
-    poke_eventloop()
-
-    command('au BufReadPost Xxx2 next Xxx2 Xxx1')
-    command('/^start of')
-
-    -- Write test file Xxx1
-    feed('A1<Esc>:.,/end of/w! Xxx1<cr>')
-
-    -- Write test file Xxx2
-    feed('$r2:.,/end of/w! Xxx2<cr>')
-
-    -- Write test file Xxx3
-    feed('$r3:.,/end of/w! Xxx3<cr>')
-    poke_eventloop()
-
-    -- Redefine arglist; go to Xxx1
-    command('next! Xxx1 Xxx2 Xxx3')
-
-    -- Open window for all args
-    command('all')
-
-    -- Write contents of Xxx1
-    command('%yank A')
-
-    -- Append contents of last window (Xxx1)
-    feed('')
-    poke_eventloop()
-    command('%yank A')
-
-    -- should now be in Xxx2
-    command('rew')
-
-    -- Append contents of Xxx2
-    command('%yank A')
-
-    command('%d')
-    command('0put=@a')
-    command('$d')
-
-    eq(dedent([[
-      start of test file Xxx1
-          this is a test
-          this is a test
-          this is a test
-          this is a test
-      end of test file Xxx
-      start of test file Xxx1
-          this is a test
-          this is a test
-          this is a test
-          this is a test
-      end of test file Xxx
-      start of test file Xxx2
-          this is a test
-          this is a test
-          this is a test
-          this is a test
-      end of test file Xxx]]), curbuf_contents())
-  end)
-
-  teardown(function()
-    os.remove('Xxx1')
-    os.remove('Xxx2')
-    os.remove('Xxx3')
-  end)
-end)
diff --git a/test/functional/legacy/arglist_spec.lua b/test/functional/legacy/arglist_spec.lua
index 4d9e88c446..a15809907b 100644
--- a/test/functional/legacy/arglist_spec.lua
+++ b/test/functional/legacy/arglist_spec.lua
@@ -3,7 +3,6 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, command, eq = helpers.clear, helpers.command, helpers.eq
-local eval, exc_exec, neq = helpers.eval, helpers.exc_exec, helpers.neq
 local expect_exit = helpers.expect_exit
 local feed = helpers.feed
 local pcall_err = helpers.pcall_err
@@ -11,233 +10,6 @@ local pcall_err = helpers.pcall_err
 describe('argument list commands', function()
   before_each(clear)
 
-  local function init_abc()
-    command('args a b c')
-    command('next')
-  end
-
-  local function reset_arglist()
-    command('arga a | %argd')
-  end
-
-  local function assert_fails(cmd, err)
-    neq(nil, exc_exec(cmd):find(err))
-  end
-
-  it('test that argidx() works', function()
-    command('args a b c')
-    command('last')
-    eq(2, eval('argidx()'))
-    command('%argdelete')
-    eq(0, eval('argidx()'))
-
-    command('args a b c')
-    eq(0, eval('argidx()'))
-    command('next')
-    eq(1, eval('argidx()'))
-    command('next')
-    eq(2, eval('argidx()'))
-    command('1argdelete')
-    eq(1, eval('argidx()'))
-    command('1argdelete')
-    eq(0, eval('argidx()'))
-    command('1argdelete')
-    eq(0, eval('argidx()'))
-  end)
-
-  it('test that argadd() works', function()
-    command('%argdelete')
-    command('argadd a b c')
-    eq(0, eval('argidx()'))
-
-    command('%argdelete')
-    command('argadd a')
-    eq(0, eval('argidx()'))
-    command('argadd b c d')
-    eq(0, eval('argidx()'))
-
-    init_abc()
-    command('argadd x')
-    eq({'a', 'b', 'x', 'c'}, eval('argv()'))
-    eq(1, eval('argidx()'))
-
-    init_abc()
-    command('0argadd x')
-    eq({'x', 'a', 'b', 'c'}, eval('argv()'))
-    eq(2, eval('argidx()'))
-
-    init_abc()
-    command('1argadd x')
-    eq({'a', 'x', 'b', 'c'}, eval('argv()'))
-    eq(2, eval('argidx()'))
-
-    init_abc()
-    command('$argadd x')
-    eq({'a', 'b', 'c', 'x'}, eval('argv()'))
-    eq(1, eval('argidx()'))
-
-    init_abc()
-    command('$argadd x')
-    command('+2argadd y')
-    eq({'a', 'b', 'c', 'x', 'y'}, eval('argv()'))
-    eq(1, eval('argidx()'))
-
-    command('%argd')
-    command('edit d')
-    command('arga')
-    eq(1, eval('len(argv())'))
-    eq('d', eval('get(argv(), 0, "")'))
-
-    command('%argd')
-    command('new')
-    command('arga')
-    eq(0, eval('len(argv())'))
-  end)
-
-  it('test for 0argadd and 0argedit', function()
-    reset_arglist()
-
-    command('arga a b c d')
-    command('2argu')
-    command('0arga added')
-    eq({'added', 'a', 'b', 'c', 'd'}, eval('argv()'))
-
-    command('%argd')
-    command('arga a b c d')
-    command('2argu')
-    command('0arge edited')
-    eq({'edited', 'a', 'b', 'c', 'd'}, eval('argv()'))
-
-    command('2argu')
-    command('arga third')
-    eq({'edited', 'a', 'third', 'b', 'c', 'd'}, eval('argv()'))
-  end)
-
-  it('test for argc()', function()
-    reset_arglist()
-    eq(0, eval('argc()'))
-    command('argadd a b')
-    eq(2, eval('argc()'))
-  end)
-
-  it('test for arglistid()', function()
-    reset_arglist()
-    command('arga a b')
-    eq(0, eval('arglistid()'))
-    command('split')
-    command('arglocal')
-    eq(1, eval('arglistid()'))
-    command('tabnew | tabfirst')
-    eq(0, eval('arglistid(2)'))
-    eq(1, eval('arglistid(1, 1)'))
-    eq(0, eval('arglistid(2, 1)'))
-    eq(1, eval('arglistid(1, 2)'))
-    command('tabonly | only | enew!')
-    command('argglobal')
-    eq(0, eval('arglistid()'))
-  end)
-
-  it('test for argv()', function()
-    reset_arglist()
-    eq({}, eval('argv()'))
-    eq('', eval('argv(2)'))
-    command('argadd a b c d')
-    eq('c', eval('argv(2)'))
-  end)
-
-  it('test for :argedit command', function()
-    reset_arglist()
-    command('argedit a')
-    eq({'a'}, eval('argv()'))
-    eq('a', eval('expand("%:t")'))
-    command('argedit b')
-    eq({'a', 'b'}, eval('argv()'))
-    eq('b', eval('expand("%:t")'))
-    command('argedit a')
-    eq({'a', 'b', 'a'}, eval('argv()'))
-    eq('a', eval('expand("%:t")'))
-    command('argedit c')
-    eq({'a', 'b', 'a', 'c'}, eval('argv()'))
-    command('0argedit x')
-    eq({'x', 'a', 'b', 'a', 'c'}, eval('argv()'))
-    command('set nohidden')
-    command('enew! | set modified')
-    assert_fails('argedit y', 'E37:')
-    command('argedit! y')
-    eq({'x', 'y', 'y', 'a', 'b', 'a', 'c'}, eval('argv()'))
-    command('set hidden')
-    command('%argd')
-    command('argedit a b')
-    eq({'a', 'b'}, eval('argv()'))
-  end)
-
-  it('test for :argdelete command', function()
-    reset_arglist()
-    command('args aa a aaa b bb')
-    command('argdelete a*')
-    eq({'b', 'bb'}, eval('argv()'))
-    eq('aa', eval('expand("%:t")'))
-    command('last')
-    command('argdelete %')
-    eq({'b'}, eval('argv()'))
-    assert_fails('argdelete', 'E610:')
-    assert_fails('1,100argdelete', 'E16:')
-    reset_arglist()
-    command('args a b c d')
-    command('next')
-    command('argdel')
-    eq({'a', 'c', 'd'}, eval('argv()'))
-    command('%argdel')
-  end)
-
-  it('test for the :next, :prev, :first, :last, :rewind commands', function()
-    reset_arglist()
-    command('args a b c d')
-    command('last')
-    eq(3, eval('argidx()'))
-    assert_fails('next', 'E165:')
-    command('prev')
-    eq(2, eval('argidx()'))
-    command('Next')
-    eq(1, eval('argidx()'))
-    command('first')
-    eq(0, eval('argidx()'))
-    assert_fails('prev', 'E164:')
-    command('3next')
-    eq(3, eval('argidx()'))
-    command('rewind')
-    eq(0, eval('argidx()'))
-    command('%argd')
-  end)
-
-  it('test for autocommand that redefines the argument list, when doing ":all"', function()
-    command('autocmd BufReadPost Xxx2 next Xxx2 Xxx1')
-    command("call writefile(['test file Xxx1'], 'Xxx1')")
-    command("call writefile(['test file Xxx2'], 'Xxx2')")
-    command("call writefile(['test file Xxx3'], 'Xxx3')")
-
-    command('new')
-    -- redefine arglist; go to Xxx1
-    command('next! Xxx1 Xxx2 Xxx3')
-    -- open window for all args
-    command('all')
-    eq('test file Xxx1', eval('getline(1)'))
-    command('wincmd w')
-    command('wincmd w')
-    eq('test file Xxx1', eval('getline(1)'))
-    -- should now be in Xxx2
-    command('rewind')
-    eq('test file Xxx2', eval('getline(1)'))
-
-    command('autocmd! BufReadPost Xxx2')
-    command('enew! | only')
-    command("call delete('Xxx1')")
-    command("call delete('Xxx2')")
-    command("call delete('Xxx3')")
-    command('argdelete Xxx*')
-    command('bwipe! Xxx1 Xxx2 Xxx3')
-  end)
-
   it('quitting Vim with unedited files in the argument list throws E173', function()
     command('set nomore')
     command('args a b c')
-- 
cgit 


From 6ae144a92171cf9ae52bddddc3a081a4efaabe9f Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Tue, 27 Sep 2022 16:19:15 +0200
Subject: feat(messages)!: graduate the 'msgsep' feature

The old behaviour (e.g. via `set display-=msgsep`) will not be available.
Assuming that messages always are being drawn on msg_grid
(or not drawn at all, and forwarded to `ext_messages` enabled UI)
will allows some simplifcations and enhancements moving forward.
---
 test/functional/core/fileio_spec.lua     |  2 +-
 test/functional/legacy/cmdline_spec.lua  | 77 --------------------------------
 test/functional/ui/cmdline_spec.lua      | 66 +--------------------------
 test/functional/ui/embed_spec.lua        | 14 ------
 test/functional/ui/highlight_spec.lua    | 11 -----
 test/functional/ui/messages_spec.lua     | 22 ---------
 test/functional/ui/screen_basic_spec.lua | 61 +------------------------
 test/functional/ui/wildmode_spec.lua     | 42 +----------------
 8 files changed, 4 insertions(+), 291 deletions(-)

(limited to 'test')

diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua
index a589d088a4..d1ff5b8036 100644
--- a/test/functional/core/fileio_spec.lua
+++ b/test/functional/core/fileio_spec.lua
@@ -166,7 +166,7 @@ describe('fileio', function()
       [3] = {bold = true, foreground = Screen.colors.SeaGreen4}
     })
     screen:attach()
-    command("set display-=msgsep shortmess-=F")
+    command("set shortmess-=F")
 
     command("e Xtest-overwrite-forced")
     screen:expect([[
diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 49e3825693..88912b9cd4 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -172,83 +172,6 @@ describe('cmdline', function()
                                     |
     ]])
   end)
-
-  -- oldtest: Test_redrawstatus_in_autocmd()
-  it(':redrawstatus in cmdline mode', function()
-    local screen = Screen.new(60, 8)
-    screen:set_default_attr_ids({
-      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
-      [1] = {bold = true, reverse = true},  -- MsgSeparator, StatusLine
-    })
-    screen:attach()
-    exec([[
-      set laststatus=2
-      set statusline=%=:%{getcmdline()}
-      autocmd CmdlineChanged * redrawstatus
-      set display-=msgsep
-    ]])
-    -- :redrawstatus is postponed if messages have scrolled
-    feed([[:echo "one\ntwo\nthree\nfour"<CR>]])
-    feed(':foobar')
-    screen:expect([[
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {1:                               :echo "one\ntwo\nthree\nfour"}|
-      one                                                         |
-      two                                                         |
-      three                                                       |
-      four                                                        |
-      :foobar^                                                     |
-    ]])
-    -- it is not postponed if messages have not scrolled
-    feed('<Esc>:for in in range(3)')
-    screen:expect([[
-                                                                  |
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {1:                                         :for in in range(3)}|
-      :for in in range(3)^                                         |
-    ]])
-    -- with cmdheight=1 messages have scrolled when typing :endfor
-    feed('<CR>:endfor')
-    screen:expect([[
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {1:                                         :for in in range(3)}|
-      :for in in range(3)                                         |
-      :  :endfor^                                                  |
-    ]])
-    feed('<CR>:set cmdheight=2<CR>')
-    -- with cmdheight=2 messages haven't scrolled when typing :for or :endfor
-    feed(':for in in range(3)')
-    screen:expect([[
-                                                                  |
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {1:                                         :for in in range(3)}|
-      :for in in range(3)^                                         |
-                                                                  |
-    ]])
-    feed('<CR>:endfor')
-    screen:expect([[
-                                                                  |
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {1:                                                    ::endfor}|
-      :for in in range(3)                                         |
-      :  :endfor^                                                  |
-    ]])
-  end)
 end)
 
 describe('cmdwin', function()
diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index 1528b5307d..8003947078 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -822,7 +822,7 @@ describe('statusline is redrawn on entering cmdline', function()
     ]]}
   end)
 
-  it('with scrolled messages and msgsep', function()
+  it('with scrolled messages', function()
     screen:try_resize(35,14)
     exec([[
       let g:count = 0
@@ -904,70 +904,6 @@ describe('statusline is redrawn on entering cmdline', function()
     ]]}
   end)
 
-  it('but not with scrolled messages without msgsep', function()
-    screen:try_resize(35,10)
-    exec([[
-      let g:count = 0
-      autocmd CmdlineEnter * let g:count += 1
-      set display-=msgsep
-      set statusline=%{mode()}%{g:count}
-    ]])
-    feed(':echoerr doesnotexist<cr>')
-    screen:expect{grid=[[
-      {1:~                                  }|
-      {1:~                                  }|
-      {1:~                                  }|
-      {1:~                                  }|
-      {1:~                                  }|
-      {3:c1                                 }|
-      {4:E121: Undefined variable: doesnotex}|
-      {4:ist}                                |
-      {5:Press ENTER or type command to cont}|
-      {5:inue}^                               |
-    ]]}
-    feed(':echoerr doesnotexist<cr>')
-    screen:expect{grid=[[
-      {1:~                                  }|
-      {1:~                                  }|
-      {3:c1                                 }|
-      {4:E121: Undefined variable: doesnotex}|
-      {4:ist}                                |
-      {5:Press ENTER or type command to cont}|
-      {4:E121: Undefined variable: doesnotex}|
-      {4:ist}                                |
-      {5:Press ENTER or type command to cont}|
-      {5:inue}^                               |
-    ]]}
-
-    feed(':echoerr doesnotexist<cr>')
-    screen:expect{grid=[[
-      {4:E121: Undefined variable: doesnotex}|
-      {4:ist}                                |
-      {5:Press ENTER or type command to cont}|
-      {4:E121: Undefined variable: doesnotex}|
-      {4:ist}                                |
-      {5:Press ENTER or type command to cont}|
-      {4:E121: Undefined variable: doesnotex}|
-      {4:ist}                                |
-      {5:Press ENTER or type command to cont}|
-      {5:inue}^                               |
-    ]]}
-
-    feed('<cr>')
-    screen:expect{grid=[[
-      ^                                   |
-      {1:~                                  }|
-      {1:~                                  }|
-      {1:~                                  }|
-      {1:~                                  }|
-      {1:~                                  }|
-      {1:~                                  }|
-      {1:~                                  }|
-      {3:n3                                 }|
-                                         |
-    ]]}
-  end)
-
   describe('if custom statusline is set by', function()
     before_each(function()
       command('set statusline=')
diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua
index 92f5beebf5..e7addd1b85 100644
--- a/test/functional/ui/embed_spec.lua
+++ b/test/functional/ui/embed_spec.lua
@@ -82,20 +82,6 @@ local function test_embed(ext_linegrid)
       eq(Screen.colors.Green, screen.default_colors.rgb_bg)
     end}
   end)
-
-  it("set display-=msgsep before first redraw", function()
-    startup('--cmd', 'set display-=msgsep')
-    screen:expect{grid=[[
-      ^                                                            |
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
-                                                                  |
-    ]]}
-  end)
 end
 
 describe('--embed UI on startup (ext_linegrid=true)', function() test_embed(true) end)
diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index 5ffe9ddaad..504a38d591 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -1560,17 +1560,6 @@ describe("MsgSeparator highlight and msgsep fillchar", function()
         1 %a   "[No Name]"                    line 1    |
       {3:Press ENTER or type command to continue}^           |
     ]])
-
-    -- when display doesn't contain msgsep, these options have no effect
-    feed_command("set display-=msgsep")
-    feed_command("ls")
-    screen:expect([[
-      {1:~                                                 }|
-      {1:~                                                 }|
-      :ls                                               |
-        1 %a   "[No Name]"                    line 1    |
-      {3:Press ENTER or type command to continue}^           |
-    ]])
   end)
 
   it("and MsgArea", function()
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index d6dfcf2aa9..0898d7fe75 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -1200,28 +1200,6 @@ vimComment     xxx match /\s"[^\-:.%#=*].*$/ms=s+1,lc=1  excludenl contains=@vim
   it('prints lines in Ex mode correctly with a burst of carriage returns #19341', function()
     command('set number')
     meths.buf_set_lines(0, 0, 0, true, {'aaa', 'bbb', 'ccc'})
-    command('set display-=msgsep')
-    feed('gggQ<CR><CR>1<CR><CR>vi')
-    screen:expect([[
-      Entering Ex mode.  Type "visual" to go to Normal mode.      |
-      {11:  2 }bbb                                                     |
-      {11:  3 }ccc                                                     |
-      :1                                                          |
-      {11:  1 }aaa                                                     |
-      {11:  2 }bbb                                                     |
-      :vi^                                                         |
-    ]])
-    feed('<CR>')
-    screen:expect([[
-      {11:  1 }aaa                                                     |
-      {11:  2 }^bbb                                                     |
-      {11:  3 }ccc                                                     |
-      {11:  4 }                                                        |
-      {1:~                                                           }|
-      {1:~                                                           }|
-                                                                  |
-    ]])
-    command('set display+=msgsep')
     feed('gggQ<CR><CR>1<CR><CR>vi')
     screen:expect([[
       Entering Ex mode.  Type "visual" to go to Normal mode.      |
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index 6c872e52d3..58c8238c35 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -682,30 +682,7 @@ local function screen_tests(linegrid)
       ]])
     end)
 
-    it('execute command with multi-line output without msgsep', function()
-      command("set display-=msgsep")
-      feed(':ls<cr>')
-      screen:expect([[
-        {0:~                                                    }|
-        {0:~                                                    }|
-        {0:~                                                    }|
-        {0:~                                                    }|
-        {0:~                                                    }|
-        {0:~                                                    }|
-        {0:~                                                    }|
-        {0:~                                                    }|
-        {0:~                                                    }|
-        {0:~                                                    }|
-        {0:~                                                    }|
-        :ls                                                  |
-          1 %a   "[No Name]"                    line 1       |
-        {7:Press ENTER or type command to continue}^              |
-      ]])
-      feed('<cr>') --  skip the "Press ENTER..." state or tests will hang
-    end)
-
-    it('execute command with multi-line output and with msgsep', function()
-      command("set display+=msgsep")
+    it('execute command with multi-line output', function()
       feed(':ls<cr>')
       screen:expect([[
                                                              |
@@ -1050,39 +1027,3 @@ describe('Screen default colors', function()
     end}
   end)
 end)
-
-
-describe('screen with msgsep deactivated on startup', function()
-  local screen
-
-  before_each(function()
-    clear('--cmd', 'set display-=msgsep')
-    screen = Screen.new()
-    screen:attach()
-    screen:set_default_attr_ids {
-      [0] = {bold=true, foreground=255};
-      [7] = {bold = true, foreground = Screen.colors.SeaGreen};
-    }
-  end)
-
-  it('execute command with multi-line output', function()
-    feed ':ls<cr>'
-    screen:expect([[
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      :ls                                                  |
-        1 %a   "[No Name]"                    line 1       |
-      {7:Press ENTER or type command to continue}^              |
-    ]])
-    feed '<cr>'  -- skip the "Press ENTER..." state or tests will hang
-  end)
-end)
diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua
index 58ffa3bda8..f1e818119e 100644
--- a/test/functional/ui/wildmode_spec.lua
+++ b/test/functional/ui/wildmode_spec.lua
@@ -184,11 +184,10 @@ describe("'wildmenu'", function()
     screen:expect_unchanged()
   end)
 
-  it('wildmode=list,full and display+=msgsep interaction #10092', function()
+  it('wildmode=list,full and messages interaction #10092', function()
     -- Need more than 5 rows, else tabline is covered and will be redrawn.
     screen:try_resize(25, 7)
 
-    command('set display+=msgsep')
     command('set wildmenu wildmode=list,full')
     command('set showtabline=2')
     feed(':set wildm<tab>')
@@ -223,44 +222,6 @@ describe("'wildmenu'", function()
     ]])
   end)
 
-  it('wildmode=list,full and display-=msgsep interaction', function()
-    -- Need more than 5 rows, else tabline is covered and will be redrawn.
-    screen:try_resize(25, 7)
-
-    command('set display-=msgsep')
-    command('set wildmenu wildmode=list,full')
-    feed(':set wildm<tab>')
-    screen:expect([[
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
-      :set wildm               |
-      wildmenu  wildmode       |
-      :set wildm^               |
-    ]])
-    feed('<tab>') -- trigger wildmode full
-    screen:expect([[
-      ~                        |
-      ~                        |
-      ~                        |
-      :set wildm               |
-      wildmenu  wildmode       |
-      wildmenu  wildmode       |
-      :set wildmenu^            |
-    ]])
-    feed('<Esc>')
-    screen:expect([[
-      ^                         |
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
-      ~                        |
-                               |
-    ]])
-  end)
-
   it('wildmode=longest,list', function()
     -- Need more than 5 rows, else tabline is covered and will be redrawn.
     screen:try_resize(25, 7)
@@ -365,7 +326,6 @@ describe("'wildmenu'", function()
     screen:try_resize(25, 7)
 
     command('set laststatus=2')
-    command('set display+=msgsep')
     feed(':set wildm')
     feed('<c-d>')
     screen:expect([[
-- 
cgit 


From bc64aa435b84bb3a43501e101c51507c75fbd349 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 6 Oct 2022 09:03:49 +0800
Subject: vim-patch:9.0.0665: setting 'cmdheight' has no effect if last window
 was resized (#20500)

Problem:    Setting 'cmdheight' has no effect if last window was resized.
Solution:   Do apply 'cmdheight' when told to.  Use the frame height instead
            of the cmdline_row.  (closes vim/vim#11286)
https://github.com/vim/vim/commit/0816f473ab2f6cf7d8311c0f97371cada7f20d18
---
 test/functional/legacy/cmdline_spec.lua | 41 +++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'test')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 88912b9cd4..e7f5c780dc 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -172,6 +172,47 @@ describe('cmdline', function()
                                     |
     ]])
   end)
+
+  it("setting 'cmdheight' works after outputting two messages vim-patch:9.0.0665", function()
+    local screen = Screen.new(60, 8)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {bold = true, reverse = true},  -- StatusLine
+    })
+    screen:attach()
+    exec([[
+      set cmdheight=1 laststatus=2
+      func EchoTwo()
+        set laststatus=2
+        set cmdheight=5
+        echo 'foo'
+        echo 'bar'
+        set cmdheight=1
+      endfunc
+    ]])
+    feed(':call EchoTwo()')
+    screen:expect([[
+                                                                  |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:[No Name]                                                   }|
+      :call EchoTwo()^                                             |
+    ]])
+    feed('<CR>')
+    screen:expect([[
+      ^                                                            |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:[No Name]                                                   }|
+                                                                  |
+    ]])
+  end)
 end)
 
 describe('cmdwin', function()
-- 
cgit 


From 5acf52e19b1f9920fe95b55588eff256a439d816 Mon Sep 17 00:00:00 2001
From: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date: Thu, 6 Oct 2022 08:57:52 +0200
Subject: feat(window/ui): add splitkeep option (#19243)

vim-patch:9.0.0445: when opening/closing window text moves up/down

Problem:    When opening/closing window text moves up/down.
Solution:   Add the 'splitscroll' option.  When off text will keep its
            position as much as possible.
https://github.com/vim/vim/commit/29ab524358ba429bcf6811710afc97a978641f0b

vim-patch:9.0.0455: a few problems with 'splitscroll'

Problem:    A few problems with 'splitscroll'.
Solution:   Fix 'splitscroll' problems. (Luuk van Baal, closes vim/vim#11117)
https://github.com/vim/vim/commit/5ed391708a62b4ebaa84dd23e32a416e5c3383d9

vim-patch:9.0.0461: 'scroll' is not always updated

Problem:    'scroll' is not always updated.
Solution:   Call win_init_size() at the right place.
https://github.com/vim/vim/commit/470a14140bc06f1653edf26ab0b3c9b801080353

vim-patch:9.0.0465: cursor moves when cmdwin is closed when 'splitscroll' is off

Problem:    Cursor moves when cmdwin is closed when 'splitscroll' is off.
Solution:   Temporarily set 'splitscroll' when jumping back to the original
            window. (closes vim/vim#11128)
https://github.com/vim/vim/commit/e697d488901b6321ddaad68b553f0a434c97d849

vim-patch:9.0.0469: cursor moves if cmdwin is closed when 'splitscroll' is off

Problem:    Cursor moves if cmdwin is closed when 'splitscroll' is off.
Solution:   Skip win_fix_cursor if called when cmdwin is open or closing.
            (Luuk van Baal, closes vim/vim#11134)
https://github.com/vim/vim/commit/3735f11050616652525bf80b4fbcb2b3bfeab113

vim-patch:9.0.0478: test for 'splitscroll' takes too much time

Problem:    Test for 'splitscroll' takes too much time.
Solution:   Only test some of the combinations. (Luuk van Baal, closes vim/vim#11139)
https://github.com/vim/vim/commit/594f9e09cd68e6277b8aa08094405bc642c5792a

vim-patch:9.0.0486: text scrolled with 'nosplitscroll', autocmd win and help

Problem:    Text scrolled with 'nosplitscroll', autocmd win opened and help
            window closed.
Solution:   Skip win_fix_scroll() in more situations. (Luuk van Baal,
            closes vim/vim#11150)
https://github.com/vim/vim/commit/d5bc762dea1fd32fa04342f8149f95ccfc3b9709

vim-patch:9.0.0505: various problems with 'nosplitscroll'

Problem:    Various problems with 'nosplitscroll'.
Solution:   Fix 'nosplitscroll' problems. (Luuk van Baal, closes vim/vim#11166)
https://github.com/vim/vim/commit/faf1d412f5e3665021500b528c0e7301eb02bf0b

vim-patch:9.0.0555: scrolling with 'nosplitscroll' in callback changing curwin

Problem:    Scrolling with 'nosplitscroll' in callback changing curwin.
Solution:   Invalidate w_cline_row in the right place. (Luuk van Baal,
            closes vim/vim#11185)
https://github.com/vim/vim/commit/20e58561abc4116f3bfbafaef242d886dd77b303

vim-patch:9.0.0603: with 'nosplitscroll' folds are not handled correctly

Problem:    With 'nosplitscroll' folds are not handled correctly.
Solution:   Take care of closed folds when moving the cursor. (Luuk van Baal,
            closes vim/vim#11234)
https://github.com/vim/vim/commit/7c1cbb6cd437c6e0c3ccc05840cc931108b4a60a

vim-patch:9.0.0605: dump file missing

Problem:    Dump file missing.
Solution:   Add the missing dump file. (issue vim/vim#11234)
https://github.com/vim/vim/commit/439a2ba1749463718b6ce1e1375b68c7b7cff808

vim-patch:9.0.0647: the 'splitscroll' option is not a good name

Problem:    The 'splitscroll' option is not a good name.
Solution:   Rename 'splitscroll' to 'splitkeep' and make it a string option,
            also supporting "topline". (Luuk van Baal, closes vim/vim#11258)
https://github.com/vim/vim/commit/13ece2ae1d09009d3fb8acf858c288e7848ecdac

vim-patch:9.0.0667: ml_get error when 'splitkeep' is "screen"

Problem:    ml_get error when 'splitkeep' is "screen". (Marius Gedminas)
Solution:   Check the botline is not too large. (Luuk van Baal,
            closes vim/vim#11293, closes vim/vim#11292)
https://github.com/vim/vim/commit/346823d3e5668b99d2c2fd920e7f215e21ad3ea7
---
 test/functional/legacy/window_cmd_spec.lua | 196 +++++++++++++++++++++++++++++
 1 file changed, 196 insertions(+)
 create mode 100644 test/functional/legacy/window_cmd_spec.lua

(limited to 'test')

diff --git a/test/functional/legacy/window_cmd_spec.lua b/test/functional/legacy/window_cmd_spec.lua
new file mode 100644
index 0000000000..8b89c55f5b
--- /dev/null
+++ b/test/functional/legacy/window_cmd_spec.lua
@@ -0,0 +1,196 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear = helpers.clear
+local exec = helpers.exec
+local exec_lua = helpers.exec_lua
+local feed = helpers.feed
+
+describe('splitkeep', function()
+  local screen = Screen.new()
+  before_each(function()
+    clear('--cmd', 'set splitkeep=screen')
+    screen:attach()
+  end)
+
+  -- oldtest: Test_splitkeep_callback()
+  it('does not scroll when split in callback', function()
+    exec([[
+      call setline(1, range(&lines))
+      function C1(a, b, c)
+        split | wincmd p
+      endfunction
+      function C2(a, b, c)
+        close | split
+      endfunction
+    ]])
+    exec_lua([[
+      vim.api.nvim_set_keymap("n", "j", "", { callback = function()
+        vim.cmd("call jobstart([&sh, &shcf, 'true'], { 'on_exit': 'C1' })")
+      end
+    })]])
+    exec_lua([[
+      vim.api.nvim_set_keymap("n", "t", "", { callback = function()
+        vim.api.nvim_set_current_win(
+          vim.api.nvim_open_win(vim.api.nvim_create_buf(false, {}), false, {
+          width = 10,
+            relative = "cursor",
+            height = 4,
+            row = 0,
+            col = 0,
+          }))
+          vim.cmd("call termopen([&sh, &shcf, 'true'], { 'on_exit': 'C2' })")
+      end
+    })]])
+    feed('j')
+    screen:expect([[
+      0                                                    |
+      1                                                    |
+      2                                                    |
+      3                                                    |
+      4                                                    |
+      5                                                    |
+      [No Name] [+]                                        |
+      ^7                                                    |
+      8                                                    |
+      9                                                    |
+      10                                                   |
+      11                                                   |
+      [No Name] [+]                                        |
+                                                           |
+    ]])
+    feed(':quit<CR>Ht')
+    screen:expect([[
+      ^0                                                    |
+      1                                                    |
+      2                                                    |
+      3                                                    |
+      4                                                    |
+      5                                                    |
+      [No Name] [+]                                        |
+      7                                                    |
+      8                                                    |
+      9                                                    |
+      10                                                   |
+      11                                                   |
+      [No Name] [+]                                        |
+      :quit                                                |
+    ]])
+    feed(':set sb<CR>:quit<CR>Gj')
+    screen:expect([[
+      1                                                    |
+      2                                                    |
+      3                                                    |
+      4                                                    |
+      ^5                                                    |
+      [No Name] [+]                                        |
+      7                                                    |
+      8                                                    |
+      9                                                    |
+      10                                                   |
+      11                                                   |
+      12                                                   |
+      [No Name] [+]                                        |
+      :quit                                                |
+    ]])
+    feed(':quit<CR>Gt')
+    screen:expect([[
+      1                                                    |
+      2                                                    |
+      3                                                    |
+      4                                                    |
+      5                                                    |
+      [No Name] [+]                                        |
+      7                                                    |
+      8                                                    |
+      9                                                    |
+      10                                                   |
+      11                                                   |
+      ^12                                                   |
+      [No Name] [+]                                        |
+      :quit                                                |
+    ]])
+  end)
+
+  -- oldtest: Test_splitkeep_fold()
+  it('does not scroll when window has closed folds', function()
+    exec([[
+      set splitkeep=screen
+      set foldmethod=marker
+      set number
+      let line = 1
+      for n in range(1, &lines)
+        call setline(line, ['int FuncName() {/*{{{*/', 1, 2, 3, 4, 5, '}/*}}}*/',
+              \ 'after fold'])
+        let line += 8
+      endfor
+    ]])
+    feed('L:wincmd s<CR>')
+    screen:expect([[
+        1 +--  7 lines: int FuncName() {···················|
+        8 after fold                                       |
+        9 +--  7 lines: int FuncName() {···················|
+       16 after fold                                       |
+       17 +--  7 lines: int FuncName() {···················|
+       24 ^after fold                                       |
+      [No Name] [+]                                        |
+       32 after fold                                       |
+       33 +--  7 lines: int FuncName() {···················|
+       40 after fold                                       |
+       41 +--  7 lines: int FuncName() {···················|
+       48 after fold                                       |
+      [No Name] [+]                                        |
+      :wincmd s                                            |
+    ]])
+    feed(':quit<CR>')
+    screen:expect([[
+        1 +--  7 lines: int FuncName() {···················|
+        8 after fold                                       |
+        9 +--  7 lines: int FuncName() {···················|
+       16 after fold                                       |
+       17 +--  7 lines: int FuncName() {···················|
+       24 after fold                                       |
+       25 +--  7 lines: int FuncName() {···················|
+       32 after fold                                       |
+       33 +--  7 lines: int FuncName() {···················|
+       40 after fold                                       |
+       41 +--  7 lines: int FuncName() {···················|
+       48 after fold                                       |
+       49 ^+--  7 lines: int FuncName() {···················|
+      :quit                                                |
+    ]])
+    feed('H:below split<CR>')
+    screen:expect([[
+        1 +--  7 lines: int FuncName() {···················|
+        8 after fold                                       |
+        9 +--  7 lines: int FuncName() {···················|
+       16 after fold                                       |
+       17 +--  7 lines: int FuncName() {···················|
+      [No Name] [+]                                        |
+       25 ^+--  7 lines: int FuncName() {···················|
+       32 after fold                                       |
+       33 +--  7 lines: int FuncName() {···················|
+       40 after fold                                       |
+       41 +--  7 lines: int FuncName() {···················|
+       48 after fold                                       |
+      [No Name] [+]                                        |
+      :below split                                         |
+    ]])
+    feed(':wincmd k<CR>:quit<CR>')
+    screen:expect([[
+        1 +--  7 lines: int FuncName() {···················|
+        8 after fold                                       |
+        9 +--  7 lines: int FuncName() {···················|
+       16 after fold                                       |
+       17 +--  7 lines: int FuncName() {···················|
+       24 after fold                                       |
+       25 ^+--  7 lines: int FuncName() {···················|
+       32 after fold                                       |
+       33 +--  7 lines: int FuncName() {···················|
+       40 after fold                                       |
+       41 +--  7 lines: int FuncName() {···················|
+       48 after fold                                       |
+       49 +--  7 lines: int FuncName() {···················|
+      :quit                                                |
+    ]])
+  end)
+end)
-- 
cgit 


From 25dea99ce54de6a8c4369e28e0db82e1af669f24 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 6 Oct 2022 20:03:59 +0800
Subject: vim-patch:9.0.0670: no space for command line when there is a tabline
 (#20512)

Problem:    No space for command line when there is a tabline.
Solution:   Correct computation of where the command line should be.
            (closes vim/vim#11295)
https://github.com/vim/vim/commit/c9f5f73206272ccad0aa536854debc5f9781978a
---
 test/functional/legacy/cmdline_spec.lua | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'test')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index e7f5c780dc..2fceb6a132 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -5,6 +5,7 @@ local command = helpers.command
 local feed = helpers.feed
 local feed_command = helpers.feed_command
 local exec = helpers.exec
+local meths = helpers.meths
 local pesc = helpers.pesc
 
 describe('cmdline', function()
@@ -213,6 +214,31 @@ describe('cmdline', function()
                                                                   |
     ]])
   end)
+
+  -- oldtest: Test_cmdheight_tabline()
+  it("changing 'cmdheight' when there is a tabline", function()
+    local screen = Screen.new(60, 8)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {bold = true, reverse = true},  -- StatusLine
+      [2] = {bold = true},  -- TabLineSel
+      [3] = {reverse = true},  -- TabLineFill
+    })
+    screen:attach()
+    meths.set_option('laststatus', 2)
+    meths.set_option('showtabline', 2)
+    meths.set_option('cmdheight', 1)
+    screen:expect([[
+      {2: [No Name] }{3:                                                 }|
+      ^                                                            |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:[No Name]                                                   }|
+                                                                  |
+    ]])
+  end)
 end)
 
 describe('cmdwin', function()
-- 
cgit 


From f7b175e049db9262a45ee1c5eb41a38bd5b8ac38 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 6 Oct 2022 09:16:00 -0400
Subject: fix(docs-html): keycodes, taglinks, column_heading #20498

Problem:
- Docs HTML: "foo ~" headings (column_heading) are not aligned with
  their table columns/contents because the leading whitespace is not
  emitted.
- taglinks starting with hyphen like |-x| were not recognized.
- keycodes like `<foo>` and `CTRL-x` were not recognized.
- ToC is not scrollable.

Solution:
- Add ws() to the column_heading case.
- Update help parser to latest version
  - supports `keycode`
  - fixes for taglink, argument
- Update .toc CSS. https://github.com/neovim/neovim.github.io/issues/297

fix https://github.com/neovim/neovim.github.io/issues/297
---
 test/functional/lua/help_spec.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/lua/help_spec.lua b/test/functional/lua/help_spec.lua
index 6743648819..251275b5cc 100644
--- a/test/functional/lua/help_spec.lua
+++ b/test/functional/lua/help_spec.lua
@@ -21,7 +21,7 @@ describe(':help docs', function()
     ok(rv.helpfiles > 100, '>100 :help files', rv.helpfiles)
     -- Check that parse errors did not increase wildly.
     -- TODO: Fix all parse errors in :help files.
-    ok(rv.err_count < 280, '<280 parse errors', rv.err_count)
+    ok(rv.err_count < 150, '<150 parse errors', rv.err_count)
     eq({}, rv.invalid_links, exec_lua([[return 'found invalid :help tag links:\n'..vim.inspect(...)]], rv.invalid_links))
   end)
 
@@ -43,7 +43,7 @@ describe(':help docs', function()
       tmpdir
     )
     eq(4, #rv.helpfiles)
-    ok(rv.err_count <= 6, '<=6 parse errors', rv.err_count)
+    ok(rv.err_count <= 1, '<=1 parse errors', rv.err_count)
     eq({}, rv.invalid_links, exec_lua([[return 'found invalid :help tag links:\n'..vim.inspect(...)]], rv.invalid_links))
   end)
 end)
-- 
cgit 


From d191070913dc195309926a91f97008defd877a71 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 7 Oct 2022 08:52:51 +0800
Subject: fix(ui): setting 'cmdheight' with global statusline (#20515)

---
 test/functional/ui/statusline_spec.lua | 101 +++++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)

(limited to 'test')

diff --git a/test/functional/ui/statusline_spec.lua b/test/functional/ui/statusline_spec.lua
index add5144e1b..18391a575d 100644
--- a/test/functional/ui/statusline_spec.lua
+++ b/test/functional/ui/statusline_spec.lua
@@ -178,6 +178,7 @@ describe('global statusline', function()
       [2] = {bold = true, reverse = true};
       [3] = {bold = true};
       [4] = {reverse = true};
+      [5] = {bold = true, foreground = Screen.colors.Fuchsia};
     })
     command('set laststatus=3')
     command('set ruler')
@@ -398,6 +399,106 @@ describe('global statusline', function()
     meths.input_mouse('left', 'drag', '', 0, 14, 10)
     eq(1, meths.get_option('cmdheight'))
   end)
+
+  it('cmdline row is correct after setting cmdheight #20514', function()
+    command('botright split test/functional/fixtures/bigfile.txt')
+    meths.set_option('cmdheight', 1)
+    feed('L')
+    screen:expect([[
+                                                                  |
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      ────────────────────────────────────────────────────────────|
+      0000;<control>;Cc;0;BN;;;;;N;NULL;;;;                       |
+      0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;;           |
+      0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;              |
+      0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;                |
+      0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;        |
+      0005;<control>;Cc;0;BN;;;;;N;ENQUIRY;;;;                    |
+      ^0006;<control>;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;;                |
+      {2:test/functional/fixtures/bigfile.txt      7,1            Top}|
+                                                                  |
+    ]])
+    feed('j')
+    screen:expect([[
+                                                                  |
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      ────────────────────────────────────────────────────────────|
+      0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;;           |
+      0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;              |
+      0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;                |
+      0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;        |
+      0005;<control>;Cc;0;BN;;;;;N;ENQUIRY;;;;                    |
+      0006;<control>;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;;                |
+      ^0007;<control>;Cc;0;BN;;;;;N;BELL;;;;                       |
+      {2:test/functional/fixtures/bigfile.txt      8,1             0%}|
+                                                                  |
+    ]])
+    meths.set_option('showtabline', 2)
+    screen:expect([[
+      {3: }{5:2}{3: t/f/f/bigfile.txt }{4:                                       }|
+                                                                  |
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      ────────────────────────────────────────────────────────────|
+      0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;              |
+      0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;                |
+      0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;        |
+      0005;<control>;Cc;0;BN;;;;;N;ENQUIRY;;;;                    |
+      0006;<control>;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;;                |
+      ^0007;<control>;Cc;0;BN;;;;;N;BELL;;;;                       |
+      {2:test/functional/fixtures/bigfile.txt      8,1             0%}|
+                                                                  |
+    ]])
+    meths.set_option('cmdheight', 0)
+    screen:expect([[
+      {3: }{5:2}{3: t/f/f/bigfile.txt }{4:                                       }|
+                                                                  |
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      ────────────────────────────────────────────────────────────|
+      0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;;           |
+      0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;              |
+      0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;                |
+      0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;        |
+      0005;<control>;Cc;0;BN;;;;;N;ENQUIRY;;;;                    |
+      0006;<control>;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;;                |
+      ^0007;<control>;Cc;0;BN;;;;;N;BELL;;;;                       |
+      {2:test/functional/fixtures/bigfile.txt      8,1             0%}|
+    ]])
+    meths.set_option('cmdheight', 1)
+    screen:expect([[
+      {3: }{5:2}{3: t/f/f/bigfile.txt }{4:                                       }|
+                                                                  |
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      ────────────────────────────────────────────────────────────|
+      0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;              |
+      0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;                |
+      0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;        |
+      0005;<control>;Cc;0;BN;;;;;N;ENQUIRY;;;;                    |
+      0006;<control>;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;;                |
+      ^0007;<control>;Cc;0;BN;;;;;N;BELL;;;;                       |
+      {2:test/functional/fixtures/bigfile.txt      8,1             0%}|
+                                                                  |
+    ]])
+  end)
 end)
 
 it('statusline does not crash if it has Arabic characters #19447', function()
-- 
cgit 


From cfdb4cbada8c65aa57e69776bcc0f7b8b298317a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 7 Oct 2022 09:43:16 +0800
Subject: fix: find multibyte file name in line (#20519)

And remove unnecessary unsigned casts in fold marker comparison.
---
 test/functional/core/path_spec.lua                         | 14 ++++++++++++++
 .../filename_with_unicode_\316\261\316\261\316\261"        |  0
 2 files changed, 14 insertions(+)
 create mode 100644 "test/functional/fixtures/filename_with_unicode_\316\261\316\261\316\261"

(limited to 'test')

diff --git a/test/functional/core/path_spec.lua b/test/functional/core/path_spec.lua
index 669bc99136..61fae7622c 100644
--- a/test/functional/core/path_spec.lua
+++ b/test/functional/core/path_spec.lua
@@ -4,6 +4,8 @@ local eq = helpers.eq
 local eval = helpers.eval
 local command = helpers.command
 local iswin = helpers.iswin
+local insert = helpers.insert
+local feed = helpers.feed
 
 describe('path collapse', function()
   local targetdir
@@ -54,3 +56,15 @@ describe('path collapse', function()
     eq(expected_path, eval('expand("%:p")'))
   end)
 end)
+
+describe('file search', function()
+  before_each(clear)
+
+  it('find multibyte file name in line #20517', function()
+    command('cd test/functional/fixtures')
+    insert('filename_with_unicode_ααα')
+    eq('', eval('expand("%")'))
+    feed('gf')
+    eq('filename_with_unicode_ααα', eval('expand("%:t")'))
+  end)
+end)
diff --git "a/test/functional/fixtures/filename_with_unicode_\316\261\316\261\316\261" "b/test/functional/fixtures/filename_with_unicode_\316\261\316\261\316\261"
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit 


From 0773a9ee3a21db54cd6b2376dd2e087bc09d5ea1 Mon Sep 17 00:00:00 2001
From: lvimuser <109605931+lvimuser@users.noreply.github.com>
Date: Sat, 8 Oct 2022 05:22:25 -0300
Subject: feat(lsp): support window/showDocument (#19977)

---
 test/functional/plugin/lsp_spec.lua | 162 +++++++++++++++++++++++++++++++++++-
 1 file changed, 161 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index bcae9b4084..425427be54 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -2586,7 +2586,7 @@ describe('LSP', function()
       local mark = funcs.nvim_buf_get_mark(target_bufnr, "'")
       eq({ 1, 0 }, mark)
 
-      funcs.nvim_win_set_cursor(0, {2, 3})
+      funcs.nvim_win_set_cursor(0, { 2, 3 })
       jump(location(0, 9, 0, 9))
 
       mark = funcs.nvim_buf_get_mark(target_bufnr, "'")
@@ -2594,6 +2594,166 @@ describe('LSP', function()
     end)
   end)
 
+  describe('lsp.util.show_document', function()
+    local target_bufnr
+    local target_bufnr2
+
+    before_each(function()
+      target_bufnr = exec_lua([[
+        local bufnr = vim.uri_to_bufnr("file:///fake/uri")
+        local lines = {"1st line of text", "å å ɧ 汉语 ↥ 🤦 🦄"}
+        vim.api.nvim_buf_set_lines(bufnr, 0, 1, false, lines)
+        return bufnr
+      ]])
+
+      target_bufnr2 = exec_lua([[
+        local bufnr = vim.uri_to_bufnr("file:///fake/uri2")
+        local lines = {"1st line of text", "å å ɧ 汉语 ↥ 🤦 🦄"}
+        vim.api.nvim_buf_set_lines(bufnr, 0, 1, false, lines)
+        return bufnr
+      ]])
+    end)
+
+    local location = function(start_line, start_char, end_line, end_char, second_uri)
+      return {
+        uri = second_uri and 'file:///fake/uri2' or 'file:///fake/uri',
+        range = {
+          start = { line = start_line, character = start_char },
+          ['end'] = { line = end_line, character = end_char },
+        },
+      }
+    end
+
+    local show_document = function(msg, focus, reuse_win)
+      eq(
+        true,
+        exec_lua(
+          'return vim.lsp.util.show_document(...)',
+          msg,
+          'utf-16',
+          { reuse_win = reuse_win, focus = focus }
+        )
+      )
+      if focus == true or focus == nil then
+        eq(target_bufnr, exec_lua([[return vim.fn.bufnr('%')]]))
+      end
+      return {
+        line = exec_lua([[return vim.fn.line('.')]]),
+        col = exec_lua([[return vim.fn.col('.')]]),
+      }
+    end
+
+    it('jumps to a Location if focus is true', function()
+      local pos = show_document(location(0, 9, 0, 9), true, true)
+      eq(1, pos.line)
+      eq(10, pos.col)
+    end)
+
+    it('jumps to a Location if focus not set', function()
+      local pos = show_document(location(0, 9, 0, 9), nil, true)
+      eq(1, pos.line)
+      eq(10, pos.col)
+    end)
+
+    it('does not add current position to jumplist if not focus', function()
+      funcs.nvim_win_set_buf(0, target_bufnr)
+      local mark = funcs.nvim_buf_get_mark(target_bufnr, "'")
+      eq({ 1, 0 }, mark)
+
+      funcs.nvim_win_set_cursor(0, { 2, 3 })
+      show_document(location(0, 9, 0, 9), false, true)
+      show_document(location(0, 9, 0, 9, true), false, true)
+
+      mark = funcs.nvim_buf_get_mark(target_bufnr, "'")
+      eq({ 1, 0 }, mark)
+    end)
+
+    it('does not change cursor position if not focus and not reuse_win', function()
+      funcs.nvim_win_set_buf(0, target_bufnr)
+      local cursor = funcs.nvim_win_get_cursor(0)
+
+      show_document(location(0, 9, 0, 9), false, false)
+      eq(cursor, funcs.nvim_win_get_cursor(0))
+    end)
+
+    it('does not change window if not focus', function()
+      funcs.nvim_win_set_buf(0, target_bufnr)
+      local win = funcs.nvim_get_current_win()
+
+      -- same document/bufnr
+      show_document(location(0, 9, 0, 9), false, true)
+      eq(win, funcs.nvim_get_current_win())
+
+      -- different document/bufnr, new window/split
+      show_document(location(0, 9, 0, 9, true), false, true)
+      eq(2, #funcs.nvim_list_wins())
+      eq(win, funcs.nvim_get_current_win())
+    end)
+
+    it("respects 'reuse_win' parameter", function()
+      funcs.nvim_win_set_buf(0, target_bufnr)
+
+      -- does not create a new window if the buffer is already open
+      show_document(location(0, 9, 0, 9), false, true)
+      eq(1, #funcs.nvim_list_wins())
+
+      -- creates a new window even if the buffer is already open
+      show_document(location(0, 9, 0, 9), false, false)
+      eq(2, #funcs.nvim_list_wins())
+    end)
+
+    it('correctly sets the cursor of the split if range is given without focus', function()
+      funcs.nvim_win_set_buf(0, target_bufnr)
+
+      show_document(location(0, 9, 0, 9, true), false, true)
+
+      local wins = funcs.nvim_list_wins()
+      eq(2, #wins)
+      table.sort(wins)
+
+      eq({ 1, 0 }, funcs.nvim_win_get_cursor(wins[1]))
+      eq({ 1, 9 }, funcs.nvim_win_get_cursor(wins[2]))
+    end)
+
+    it('does not change cursor of the split if not range and not focus', function()
+      funcs.nvim_win_set_buf(0, target_bufnr)
+      funcs.nvim_win_set_cursor(0, { 2, 3 })
+
+      exec_lua([[vim.cmd.new()]])
+      funcs.nvim_win_set_buf(0, target_bufnr2)
+      funcs.nvim_win_set_cursor(0, { 2, 3 })
+
+      show_document({ uri = 'file:///fake/uri2' }, false, true)
+
+      local wins = funcs.nvim_list_wins()
+      eq(2, #wins)
+      eq({ 2, 3 }, funcs.nvim_win_get_cursor(wins[1]))
+      eq({ 2, 3 }, funcs.nvim_win_get_cursor(wins[2]))
+    end)
+
+    it('respects existing buffers', function()
+      funcs.nvim_win_set_buf(0, target_bufnr)
+      local win = funcs.nvim_get_current_win()
+
+      exec_lua([[vim.cmd.new()]])
+      funcs.nvim_win_set_buf(0, target_bufnr2)
+      funcs.nvim_win_set_cursor(0, { 2, 3 })
+      local split = funcs.nvim_get_current_win()
+
+      -- reuse win for open document/bufnr if called from split
+      show_document(location(0, 9, 0, 9, true), false, true)
+      eq({ 1, 9 }, funcs.nvim_win_get_cursor(split))
+      eq(2, #funcs.nvim_list_wins())
+
+      funcs.nvim_set_current_win(win)
+
+      -- reuse win for open document/bufnr if called outside the split
+      show_document(location(0, 9, 0, 9, true), false, true)
+      eq({ 1, 9 }, funcs.nvim_win_get_cursor(split))
+      eq(2, #funcs.nvim_list_wins())
+    end)
+  end)
+
   describe('lsp.util._make_floating_popup_size', function()
     before_each(function()
       exec_lua [[ contents =
-- 
cgit 


From 2a12faaec18115bf057427834832ff20ccb3ffd4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 8 Oct 2022 20:10:00 +0800
Subject: fix(api): dynamically allocate line buffer for nvim_out_write
 (#20537)

---
 test/functional/api/vim_spec.lua | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 0b2b371046..909ff80837 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -1905,11 +1905,32 @@ describe('API', function()
     end)
   end)
 
+  describe('nvim_out_write', function()
+    it('prints long messages correctly #20534', function()
+      exec([[
+        set more
+        redir => g:out
+          silent! call nvim_out_write('a')
+          silent! call nvim_out_write('a')
+          silent! call nvim_out_write('a')
+          silent! call nvim_out_write("\n")
+          silent! call nvim_out_write('a')
+          silent! call nvim_out_write('a')
+          silent! call nvim_out_write(repeat('a', 5000) .. "\n")
+          silent! call nvim_out_write('a')
+          silent! call nvim_out_write('a')
+          silent! call nvim_out_write('a')
+          silent! call nvim_out_write("\n")
+        redir END
+      ]])
+      eq('\naaa\n' .. ('a'):rep(5002) .. '\naaa', meths.get_var('out'))
+    end)
+  end)
+
   describe('nvim_err_write', function()
     local screen
 
     before_each(function()
-      clear()
       screen = Screen.new(40, 8)
       screen:attach()
       screen:set_default_attr_ids({
-- 
cgit 


From 7cdaa74b3684d40a6e72bbf3eb4deedb0c5df7bc Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 9 Oct 2022 18:57:22 +0800
Subject: vim-patch:9.0.0702: incomplete testing cursor position with
 'linebreak' set

Problem:    Incomplete testing cursor position after change with 'linebreak'
            set.
Solution:   Add a test and move test cases together. (closes vim/vim#11313)
https://github.com/vim/vim/commit/30c0c467d6cc2a7af960ccb9002b50115b0e55cf
---
 test/functional/legacy/listlbr_spec.lua | 96 ++++++++++++++++++++++++++++++++-
 1 file changed, 95 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/functional/legacy/listlbr_spec.lua b/test/functional/legacy/listlbr_spec.lua
index f70d55f4a3..d4f11a61c2 100644
--- a/test/functional/legacy/listlbr_spec.lua
+++ b/test/functional/legacy/listlbr_spec.lua
@@ -1,11 +1,12 @@
 -- Test for linebreak and list option (non-utf8)
 
 local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
 local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, feed_command, expect = helpers.clear, helpers.feed_command, helpers.expect
 
 describe('listlbr', function()
-  setup(clear)
+  before_each(clear)
 
   -- luacheck: ignore 621 (Indentation)
   -- luacheck: ignore 611 (Line contains only whitespaces)
@@ -195,4 +196,97 @@ describe('listlbr', function()
       aa>-----a-$         
       ~                   ]])
   end)
+
+  -- oldtest: Test_linebreak_reset_restore()
+  it('cursor position is drawn correctly after operator', function()
+    local screen = Screen.new(60, 6)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {background = Screen.colors.LightGrey},  -- Visual
+      [2] = {background = Screen.colors.Red, foreground = Screen.colors.White},  -- ErrorMsg
+    })
+    screen:attach()
+
+    -- f_wincol() calls validate_cursor()
+    source([[
+      set linebreak showcmd noshowmode formatexpr=wincol()-wincol()
+      call setline(1, repeat('a', &columns - 10) .. ' bbbbbbbbbb c')
+    ]])
+
+    feed('$v$')
+    screen:expect([[
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa          |
+      bbbbbbbbbb {1:c}^                                                |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+                                                       2          |
+    ]])
+    feed('zo')
+    screen:expect([[
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa          |
+      bbbbbbbbbb ^c                                                |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {2:E490: No fold found}                                         |
+    ]])
+
+    feed('$v$')
+    screen:expect([[
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa          |
+      bbbbbbbbbb {1:c}^                                                |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {2:E490: No fold found}                              2          |
+    ]])
+    feed('gq')
+    screen:expect([[
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa          |
+      bbbbbbbbbb ^c                                                |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {2:E490: No fold found}                                         |
+    ]])
+
+    feed('$<C-V>$')
+    screen:expect([[
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa          |
+      bbbbbbbbbb {1:c}^                                                |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {2:E490: No fold found}                              1x2        |
+    ]])
+    feed('I')
+    screen:expect([[
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa          |
+      bbbbbbbbbb ^c                                                |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {2:E490: No fold found}                                         |
+    ]])
+
+    feed('<Esc>$v$')
+    screen:expect([[
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa          |
+      bbbbbbbbbb {1:c}^                                                |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {2:E490: No fold found}                              2          |
+    ]])
+    feed('s')
+    screen:expect([[
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa          |
+      bbbbbbbbbb ^                                                 |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {2:E490: No fold found}                                         |
+    ]])
+  end)
 end)
-- 
cgit 


From 09dffb9db7d16496e55e86f78ab60241533d86f6 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 9 Oct 2022 08:21:52 -0400
Subject: docs: various #12823

- increase python line-length limit from 88 => 100.
- gen_help_html: fix bug in "tag" case (tbl_count => tbl_contains)

ref #15632
fix #18215
fix #18479
fix #20527
fix #20532

Co-authored-by: Ben Weedon <ben@weedon.email>
---
 test/functional/api/vim_spec.lua | 2 +-
 test/functional/helpers.lua      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 909ff80837..af6cee7e90 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -2277,7 +2277,7 @@ describe('API', function()
       eq({'a', '', 'b'}, meths.list_runtime_paths())
       meths.set_option('runtimepath', ',a,b')
       eq({'', 'a', 'b'}, meths.list_runtime_paths())
-      -- trailing , is ignored, use ,, if you really really want $CWD
+      -- Trailing "," is ignored. Use ",," if you really really want CWD.
       meths.set_option('runtimepath', 'a,b,')
       eq({'a', 'b'}, meths.list_runtime_paths())
       meths.set_option('runtimepath', 'a,b,,')
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 4fcc190dee..723d2ccfa4 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -275,7 +275,6 @@ function module.command(cmd)
   module.request('nvim_command', cmd)
 end
 
-
 -- Use for commands which expect nvim to quit.
 -- The first argument can also be a timeout.
 function module.expect_exit(fn_or_timeout, ...)
-- 
cgit 


From a5597d1fc066a8512ce9434dbff70850dc7bd5a1 Mon Sep 17 00:00:00 2001
From: RZia <36330543+grassdne@users.noreply.github.com>
Date: Sun, 9 Oct 2022 20:04:08 -0400
Subject: fix(lua): assert failure with vim.regex() error inside :silent!
 (#20555)

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
---
 test/functional/lua/vim_spec.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'test')

diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index 6451453ce0..47a0004183 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -24,6 +24,7 @@ local rmdir = helpers.rmdir
 local write_file = helpers.write_file
 local expect_exit = helpers.expect_exit
 local poke_eventloop = helpers.poke_eventloop
+local assert_alive = helpers.assert_alive
 
 describe('lua stdlib', function()
   before_each(clear)
@@ -2210,6 +2211,10 @@ describe('lua stdlib', function()
     eq({3,7}, exec_lua[[return {re1:match_line(0, 1, 1, 8)}]])
     eq({}, exec_lua[[return {re1:match_line(0, 1, 1, 7)}]])
     eq({0,3}, exec_lua[[return {re1:match_line(0, 1, 0, 7)}]])
+
+    -- vim.regex() error inside :silent! should not crash. #20546
+    command([[silent! lua vim.regex('\\z')]])
+    assert_alive()
   end)
 
   it('vim.defer_fn', function()
-- 
cgit