commit c5dbee7910b18b74064e2c5c44a35ca36f24a7a5
parent b67eff38fe19876ab228007897224ec04b58aa40
Author: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Mon, 20 Oct 2025 00:15:50 -0400
vim-patch:9.1.0918: tiny Vim crashes with fuzzy buffer completion
Problem: tiny Vim crashes with fuzzy buffer completion
Solution: Adjust #ifdefs in ExpandBufnames() (826814741_6)
closes: vim/vim#16200
https://github.com/vim/vim/commit/dff3c9c1a789351a741b6a430862c8b2a0eff383
Co-authored-by: 826814741_6 <44406129+826814741-6@users.noreply.github.com>
Diffstat:
3 files changed, 358 insertions(+), 345 deletions(-)
diff --git a/test/functional/legacy/029_fuzzy_spec.lua b/test/functional/legacy/029_fuzzy_spec.lua
@@ -0,0 +1,22 @@
+-- Test for buffer name completion when 'wildoptions' contains "fuzzy"
+-- (Confirm that Vim does not crash)
+local n = require('test.functional.testnvim')()
+
+local clear = n.clear
+local insert = n.insert
+local expect = n.expect
+local feed_command = n.feed_command
+local command = n.command
+
+describe('set wildoptions=fuzzy', function()
+ before_each(clear)
+
+ it('works', function()
+ insert([[I'm alive!]])
+ command('set wildoptions=fuzzy')
+ command('new buf_a')
+ feed_command('b buf_a')
+ command('q!')
+ expect([[I'm alive!]])
+ end)
+end)
diff --git a/test/functional/legacy/029_join_spec.lua b/test/functional/legacy/029_join_spec.lua
@@ -1,345 +0,0 @@
--- Test for joining lines with marks in them (and with 'joinspaces' set/reset)
-
-local n = require('test.functional.testnvim')()
-
-local feed = n.feed
-local clear = n.clear
-local insert = n.insert
-local expect = n.expect
-local feed_command = n.feed_command
-
-describe('joining lines', function()
- before_each(clear)
-
- -- luacheck: ignore 613 (Trailing whitespaces in a string)
- -- luacheck: ignore 611 (Line contains only whitespaces)
- it("keeps marks with different 'joinspaces' settings", function()
- insert([[
- firstline
- asdfasdf.
- asdf
- asdfasdf.
- asdf
- asdfasdf.
- asdf
- asdfasdf.
- asdf
- asdfasdf.
- asdf
- asdfasdf.
- asdf
- asdfasdf.
- asdf
- asdfasdf
- asdf
- asdfasdf
- asdf
- asdfasdf
- asdf
- asdfasdf
- asdf
- asdfasdf
- asdf
- asdfasdf
- asdf
- asdfasdf
- asdf
- zx cvn.
- as dfg?
- hjkl iop!
- ert
- ]])
-
- -- Switch off 'joinspaces', then join some lines in the buffer using "J".
- -- Also set a few marks and record their movement when joining lines.
- feed_command('set nojoinspaces')
- feed_command('/firstline/')
- feed('j"td/^$/<cr>')
- feed('PJjJjJjJjJjJjJjJjJjJjJjJjJjJ')
- feed('j05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p')
-
- -- Do the same with 'joinspaces' on.
- feed_command('set joinspaces')
- feed('j"tp')
- feed('JjJjJjJjJjJjJjJjJjJjJjJjJjJ')
- feed('j05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$po<esc>')
-
- feed_command('1d')
-
- expect([[
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- zx cvn. as dfg? hjkl iop! ert ernop
-
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- zx cvn. as dfg? hjkl iop! ert enop
- ]])
- end)
-
- it("removes comment leaders with 'joinspaces' off", function()
- insert([[
- {
-
- /*
- * Make sure the previous comment leader is not removed.
- */
-
- /*
- * Make sure the previous comment leader is not removed.
- */
-
- // Should the next comment leader be left alone?
- // Yes.
-
- // Should the next comment leader be left alone?
- // Yes.
-
- /* Here the comment leader should be left intact. */
- // And so should this one.
-
- /* Here the comment leader should be left intact. */
- // And so should this one.
-
- if (condition) // Remove the next comment leader!
- // OK, I will.
- action();
-
- if (condition) // Remove the next comment leader!
- // OK, I will.
- action();
- }
- ]])
-
- feed_command('/^{/+1')
- feed_command('set comments=s1:/*,mb:*,ex:*/,://')
- feed_command('set nojoinspaces')
- feed_command('set backspace=eol,start')
-
- -- With 'joinspaces' switched off, join lines using both "J" and :join and
- -- verify that comment leaders are stripped or kept as appropriate.
- feed_command('.,+3join')
- feed('j4J<cr>')
- feed_command('.,+2join')
- feed('j3J<cr>')
- feed_command('.,+2join')
- feed('j3J<cr>')
- feed_command('.,+2join')
- feed('jj3J<cr>')
-
- expect([[
- {
- /* Make sure the previous comment leader is not removed. */
- /* Make sure the previous comment leader is not removed. */
- // Should the next comment leader be left alone? Yes.
- // Should the next comment leader be left alone? Yes.
- /* Here the comment leader should be left intact. */ // And so should this one.
- /* Here the comment leader should be left intact. */ // And so should this one.
- if (condition) // Remove the next comment leader! OK, I will.
- action();
- if (condition) // Remove the next comment leader! OK, I will.
- action();
- }
- ]])
- end)
-
- -- This test case has nothing to do with joining lines.
- it("Ctrl-u and 'backspace' compatibility", function()
- -- Notice that the buffer text, which is intended to helpfully hint at
- -- what's being done in the test, is off by one line. (For example, "this
- -- should be deleted" should not be deleted, but the line below it should,
- -- and is.) This is likely a mistake, but was kept here for consistency.
- insert([[
- 1 this shouldn't be deleted
- 2 this shouldn't be deleted
- 3 this shouldn't be deleted
- 4 this should be deleted
- 5 this shouldn't be deleted
- 6 this shouldn't be deleted
- 7 this shouldn't be deleted
- 8 this shouldn't be deleted (not touched yet)
- ]])
-
- -- As mentioned above, we mimic the wrong initial cursor position in the old
- -- test by advancing one line further.
- feed_command([[/^\d\+ this]], '+1')
-
- -- Test with the default 'backspace' setting.
- feed('Avim1<c-u><esc><cr>')
- feed('Avim2<c-g>u<c-u><esc><cr>')
- feed_command('set cpo-=<')
- feed_command('inoremap <c-u> <left><c-u>')
- feed('Avim3<c-u><esc><cr>')
- feed_command('iunmap <c-u>')
- feed('Avim4<c-u><c-u><esc><cr>')
-
- -- Test with 'backspace' set to the compatible setting.
- feed_command('set backspace=')
- feed('A vim5<esc>A<c-u><c-u><esc><cr>')
- feed('A vim6<esc>Azwei<c-g>u<c-u><esc><cr>')
- feed_command('inoremap <c-u> <left><c-u>')
- feed('A vim7<c-u><c-u><esc><cr>')
-
- expect([[
- 1 this shouldn't be deleted
- 2 this shouldn't be deleted
- 3 this shouldn't be deleted
- 4 this should be deleted3
-
- 6 this shouldn't be deleted vim5
- 7 this shouldn't be deleted vim6
- 8 this shouldn't be deleted (not touched yet) vim7
- ]])
- end)
-
- it("removes comment leaders with 'joinspaces' on", function()
- insert([[
- {
-
- /*
- * Make sure the previous comment leader is not removed.
- */
-
- /*
- * Make sure the previous comment leader is not removed.
- */
-
- /* List:
- * - item1
- * foo bar baz
- * foo bar baz
- * - item2
- * foo bar baz
- * foo bar baz
- */
-
- /* List:
- * - item1
- * foo bar baz
- * foo bar baz
- * - item2
- * foo bar baz
- * foo bar baz
- */
-
- // Should the next comment leader be left alone?
- // Yes.
-
- // Should the next comment leader be left alone?
- // Yes.
-
- /* Here the comment leader should be left intact. */
- // And so should this one.
-
- /* Here the comment leader should be left intact. */
- // And so should this one.
-
- if (condition) // Remove the next comment leader!
- // OK, I will.
- action();
-
- if (condition) // Remove the next comment leader!
- // OK, I will.
- action();
-
- int i = 7 /* foo *// 3
- // comment
- ;
-
- int i = 7 /* foo *// 3
- // comment
- ;
-
- ># Note that the last character of the ending comment leader (left angle
- # bracket) is a comment leader itself. Make sure that this comment leader is
- # not removed from the next line #<
- < On this line a new comment is opened which spans 2 lines. This comment should
- < retain its comment leader.
-
- ># Note that the last character of the ending comment leader (left angle
- # bracket) is a comment leader itself. Make sure that this comment leader is
- # not removed from the next line #<
- < On this line a new comment is opened which spans 2 lines. This comment should
- < retain its comment leader.
-
- }
- ]])
-
- feed_command('/^{/+1')
- feed_command([[set comments=sO:*\ -,mO:*\ \ ,exO:*/]])
- feed_command('set comments+=s1:/*,mb:*,ex:*/,://')
- feed_command('set comments+=s1:>#,mb:#,ex:#<,:<')
- feed_command('set backspace=eol,start')
-
- -- With 'joinspaces' on (the default setting), again join lines and verify
- -- that comment leaders are stripped or kept as appropriate.
- feed_command('.,+3join')
- feed('j4J<cr>')
- feed_command('.,+8join')
- feed('j9J<cr>')
- feed_command('.,+2join')
- feed('j3J<cr>')
- feed_command('.,+2join')
- feed('j3J<cr>')
- feed_command('.,+2join')
- feed('jj3J<cr>')
- feed('j')
- feed_command('.,+2join')
- feed('jj3J<cr>')
- feed('j')
- feed_command('.,+5join')
- feed('j6J<cr>')
- feed(
- 'oSome code!<cr>// Make sure backspacing does not remove this comment leader.<esc>0i<bs><esc>'
- )
-
- expect([[
- {
- /* Make sure the previous comment leader is not removed. */
- /* Make sure the previous comment leader is not removed. */
- /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
- /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
- // Should the next comment leader be left alone? Yes.
- // Should the next comment leader be left alone? Yes.
- /* Here the comment leader should be left intact. */ // And so should this one.
- /* Here the comment leader should be left intact. */ // And so should this one.
- if (condition) // Remove the next comment leader! OK, I will.
- action();
- if (condition) // Remove the next comment leader! OK, I will.
- action();
- int i = 7 /* foo *// 3 // comment
- ;
- int i = 7 /* foo *// 3 // comment
- ;
- ># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
- ># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
-
- Some code!// Make sure backspacing does not remove this comment leader.
- }
- ]])
- end)
-end)
diff --git a/test/functional/legacy/join_spec.lua b/test/functional/legacy/join_spec.lua
@@ -5,6 +5,10 @@ local n = require('test.functional.testnvim')()
local clear, eq = n.clear, t.eq
local eval, command = n.eval, n.command
+local feed = n.feed
+local insert = n.insert
+local expect = n.expect
+local feed_command = n.feed_command
describe('joining lines', function()
before_each(clear)
@@ -19,4 +23,336 @@ describe('joining lines', function()
command('normal 10J')
eq('one two three four', eval('getline(1)'))
end)
+
+ -- luacheck: ignore 613 (Trailing whitespaces in a string)
+ -- luacheck: ignore 611 (Line contains only whitespaces)
+ it("keeps marks with different 'joinspaces' settings", function()
+ insert([[
+ firstline
+ asdfasdf.
+ asdf
+ asdfasdf.
+ asdf
+ asdfasdf.
+ asdf
+ asdfasdf.
+ asdf
+ asdfasdf.
+ asdf
+ asdfasdf.
+ asdf
+ asdfasdf.
+ asdf
+ asdfasdf
+ asdf
+ asdfasdf
+ asdf
+ asdfasdf
+ asdf
+ asdfasdf
+ asdf
+ asdfasdf
+ asdf
+ asdfasdf
+ asdf
+ asdfasdf
+ asdf
+ zx cvn.
+ as dfg?
+ hjkl iop!
+ ert
+ ]])
+
+ -- Switch off 'joinspaces', then join some lines in the buffer using "J".
+ -- Also set a few marks and record their movement when joining lines.
+ feed_command('set nojoinspaces')
+ feed_command('/firstline/')
+ feed('j"td/^$/<cr>')
+ feed('PJjJjJjJjJjJjJjJjJjJjJjJjJjJ')
+ feed('j05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p')
+
+ -- Do the same with 'joinspaces' on.
+ feed_command('set joinspaces')
+ feed('j"tp')
+ feed('JjJjJjJjJjJjJjJjJjJjJjJjJjJ')
+ feed('j05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$po<esc>')
+
+ feed_command('1d')
+
+ expect([[
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ zx cvn. as dfg? hjkl iop! ert ernop
+
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ zx cvn. as dfg? hjkl iop! ert enop
+ ]])
+ end)
+
+ it("removes comment leaders with 'joinspaces' off", function()
+ insert([[
+ {
+
+ /*
+ * Make sure the previous comment leader is not removed.
+ */
+
+ /*
+ * Make sure the previous comment leader is not removed.
+ */
+
+ // Should the next comment leader be left alone?
+ // Yes.
+
+ // Should the next comment leader be left alone?
+ // Yes.
+
+ /* Here the comment leader should be left intact. */
+ // And so should this one.
+
+ /* Here the comment leader should be left intact. */
+ // And so should this one.
+
+ if (condition) // Remove the next comment leader!
+ // OK, I will.
+ action();
+
+ if (condition) // Remove the next comment leader!
+ // OK, I will.
+ action();
+ }
+ ]])
+
+ feed_command('/^{/+1')
+ feed_command('set comments=s1:/*,mb:*,ex:*/,://')
+ feed_command('set nojoinspaces')
+ feed_command('set backspace=eol,start')
+
+ -- With 'joinspaces' switched off, join lines using both "J" and :join and
+ -- verify that comment leaders are stripped or kept as appropriate.
+ feed_command('.,+3join')
+ feed('j4J<cr>')
+ feed_command('.,+2join')
+ feed('j3J<cr>')
+ feed_command('.,+2join')
+ feed('j3J<cr>')
+ feed_command('.,+2join')
+ feed('jj3J<cr>')
+
+ expect([[
+ {
+ /* Make sure the previous comment leader is not removed. */
+ /* Make sure the previous comment leader is not removed. */
+ // Should the next comment leader be left alone? Yes.
+ // Should the next comment leader be left alone? Yes.
+ /* Here the comment leader should be left intact. */ // And so should this one.
+ /* Here the comment leader should be left intact. */ // And so should this one.
+ if (condition) // Remove the next comment leader! OK, I will.
+ action();
+ if (condition) // Remove the next comment leader! OK, I will.
+ action();
+ }
+ ]])
+ end)
+
+ -- This test case has nothing to do with joining lines.
+ it("Ctrl-u and 'backspace' compatibility", function()
+ -- Notice that the buffer text, which is intended to helpfully hint at
+ -- what's being done in the test, is off by one line. (For example, "this
+ -- should be deleted" should not be deleted, but the line below it should,
+ -- and is.) This is likely a mistake, but was kept here for consistency.
+ insert([[
+ 1 this shouldn't be deleted
+ 2 this shouldn't be deleted
+ 3 this shouldn't be deleted
+ 4 this should be deleted
+ 5 this shouldn't be deleted
+ 6 this shouldn't be deleted
+ 7 this shouldn't be deleted
+ 8 this shouldn't be deleted (not touched yet)
+ ]])
+
+ -- As mentioned above, we mimic the wrong initial cursor position in the old
+ -- test by advancing one line further.
+ feed_command([[/^\d\+ this]], '+1')
+
+ -- Test with the default 'backspace' setting.
+ feed('Avim1<c-u><esc><cr>')
+ feed('Avim2<c-g>u<c-u><esc><cr>')
+ feed_command('set cpo-=<')
+ feed_command('inoremap <c-u> <left><c-u>')
+ feed('Avim3<c-u><esc><cr>')
+ feed_command('iunmap <c-u>')
+ feed('Avim4<c-u><c-u><esc><cr>')
+
+ -- Test with 'backspace' set to the compatible setting.
+ feed_command('set backspace=')
+ feed('A vim5<esc>A<c-u><c-u><esc><cr>')
+ feed('A vim6<esc>Azwei<c-g>u<c-u><esc><cr>')
+ feed_command('inoremap <c-u> <left><c-u>')
+ feed('A vim7<c-u><c-u><esc><cr>')
+
+ expect([[
+ 1 this shouldn't be deleted
+ 2 this shouldn't be deleted
+ 3 this shouldn't be deleted
+ 4 this should be deleted3
+
+ 6 this shouldn't be deleted vim5
+ 7 this shouldn't be deleted vim6
+ 8 this shouldn't be deleted (not touched yet) vim7
+ ]])
+ end)
+
+ it("removes comment leaders with 'joinspaces' on", function()
+ insert([[
+ {
+
+ /*
+ * Make sure the previous comment leader is not removed.
+ */
+
+ /*
+ * Make sure the previous comment leader is not removed.
+ */
+
+ /* List:
+ * - item1
+ * foo bar baz
+ * foo bar baz
+ * - item2
+ * foo bar baz
+ * foo bar baz
+ */
+
+ /* List:
+ * - item1
+ * foo bar baz
+ * foo bar baz
+ * - item2
+ * foo bar baz
+ * foo bar baz
+ */
+
+ // Should the next comment leader be left alone?
+ // Yes.
+
+ // Should the next comment leader be left alone?
+ // Yes.
+
+ /* Here the comment leader should be left intact. */
+ // And so should this one.
+
+ /* Here the comment leader should be left intact. */
+ // And so should this one.
+
+ if (condition) // Remove the next comment leader!
+ // OK, I will.
+ action();
+
+ if (condition) // Remove the next comment leader!
+ // OK, I will.
+ action();
+
+ int i = 7 /* foo *// 3
+ // comment
+ ;
+
+ int i = 7 /* foo *// 3
+ // comment
+ ;
+
+ ># Note that the last character of the ending comment leader (left angle
+ # bracket) is a comment leader itself. Make sure that this comment leader is
+ # not removed from the next line #<
+ < On this line a new comment is opened which spans 2 lines. This comment should
+ < retain its comment leader.
+
+ ># Note that the last character of the ending comment leader (left angle
+ # bracket) is a comment leader itself. Make sure that this comment leader is
+ # not removed from the next line #<
+ < On this line a new comment is opened which spans 2 lines. This comment should
+ < retain its comment leader.
+
+ }
+ ]])
+
+ feed_command('/^{/+1')
+ feed_command([[set comments=sO:*\ -,mO:*\ \ ,exO:*/]])
+ feed_command('set comments+=s1:/*,mb:*,ex:*/,://')
+ feed_command('set comments+=s1:>#,mb:#,ex:#<,:<')
+ feed_command('set backspace=eol,start')
+
+ -- With 'joinspaces' on (the default setting), again join lines and verify
+ -- that comment leaders are stripped or kept as appropriate.
+ feed_command('.,+3join')
+ feed('j4J<cr>')
+ feed_command('.,+8join')
+ feed('j9J<cr>')
+ feed_command('.,+2join')
+ feed('j3J<cr>')
+ feed_command('.,+2join')
+ feed('j3J<cr>')
+ feed_command('.,+2join')
+ feed('jj3J<cr>')
+ feed('j')
+ feed_command('.,+2join')
+ feed('jj3J<cr>')
+ feed('j')
+ feed_command('.,+5join')
+ feed('j6J<cr>')
+ feed(
+ 'oSome code!<cr>// Make sure backspacing does not remove this comment leader.<esc>0i<bs><esc>'
+ )
+
+ expect([[
+ {
+ /* Make sure the previous comment leader is not removed. */
+ /* Make sure the previous comment leader is not removed. */
+ /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
+ /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
+ // Should the next comment leader be left alone? Yes.
+ // Should the next comment leader be left alone? Yes.
+ /* Here the comment leader should be left intact. */ // And so should this one.
+ /* Here the comment leader should be left intact. */ // And so should this one.
+ if (condition) // Remove the next comment leader! OK, I will.
+ action();
+ if (condition) // Remove the next comment leader! OK, I will.
+ action();
+ int i = 7 /* foo *// 3 // comment
+ ;
+ int i = 7 /* foo *// 3 // comment
+ ;
+ ># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
+ ># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
+
+ Some code!// Make sure backspacing does not remove this comment leader.
+ }
+ ]])
+ end)
end)
