mirror of
https://github.com/neovim/neovim.git
synced 2025-12-16 03:15:39 +00:00
*: Move some dictionary functions to typval.h and use char*
Also fixes buffer reusage in setmatches() and complete().
This commit is contained in:
ZyX
39
test/functional/eval/match_functions_spec.lua
Normal file
39
test/functional/eval/match_functions_spec.lua
Normal file
@@ -0,0 +1,39 @@
|
||||
local helpers = require('test.functional.helpers')(after_each)
|
||||
|
||||
local eq = helpers.eq
|
||||
local clear = helpers.clear
|
||||
local funcs = helpers.funcs
|
||||
local command = helpers.command
|
||||
|
||||
before_each(clear)
|
||||
|
||||
describe('setmatches()', function()
|
||||
it('correctly handles case when both group and pattern entries are numbers',
|
||||
function()
|
||||
command('hi def link 1 PreProc')
|
||||
eq(0, funcs.setmatches({{group=1, pattern=2, id=3, priority=4}}))
|
||||
eq({{
|
||||
group='1',
|
||||
pattern='2',
|
||||
id=3,
|
||||
priority=4,
|
||||
}}, funcs.getmatches())
|
||||
eq(0, funcs.setmatches({{group=1, pattern=2, id=3, priority=4, conceal=5}}))
|
||||
eq({{
|
||||
group='1',
|
||||
pattern='2',
|
||||
id=3,
|
||||
priority=4,
|
||||
conceal='5',
|
||||
}}, funcs.getmatches())
|
||||
eq(0, funcs.setmatches({{group=1, pos1={2}, pos2={6}, id=3, priority=4, conceal=5}}))
|
||||
eq({{
|
||||
group='1',
|
||||
pos1={2},
|
||||
pos2={6},
|
||||
id=3,
|
||||
priority=4,
|
||||
conceal='5',
|
||||
}}, funcs.getmatches())
|
||||
end)
|
||||
end)
|
||||
@@ -7,7 +7,6 @@ local eval = helpers.eval
|
||||
local exc_exec = helpers.exc_exec
|
||||
local redir_exec = helpers.redir_exec
|
||||
local funcs = helpers.funcs
|
||||
local write_file = helpers.write_file
|
||||
local NIL = helpers.NIL
|
||||
local source = helpers.source
|
||||
local dedent = helpers.dedent
|
||||
@@ -105,10 +104,8 @@ describe('string() function', function()
|
||||
end)
|
||||
|
||||
describe('used to represent funcrefs', function()
|
||||
local fname = 'Xtest-functional-eval-string_spec-fref-script.vim'
|
||||
|
||||
before_each(function()
|
||||
write_file(fname, [[
|
||||
source([[
|
||||
function Test1()
|
||||
endfunction
|
||||
|
||||
@@ -120,11 +117,6 @@ describe('string() function', function()
|
||||
|
||||
let g:Test2_f = function('s:Test2')
|
||||
]])
|
||||
command('source ' .. fname)
|
||||
end)
|
||||
|
||||
after_each(function()
|
||||
os.remove(fname)
|
||||
end)
|
||||
|
||||
it('dumps references to built-in functions', function()
|
||||
|
||||
@@ -48,7 +48,7 @@ describe('dictionary change notifications', function()
|
||||
eq({'notification', 'values', {key, vals}}, next_msg())
|
||||
end
|
||||
|
||||
describe('watcher', function()
|
||||
describe(dict_expr .. ' watcher', function()
|
||||
if dict_init then
|
||||
setup(function()
|
||||
source(dict_init)
|
||||
@@ -58,7 +58,7 @@ describe('dictionary change notifications', function()
|
||||
before_each(function()
|
||||
source([[
|
||||
function! g:Changed(dict, key, value)
|
||||
if a:dict != ]]..dict_expr..[[ |
|
||||
if a:dict isnot ]]..dict_expr..[[ |
|
||||
throw 'invalid dict'
|
||||
endif
|
||||
call rpcnotify(g:channel, 'values', a:key, a:value)
|
||||
|
||||
83
test/functional/ex_cmds/quickfix_commands_spec.lua
Normal file
83
test/functional/ex_cmds/quickfix_commands_spec.lua
Normal file
@@ -0,0 +1,83 @@
|
||||
local helpers = require('test.functional.helpers')(after_each)
|
||||
|
||||
local eq = helpers.eq
|
||||
local clear = helpers.clear
|
||||
local funcs = helpers.funcs
|
||||
local command = helpers.command
|
||||
local exc_exec = helpers.exc_exec
|
||||
local write_file = helpers.write_file
|
||||
local curbufmeths = helpers.curbufmeths
|
||||
|
||||
local file_base = 'Xtest-functional-ex_cmds-quickfix_commands'
|
||||
|
||||
before_each(clear)
|
||||
|
||||
for _, c in ipairs({'l', 'c'}) do
|
||||
local file = ('%s.%s'):format(file_base, c)
|
||||
local filecmd = c .. 'file'
|
||||
local getfcmd = c .. 'getfile'
|
||||
local addfcmd = c .. 'addfile'
|
||||
local getlist = (c == 'c') and funcs.getqflist or (
|
||||
function() return funcs.getloclist(0) end)
|
||||
|
||||
describe((':%s*file commands'):format(c), function()
|
||||
before_each(function()
|
||||
write_file(file, ([[
|
||||
%s-1.res:700:10:Line 700
|
||||
%s-2.res:800:15:Line 800
|
||||
]]):format(file, file))
|
||||
end)
|
||||
after_each(function()
|
||||
os.remove(file)
|
||||
end)
|
||||
|
||||
it('work', function()
|
||||
command(('%s %s'):format(filecmd, file))
|
||||
-- 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',
|
||||
nr=-1, bufnr=2, valid=1, pattern='', vcol=0, ['type']=''},
|
||||
{lnum=800, col=15, text='Line 800',
|
||||
nr=-1, bufnr=3, valid=1, pattern='', vcol=0, ['type']=''},
|
||||
}
|
||||
eq(list, getlist())
|
||||
eq(('%s-1.res'):format(file), funcs.bufname(list[1].bufnr))
|
||||
eq(('%s-2.res'):format(file), funcs.bufname(list[2].bufnr))
|
||||
|
||||
-- Run cfile/lfile from a modified buffer
|
||||
command('enew!')
|
||||
curbufmeths.set_lines(1, 1, true, {'Quickfix'})
|
||||
eq(('Vim(%s):E37: No write since last change (add ! to override)'):format(
|
||||
filecmd),
|
||||
exc_exec(('%s %s'):format(filecmd, file)))
|
||||
|
||||
write_file(file, ([[
|
||||
%s-3.res:900:30:Line 900
|
||||
]]):format(file))
|
||||
command(('%s %s'):format(addfcmd, file))
|
||||
list[#list + 1] = {
|
||||
lnum=900, col=30, text='Line 900',
|
||||
nr=-1, bufnr=5, valid=1, pattern='', vcol=0, ['type']='',
|
||||
}
|
||||
eq(list, getlist())
|
||||
eq(('%s-3.res'):format(file), funcs.bufname(list[3].bufnr))
|
||||
|
||||
write_file(file, ([[
|
||||
%s-1.res:222:77:Line 222
|
||||
%s-2.res:333:88:Line 333
|
||||
]]):format(file, file))
|
||||
command('enew!')
|
||||
command(('%s %s'):format(getfcmd, file))
|
||||
list = {
|
||||
{lnum=222, col=77, text='Line 222',
|
||||
nr=-1, bufnr=2, valid=1, pattern='', vcol=0, ['type']=''},
|
||||
{lnum=333, col=88, text='Line 333',
|
||||
nr=-1, bufnr=3, valid=1, pattern='', vcol=0, ['type']=''},
|
||||
}
|
||||
eq(list, getlist())
|
||||
eq(('%s-1.res'):format(file), funcs.bufname(list[1].bufnr))
|
||||
eq(('%s-2.res'):format(file), funcs.bufname(list[2].bufnr))
|
||||
end)
|
||||
end)
|
||||
end
|
||||
@@ -3,6 +3,7 @@ local Screen = require('test.functional.ui.screen')
|
||||
local clear, feed = helpers.clear, helpers.feed
|
||||
local eval, eq, neq = helpers.eval, helpers.eq, helpers.neq
|
||||
local execute, source, expect = helpers.execute, helpers.source, helpers.expect
|
||||
local meths = helpers.meths
|
||||
|
||||
if helpers.pending_win32(pending) then return end
|
||||
|
||||
@@ -814,6 +815,41 @@ describe('completion', function()
|
||||
end)
|
||||
end)
|
||||
|
||||
describe('with numeric items', function()
|
||||
before_each(function()
|
||||
source([[
|
||||
function! TestComplete() abort
|
||||
call complete(1, g:_complist)
|
||||
return ''
|
||||
endfunction
|
||||
]])
|
||||
meths.set_option('completeopt', 'menuone,noselect')
|
||||
meths.set_var('_complist', {{
|
||||
word=0,
|
||||
abbr=1,
|
||||
menu=2,
|
||||
kind=3,
|
||||
info=4,
|
||||
icase=5,
|
||||
dup=6,
|
||||
empty=7,
|
||||
}})
|
||||
end)
|
||||
|
||||
it('shows correct variant as word', function()
|
||||
feed('i<C-r>=TestComplete()<CR>')
|
||||
screen:expect([[
|
||||
^ |
|
||||
{1:1 3 2 }{0: }|
|
||||
{0:~ }|
|
||||
{0:~ }|
|
||||
{0:~ }|
|
||||
{0:~ }|
|
||||
{0:~ }|
|
||||
{3:-- INSERT --} |
|
||||
]])
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
|
||||
describe('External completion popupmenu', function()
|
||||
|
||||
@@ -272,17 +272,17 @@ local lua2typvalt_type_tab = {
|
||||
processed[l].dv_refcount = processed[l].dv_refcount + 1
|
||||
return typvalt(eval.VAR_DICT, {v_dict=processed[l]})
|
||||
end
|
||||
local dct = eval.dict_alloc()
|
||||
local dct = eval.tv_dict_alloc()
|
||||
dct.dv_refcount = 1
|
||||
processed[l] = dct
|
||||
local ret = typvalt(eval.VAR_DICT, {v_dict=dct})
|
||||
for k, v in pairs(l) do
|
||||
if type(k) == 'string' then
|
||||
local di = eval.dictitem_alloc(to_cstr(k))
|
||||
local di = eval.tv_dict_item_alloc(to_cstr(k))
|
||||
local val_tv = ffi.gc(lua2typvalt(v, processed), nil)
|
||||
eval.copy_tv(val_tv, di.di_tv)
|
||||
eval.tv_clear(val_tv)
|
||||
eval.dict_add(dct, di)
|
||||
eval.tv_dict_add(dct, di)
|
||||
end
|
||||
end
|
||||
return ret
|
||||
|
||||
Reference in New Issue
Block a user