From d33e1da9b7f7e886219cfdd20b9bbfaccdc43be9 Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Fri, 12 Jan 2024 11:28:20 +0000 Subject: test: do not inject vim module into global helpers --- test/functional/vimscript/screenchar_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/functional/vimscript/screenchar_spec.lua') diff --git a/test/functional/vimscript/screenchar_spec.lua b/test/functional/vimscript/screenchar_spec.lua index 767e3c57ef..5df9c480e8 100644 --- a/test/functional/vimscript/screenchar_spec.lua +++ b/test/functional/vimscript/screenchar_spec.lua @@ -1,7 +1,7 @@ local helpers = require('test.functional.helpers')(after_each) local clear, eq, neq = helpers.clear, helpers.eq, helpers.neq local command, meths, funcs = helpers.command, helpers.meths, helpers.funcs -local tbl_deep_extend = helpers.tbl_deep_extend +local tbl_deep_extend = vim.tbl_deep_extend -- Set up two overlapping floating windows local setup_floating_windows = function() -- cgit From c30f2e3182e3b50e7c03932027ac55edfc8ada4a Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Fri, 12 Jan 2024 12:44:54 +0000 Subject: test: typing for helpers.meths --- test/functional/vimscript/screenchar_spec.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/functional/vimscript/screenchar_spec.lua') diff --git a/test/functional/vimscript/screenchar_spec.lua b/test/functional/vimscript/screenchar_spec.lua index 5df9c480e8..f24aa87ff4 100644 --- a/test/functional/vimscript/screenchar_spec.lua +++ b/test/functional/vimscript/screenchar_spec.lua @@ -14,15 +14,15 @@ local setup_floating_windows = function() border = 'none', } - local bufnr_1 = meths.create_buf(false, true) - meths.buf_set_lines(bufnr_1, 0, -1, true, { 'aa' }) + local bufnr_1 = meths.nvim_create_buf(false, true) + meths.nvim_buf_set_lines(bufnr_1, 0, -1, true, { 'aa' }) local opts_1 = tbl_deep_extend('force', { row = 0, col = 0, zindex = 11 }, base_opts) - meths.open_win(bufnr_1, false, opts_1) + meths.nvim_open_win(bufnr_1, false, opts_1) - local bufnr_2 = meths.create_buf(false, true) - meths.buf_set_lines(bufnr_2, 0, -1, true, { 'bb' }) + local bufnr_2 = meths.nvim_create_buf(false, true) + meths.nvim_buf_set_lines(bufnr_2, 0, -1, true, { 'bb' }) local opts_2 = tbl_deep_extend('force', { row = 0, col = 1, zindex = 10 }, base_opts) - meths.open_win(bufnr_2, false, opts_2) + meths.nvim_open_win(bufnr_2, false, opts_2) command('redraw') end @@ -32,7 +32,7 @@ describe('screenchar() and family respect floating windows', function() clear() -- These commands result into visible text `aabc`. -- `aab` - from floating windows, `c` - from text in regular window. - meths.buf_set_lines(0, 0, -1, true, { 'cccc' }) + meths.nvim_buf_set_lines(0, 0, -1, true, { 'cccc' }) setup_floating_windows() end) -- cgit From 795f896a5772d5e0795f86642bdf90c82efac45c Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Fri, 12 Jan 2024 17:59:57 +0000 Subject: test: rename (meths, funcs) -> (api, fn) --- test/functional/vimscript/screenchar_spec.lua | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'test/functional/vimscript/screenchar_spec.lua') diff --git a/test/functional/vimscript/screenchar_spec.lua b/test/functional/vimscript/screenchar_spec.lua index f24aa87ff4..48b6893865 100644 --- a/test/functional/vimscript/screenchar_spec.lua +++ b/test/functional/vimscript/screenchar_spec.lua @@ -1,6 +1,6 @@ local helpers = require('test.functional.helpers')(after_each) local clear, eq, neq = helpers.clear, helpers.eq, helpers.neq -local command, meths, funcs = helpers.command, helpers.meths, helpers.funcs +local command, api, fn = helpers.command, helpers.api, helpers.fn local tbl_deep_extend = vim.tbl_deep_extend -- Set up two overlapping floating windows @@ -14,15 +14,15 @@ local setup_floating_windows = function() border = 'none', } - local bufnr_1 = meths.nvim_create_buf(false, true) - meths.nvim_buf_set_lines(bufnr_1, 0, -1, true, { 'aa' }) + local bufnr_1 = api.nvim_create_buf(false, true) + api.nvim_buf_set_lines(bufnr_1, 0, -1, true, { 'aa' }) local opts_1 = tbl_deep_extend('force', { row = 0, col = 0, zindex = 11 }, base_opts) - meths.nvim_open_win(bufnr_1, false, opts_1) + api.nvim_open_win(bufnr_1, false, opts_1) - local bufnr_2 = meths.nvim_create_buf(false, true) - meths.nvim_buf_set_lines(bufnr_2, 0, -1, true, { 'bb' }) + local bufnr_2 = api.nvim_create_buf(false, true) + api.nvim_buf_set_lines(bufnr_2, 0, -1, true, { 'bb' }) local opts_2 = tbl_deep_extend('force', { row = 0, col = 1, zindex = 10 }, base_opts) - meths.nvim_open_win(bufnr_2, false, opts_2) + api.nvim_open_win(bufnr_2, false, opts_2) command('redraw') end @@ -32,38 +32,38 @@ describe('screenchar() and family respect floating windows', function() clear() -- These commands result into visible text `aabc`. -- `aab` - from floating windows, `c` - from text in regular window. - meths.nvim_buf_set_lines(0, 0, -1, true, { 'cccc' }) + api.nvim_buf_set_lines(0, 0, -1, true, { 'cccc' }) setup_floating_windows() end) it('screenattr()', function() - local attr_1 = funcs.screenattr(1, 1) - local attr_2 = funcs.screenattr(1, 2) - local attr_3 = funcs.screenattr(1, 3) - local attr_4 = funcs.screenattr(1, 4) + local attr_1 = fn.screenattr(1, 1) + local attr_2 = fn.screenattr(1, 2) + local attr_3 = fn.screenattr(1, 3) + local attr_4 = fn.screenattr(1, 4) eq(attr_1, attr_2) eq(attr_1, attr_3) neq(attr_1, attr_4) end) it('screenchar()', function() - eq(97, funcs.screenchar(1, 1)) - eq(97, funcs.screenchar(1, 2)) - eq(98, funcs.screenchar(1, 3)) - eq(99, funcs.screenchar(1, 4)) + eq(97, fn.screenchar(1, 1)) + eq(97, fn.screenchar(1, 2)) + eq(98, fn.screenchar(1, 3)) + eq(99, fn.screenchar(1, 4)) end) it('screenchars()', function() - eq({ 97 }, funcs.screenchars(1, 1)) - eq({ 97 }, funcs.screenchars(1, 2)) - eq({ 98 }, funcs.screenchars(1, 3)) - eq({ 99 }, funcs.screenchars(1, 4)) + eq({ 97 }, fn.screenchars(1, 1)) + eq({ 97 }, fn.screenchars(1, 2)) + eq({ 98 }, fn.screenchars(1, 3)) + eq({ 99 }, fn.screenchars(1, 4)) end) it('screenstring()', function() - eq('a', funcs.screenstring(1, 1)) - eq('a', funcs.screenstring(1, 2)) - eq('b', funcs.screenstring(1, 3)) - eq('c', funcs.screenstring(1, 4)) + eq('a', fn.screenstring(1, 1)) + eq('a', fn.screenstring(1, 2)) + eq('b', fn.screenstring(1, 3)) + eq('c', fn.screenstring(1, 4)) end) end) -- cgit