diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-05-05 20:01:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-05 20:01:27 +0200 |
commit | 9d6c205a339f0926bdf6cf9312e1db40642df259 (patch) | |
tree | a4cccc22eba66a0ab9c9e5f546541d1846e72c32 /test | |
parent | 6891d8aeca9abc24314ad92cb0c669afa13a8769 (diff) | |
parent | 5f903a164843083aba1b3476dab978fff6b624b0 (diff) | |
download | rneovim-9d6c205a339f0926bdf6cf9312e1db40642df259.tar.gz rneovim-9d6c205a339f0926bdf6cf9312e1db40642df259.tar.bz2 rneovim-9d6c205a339f0926bdf6cf9312e1db40642df259.zip |
Merge #9842 from mhinz/vim-8.0.1782
vim-patch:8.0.{1353,1389,1406,1420,1432,1500,1569,1634,1678,1727,1782,1805,1831}
Diffstat (limited to 'test')
-rw-r--r-- | test/functional/ex_cmds/quickfix_commands_spec.lua | 10 | ||||
-rw-r--r-- | test/functional/viml/errorlist_spec.lua | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/functional/ex_cmds/quickfix_commands_spec.lua b/test/functional/ex_cmds/quickfix_commands_spec.lua index bf10f80401..3392a90270 100644 --- a/test/functional/ex_cmds/quickfix_commands_spec.lua +++ b/test/functional/ex_cmds/quickfix_commands_spec.lua @@ -37,9 +37,9 @@ for _, c in ipairs({'l', 'c'}) do -- Second line of each entry (i.e. `nr=-1, …`) was obtained from actual -- results. First line (i.e. `{lnum=…`) was obtained from legacy test. local list = { - {lnum=700, col=10, text='Line 700', + {lnum=700, col=10, text='Line 700', module='', nr=-1, bufnr=2, valid=1, pattern='', vcol=0, ['type']=''}, - {lnum=800, col=15, text='Line 800', + {lnum=800, col=15, text='Line 800', module='', nr=-1, bufnr=3, valid=1, pattern='', vcol=0, ['type']=''}, } eq(list, getlist()) @@ -58,7 +58,7 @@ for _, c in ipairs({'l', 'c'}) do ]]):format(file)) command(('%s %s'):format(addfcmd, file)) list[#list + 1] = { - lnum=900, col=30, text='Line 900', + lnum=900, col=30, text='Line 900', module='', nr=-1, bufnr=5, valid=1, pattern='', vcol=0, ['type']='', } eq(list, getlist()) @@ -71,9 +71,9 @@ for _, c in ipairs({'l', 'c'}) do command('enew!') command(('%s %s'):format(getfcmd, file)) list = { - {lnum=222, col=77, text='Line 222', + {lnum=222, col=77, text='Line 222', module='', nr=-1, bufnr=2, valid=1, pattern='', vcol=0, ['type']=''}, - {lnum=333, col=88, text='Line 333', + {lnum=333, col=88, text='Line 333', module='', nr=-1, bufnr=3, valid=1, pattern='', vcol=0, ['type']=''}, } eq(list, getlist()) diff --git a/test/functional/viml/errorlist_spec.lua b/test/functional/viml/errorlist_spec.lua index 6c5a63e6b1..c5390cbd12 100644 --- a/test/functional/viml/errorlist_spec.lua +++ b/test/functional/viml/errorlist_spec.lua @@ -26,7 +26,7 @@ describe('setqflist()', function() it('sets w:quickfix_title', function() setqflist({''}, 'r', 'foo') command('copen') - eq(':foo', get_cur_win_var('quickfix_title')) + eq('foo', get_cur_win_var('quickfix_title')) setqflist({''}, 'r', {['title'] = 'qf_title'}) eq('qf_title', get_cur_win_var('quickfix_title')) end) @@ -34,7 +34,7 @@ describe('setqflist()', function() it('allows string {what} for backwards compatibility', function() setqflist({}, 'r', '5') command('copen') - eq(':5', get_cur_win_var('quickfix_title')) + eq('5', get_cur_win_var('quickfix_title')) end) it('requires a dict for {what}', function() @@ -64,8 +64,8 @@ describe('setloclist()', function() setloclist(1, {}, 'r', 'foo') setloclist(2, {}, 'r', 'bar') command('lopen') - eq(':bar', get_cur_win_var('quickfix_title')) + eq('bar', get_cur_win_var('quickfix_title')) command('lclose | wincmd w | lopen') - eq(':foo', get_cur_win_var('quickfix_title')) + eq('foo', get_cur_win_var('quickfix_title')) end) end) |