mirror of
https://github.com/neovim/neovim.git
synced 2025-10-26 12:27:24 +00:00
test: rename (meths, funcs) -> (api, fn)
This commit is contained in:
@@ -7,7 +7,7 @@ local exec = helpers.exec
|
||||
local eval = helpers.eval
|
||||
local exec_lua = helpers.exec_lua
|
||||
local feed = helpers.feed
|
||||
local meths = helpers.meths
|
||||
local api = helpers.api
|
||||
local pcall_err = helpers.pcall_err
|
||||
local assert_alive = helpers.assert_alive
|
||||
|
||||
@@ -543,60 +543,56 @@ describe('statuscolumn', function()
|
||||
end)
|
||||
|
||||
it('clicks work with mousemodel=' .. model, function()
|
||||
meths.nvim_set_option_value('statuscolumn', '%0@MyClickFunc@%=%l%T', {})
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
api.nvim_set_option_value('statuscolumn', '%0@MyClickFunc@%=%l%T', {})
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
eq('0 1 l 4', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
eq('0 2 l 4', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
eq('0 3 l 4', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
eq('0 4 l 4', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 3, 0)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 3, 0)
|
||||
eq('0 1 r 7', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 3, 0)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 3, 0)
|
||||
eq('0 2 r 7', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 3, 0)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 3, 0)
|
||||
eq('0 3 r 7', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 3, 0)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 3, 0)
|
||||
eq('0 4 r 7', eval('g:testvar'))
|
||||
|
||||
command('rightbelow vsplit')
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 27)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 27)
|
||||
eq('0 1 l 4', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 3, 27)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 3, 27)
|
||||
eq('0 1 r 7', eval('g:testvar'))
|
||||
command('setlocal rightleft')
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 52)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 52)
|
||||
eq('0 1 l 4', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 3, 52)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 3, 52)
|
||||
eq('0 1 r 7', eval('g:testvar'))
|
||||
command('wincmd H')
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 25)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 25)
|
||||
eq('0 1 l 4', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 3, 25)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 3, 25)
|
||||
eq('0 1 r 7', eval('g:testvar'))
|
||||
command('close')
|
||||
|
||||
command('set laststatus=2 winbar=%f')
|
||||
command('let g:testvar = ""')
|
||||
-- Check that winbar click doesn't register as statuscolumn click
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 0, 0)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 0, 0)
|
||||
eq('', eval('g:testvar'))
|
||||
-- Check that statusline click doesn't register as statuscolumn click
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 12, 0)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 12, 0)
|
||||
eq('', eval('g:testvar'))
|
||||
-- Check that cmdline click doesn't register as statuscolumn click
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 13, 0)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 13, 0)
|
||||
eq('', eval('g:testvar'))
|
||||
end)
|
||||
|
||||
it('clicks and highlights work with control characters', function()
|
||||
meths.nvim_set_option_value(
|
||||
'statuscolumn',
|
||||
'\t%#NonText#\1%0@MyClickFunc@\t\1%T\t%##\1',
|
||||
{}
|
||||
)
|
||||
api.nvim_set_option_value('statuscolumn', '\t%#NonText#\1%0@MyClickFunc@\t\1%T\t%##\1', {})
|
||||
screen:expect {
|
||||
grid = [[
|
||||
{1:^I}{0:^A^I^A^I}{1:^A}aaaaa |*4
|
||||
@@ -609,13 +605,13 @@ describe('statuscolumn', function()
|
||||
[1] = { foreground = Screen.colors.Brown }, -- LineNr
|
||||
},
|
||||
}
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 4, 3)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 4, 3)
|
||||
eq('', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 5, 8)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 5, 8)
|
||||
eq('', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('right', 'press', '', 0, 6, 4)
|
||||
api.nvim_input_mouse('right', 'press', '', 0, 6, 4)
|
||||
eq('0 1 r 10', eval('g:testvar'))
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 7, 7)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 7, 7)
|
||||
eq('0 1 l 11', eval('g:testvar'))
|
||||
end)
|
||||
|
||||
@@ -625,7 +621,7 @@ describe('statuscolumn', function()
|
||||
[0] = { foreground = Screen.colors.Brown },
|
||||
[1] = { background = Screen.colors.Plum1 },
|
||||
})
|
||||
meths.nvim_set_option_value('statuscolumn', '%0@MyClickFunc@%l%T', {})
|
||||
api.nvim_set_option_value('statuscolumn', '%0@MyClickFunc@%l%T', {})
|
||||
exec([[
|
||||
function! MyClickFunc(minwid, clicks, button, mods)
|
||||
let g:testvar = printf("%d %d %s %d", a:minwid, a:clicks, a:button, getmousepos().line)
|
||||
@@ -634,26 +630,26 @@ describe('statuscolumn', function()
|
||||
endfunction
|
||||
]])
|
||||
-- clicking an item does not drag mouse
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
screen:expect([[
|
||||
{0:8 }^aaaaa |
|
||||
{1: Echo } |
|
||||
]])
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 1, 5)
|
||||
meths.nvim_input_mouse('left', 'release', '', 0, 1, 5)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 1, 5)
|
||||
api.nvim_input_mouse('left', 'release', '', 0, 1, 5)
|
||||
screen:expect([[
|
||||
{0:8 }^aaaaa |
|
||||
0 1 l 8 |
|
||||
]])
|
||||
command('echo')
|
||||
-- clicking outside to close the menu does not drag mouse
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 0)
|
||||
screen:expect([[
|
||||
{0:8 }^aaaaa |
|
||||
{1: Echo } |
|
||||
]])
|
||||
meths.nvim_input_mouse('left', 'press', '', 0, 0, 10)
|
||||
meths.nvim_input_mouse('left', 'release', '', 0, 0, 10)
|
||||
api.nvim_input_mouse('left', 'press', '', 0, 0, 10)
|
||||
api.nvim_input_mouse('left', 'release', '', 0, 0, 10)
|
||||
screen:expect([[
|
||||
{0:8 }^aaaaa |
|
||||
|
|
||||
|
||||
Reference in New Issue
Block a user