From efa2682e3b513c4a33d987dc651db5913feff21a Mon Sep 17 00:00:00 2001 From: ZyX Date: Fri, 29 Jul 2016 21:41:45 +0300 Subject: *: Partial string handling refactoring Main points: - Replace `char_u` with `char` in some cases. - Remove `str[len] = NUL` hack in some cases when `str` may be considered `const`. --- test/functional/eval/let_spec.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 test/functional/eval/let_spec.lua (limited to 'test') diff --git a/test/functional/eval/let_spec.lua b/test/functional/eval/let_spec.lua new file mode 100644 index 0000000000..c3ab3cc367 --- /dev/null +++ b/test/functional/eval/let_spec.lua @@ -0,0 +1,22 @@ +local helpers = require('test.functional.helpers')(after_each) + +local eq = helpers.eq +local clear = helpers.clear +local meths = helpers.meths +local redir_exec = helpers.redir_exec + +before_each(clear) + +describe(':let command', function() + it('correctly lists variables with curly-braces', function() + meths.set_var('v', {0}) + eq('\nv [0]', redir_exec('let {"v"}')) + end) + + it('correctly lists variables with subscript', function() + meths.set_var('v', {0}) + eq('\nv[0] #0', redir_exec('let v[0]')) + eq('\ng:["v"][0] #0', redir_exec('let g:["v"][0]')) + eq('\n{"g:"}["v"][0] #0', redir_exec('let {"g:"}["v"][0]')) + end) +end) -- cgit From 0e44916fff882de6db6f0e98438e8db04293471e Mon Sep 17 00:00:00 2001 From: Kurt Bonatz Date: Wed, 15 Feb 2017 02:12:31 -0800 Subject: ex_docmd.c: Allow unescaped spaces in :edit filename (#6119) This makes :edit consistent on all platforms. Also affects :argedit, et al. Wild (tab) completion doesn't work, though. Closes #6010 --- test/functional/legacy/arglist_spec.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/functional/legacy/arglist_spec.lua b/test/functional/legacy/arglist_spec.lua index b86d3f0aea..f5e3522972 100644 --- a/test/functional/legacy/arglist_spec.lua +++ b/test/functional/legacy/arglist_spec.lua @@ -222,7 +222,6 @@ describe('argument list commands', function() execute('argedit a') eq({'a', 'b'}, eval('argv()')) eq('a', eval('expand("%:t")')) - assert_fails('argedit a b', 'E172:') execute('argedit c') eq({'a', 'c', 'b'}, eval('argv()')) execute('0argedit x') @@ -232,6 +231,9 @@ describe('argument list commands', function() execute('argedit! y') eq({'x', 'y', 'a', 'c', 'b'}, eval('argv()')) execute('%argd') + -- Nvim allows unescaped spaces in filename on all platforms. #6010 + execute('argedit a b') + eq({'a b'}, eval('argv()')) end) it('test for :argdelete command', function() -- cgit From b0bbe82a60ea65e94d6fd4fdc2a13b45aa457973 Mon Sep 17 00:00:00 2001 From: Kurt Bonatz Date: Sat, 18 Feb 2017 05:04:46 -0800 Subject: eval.c: has("unnamedplus"). (#6136) Return 1 for UNIX with a functioning clipboard provider. Closes #6103 --- test/functional/eval/has_spec.lua | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test') diff --git a/test/functional/eval/has_spec.lua b/test/functional/eval/has_spec.lua index 97b3b0e620..78c4e08fde 100644 --- a/test/functional/eval/has_spec.lua +++ b/test/functional/eval/has_spec.lua @@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')(after_each) local eq = helpers.eq local clear = helpers.clear local funcs = helpers.funcs +local iswin = helpers.iswin describe('has()', function() before_each(clear) @@ -49,4 +50,11 @@ describe('has()', function() eq(1, funcs.has("nvim-00.001.05")) end) + it('"unnamedplus"', function() + if (not iswin()) and funcs.has("clipboard") == 1 then + eq(1, funcs.has("unnamedplus")) + else + eq(0, funcs.has("unnamedplus")) + end + end) end) -- cgit From 308ccb6f5e40ba1dbe4abfebc9df3399d7f17504 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 18 Feb 2017 02:39:07 +0100 Subject: cmdline: CTRL-R: instead of CR between lines. ^M isn't any more "correct" than space: the "technically correct" interpretation is to execute the first line that is seen (and this is what happens on middle-click paste in Vim). ^M is only intended to defuse the newline, so that the user can review the command. We can do that with a space instead, and then the command can be executed without having to fix it up first. --- test/functional/cmdline/ctrl_r_spec.lua | 34 +++++++++++++++++++++++++++++ test/functional/cmdline/history_spec.lua | 36 +++++++++++++++++++++++++++++++ test/functional/ex_getln/history_spec.lua | 36 ------------------------------- 3 files changed, 70 insertions(+), 36 deletions(-) create mode 100644 test/functional/cmdline/ctrl_r_spec.lua create mode 100644 test/functional/cmdline/history_spec.lua delete mode 100644 test/functional/ex_getln/history_spec.lua (limited to 'test') diff --git a/test/functional/cmdline/ctrl_r_spec.lua b/test/functional/cmdline/ctrl_r_spec.lua new file mode 100644 index 0000000000..1bb3174737 --- /dev/null +++ b/test/functional/cmdline/ctrl_r_spec.lua @@ -0,0 +1,34 @@ +local helpers = require('test.functional.helpers')(after_each) +local clear, insert, funcs, eq, feed = + helpers.clear, helpers.insert, helpers.funcs, helpers.eq, helpers.feed + +describe('cmdline CTRL-R', function() + before_each(clear) + + it('pasting non-special register inserts between lines', function() + insert([[ + line1abc + line2somemoretext + ]]) + -- Yank 2 lines linewise, then paste to cmdline. + feed([[gg0yj:0]]) + -- inserted *between* lines, not after the final line. + eq('line1abc line2somemoretext', funcs.getcmdline()) + + -- Yank 2 lines characterwise, then paste to cmdline. + feed([[gg05lyvj:0]]) + -- inserted *between* lines, not after the final line. + eq('abc line2', funcs.getcmdline()) + + -- Yank 1 line linewise, then paste to cmdline. + feed([[ggyy:0]]) + -- No spaces inserted. + eq('line1abc', funcs.getcmdline()) + end) + + it('pasting special register inserts , ', function() + feed([[:="foo\nbar\rbaz"]]) + eq('foo\nbar\rbaz', funcs.getcmdline()) + end) +end) + diff --git a/test/functional/cmdline/history_spec.lua b/test/functional/cmdline/history_spec.lua new file mode 100644 index 0000000000..20f9cf06a2 --- /dev/null +++ b/test/functional/cmdline/history_spec.lua @@ -0,0 +1,36 @@ +local helpers = require('test.functional.helpers')(after_each) +local clear, meths, funcs, eq = + helpers.clear, helpers.meths, helpers.funcs, helpers.eq + +describe('history support code', function() + before_each(clear) + + it('correctly clears start of the history', function() + -- Regression test: check absense of the memory leak when clearing start of + -- the history using ex_getln.c/clr_history(). + eq(1, funcs.histadd(':', 'foo')) + eq(1, funcs.histdel(':')) + eq('', funcs.histget(':', -1)) + end) + + it('correctly clears end of the history', function() + -- Regression test: check absense of the memory leak when clearing end of + -- the history using ex_getln.c/clr_history(). + meths.set_option('history', 1) + eq(1, funcs.histadd(':', 'foo')) + eq(1, funcs.histdel(':')) + eq('', funcs.histget(':', -1)) + end) + + it('correctly removes item from history', function() + -- Regression test: check that ex_getln.c/del_history_idx() correctly clears + -- history index after removing history entry. If it does not then deleting + -- history will result in a double free. + eq(1, funcs.histadd(':', 'foo')) + eq(1, funcs.histadd(':', 'bar')) + eq(1, funcs.histadd(':', 'baz')) + eq(1, funcs.histdel(':', -2)) + eq(1, funcs.histdel(':')) + eq('', funcs.histget(':', -1)) + end) +end) diff --git a/test/functional/ex_getln/history_spec.lua b/test/functional/ex_getln/history_spec.lua deleted file mode 100644 index 20f9cf06a2..0000000000 --- a/test/functional/ex_getln/history_spec.lua +++ /dev/null @@ -1,36 +0,0 @@ -local helpers = require('test.functional.helpers')(after_each) -local clear, meths, funcs, eq = - helpers.clear, helpers.meths, helpers.funcs, helpers.eq - -describe('history support code', function() - before_each(clear) - - it('correctly clears start of the history', function() - -- Regression test: check absense of the memory leak when clearing start of - -- the history using ex_getln.c/clr_history(). - eq(1, funcs.histadd(':', 'foo')) - eq(1, funcs.histdel(':')) - eq('', funcs.histget(':', -1)) - end) - - it('correctly clears end of the history', function() - -- Regression test: check absense of the memory leak when clearing end of - -- the history using ex_getln.c/clr_history(). - meths.set_option('history', 1) - eq(1, funcs.histadd(':', 'foo')) - eq(1, funcs.histdel(':')) - eq('', funcs.histget(':', -1)) - end) - - it('correctly removes item from history', function() - -- Regression test: check that ex_getln.c/del_history_idx() correctly clears - -- history index after removing history entry. If it does not then deleting - -- history will result in a double free. - eq(1, funcs.histadd(':', 'foo')) - eq(1, funcs.histadd(':', 'bar')) - eq(1, funcs.histadd(':', 'baz')) - eq(1, funcs.histdel(':', -2)) - eq(1, funcs.histdel(':')) - eq('', funcs.histget(':', -1)) - end) -end) -- cgit From baab49ee89a927f63bfefdb432155a1037afa93a Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 18 Feb 2017 23:15:27 +0100 Subject: cmdline: CTRL-R: Omit trailing . The "technically correct" interpretation is to execute the first line that is seen (and this is what happens on middle-click paste in Vim). ^M is only intended to "defuse" the newline, so the user can review it. The parent commit changed the behavior to insert between lines, but that's a higher-risk change: it is arguably possible that some user *wants* the literal ^M chars when e.g. assigning to a register: :let @a='b' To avoid that risk, keep the old behavior and only omit the last ^M. This makes `yy:0` nicer at no cost. --- test/functional/cmdline/ctrl_r_spec.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/functional/cmdline/ctrl_r_spec.lua b/test/functional/cmdline/ctrl_r_spec.lua index 1bb3174737..d2dad23e98 100644 --- a/test/functional/cmdline/ctrl_r_spec.lua +++ b/test/functional/cmdline/ctrl_r_spec.lua @@ -5,24 +5,24 @@ local clear, insert, funcs, eq, feed = describe('cmdline CTRL-R', function() before_each(clear) - it('pasting non-special register inserts between lines', function() + it('pasting non-special register inserts *between* lines', function() insert([[ line1abc line2somemoretext ]]) -- Yank 2 lines linewise, then paste to cmdline. feed([[gg0yj:0]]) - -- inserted *between* lines, not after the final line. - eq('line1abc line2somemoretext', funcs.getcmdline()) + -- inserted between lines, NOT after the final line. + eq('line1abc\rline2somemoretext', funcs.getcmdline()) -- Yank 2 lines characterwise, then paste to cmdline. feed([[gg05lyvj:0]]) - -- inserted *between* lines, not after the final line. - eq('abc line2', funcs.getcmdline()) + -- inserted between lines, NOT after the final line. + eq('abc\rline2', funcs.getcmdline()) -- Yank 1 line linewise, then paste to cmdline. feed([[ggyy:0]]) - -- No spaces inserted. + -- No inserted. eq('line1abc', funcs.getcmdline()) end) -- cgit