test: rename (meths, funcs) -> (api, fn)

1 files changed, 146 insertions, 149 deletions

diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
index b86fe550a1..1973d3e1c7 100644
--- a/test/functional/api/highlight_spec.lua
+++ b/test/functional/api/highlight_spec.lua
@@ -4,8 +4,8 @@ local Screen = require('test.functional.ui.screen')
 local eq, eval = helpers.eq, helpers.eval
 local command = helpers.command
 local exec_capture = helpers.exec_capture
-local meths = helpers.meths
-local funcs = helpers.funcs
+local api = helpers.api
+local fn = helpers.fn
 local pcall_err = helpers.pcall_err
 local ok = helpers.ok
 local assert_alive = helpers.assert_alive
@@ -52,128 +52,125 @@ describe('API: highlight', function()
 
   it('nvim_get_hl_by_id', function()
     local hl_id = eval("hlID('NewHighlight')")
-    eq(expected_cterm, meths.nvim_get_hl_by_id(hl_id, false))
+    eq(expected_cterm, api.nvim_get_hl_by_id(hl_id, false))
 
     hl_id = eval("hlID('NewHighlight')")
     -- Test valid id.
-    eq(expected_rgb, meths.nvim_get_hl_by_id(hl_id, true))
+    eq(expected_rgb, api.nvim_get_hl_by_id(hl_id, true))
 
     -- Test invalid id.
-    eq('Invalid highlight id: 30000', pcall_err(meths.nvim_get_hl_by_id, 30000, false))
+    eq('Invalid highlight id: 30000', pcall_err(api.nvim_get_hl_by_id, 30000, false))
 
     -- Test all highlight properties.
     command('hi NewHighlight gui=underline,bold,italic,reverse,strikethrough,altfont,nocombine')
-    eq(expected_rgb2, meths.nvim_get_hl_by_id(hl_id, true))
+    eq(expected_rgb2, api.nvim_get_hl_by_id(hl_id, true))
 
     -- Test undercurl
     command('hi NewHighlight gui=undercurl')
-    eq(expected_undercurl, meths.nvim_get_hl_by_id(hl_id, true))
+    eq(expected_undercurl, api.nvim_get_hl_by_id(hl_id, true))
 
     -- Test nil argument.
     eq(
       'Wrong type for argument 1 when calling nvim_get_hl_by_id, expecting Integer',
-      pcall_err(meths.nvim_get_hl_by_id, { nil }, false)
+      pcall_err(api.nvim_get_hl_by_id, { nil }, false)
     )
 
     -- Test 0 argument.
-    eq('Invalid highlight id: 0', pcall_err(meths.nvim_get_hl_by_id, 0, false))
+    eq('Invalid highlight id: 0', pcall_err(api.nvim_get_hl_by_id, 0, false))
 
     -- Test -1 argument.
-    eq('Invalid highlight id: -1', pcall_err(meths.nvim_get_hl_by_id, -1, false))
+    eq('Invalid highlight id: -1', pcall_err(api.nvim_get_hl_by_id, -1, false))
 
     -- Test highlight group without ctermbg value.
     command('hi Normal ctermfg=red ctermbg=yellow')
     command('hi NewConstant ctermfg=green guifg=white guibg=blue')
     hl_id = eval("hlID('NewConstant')")
-    eq({ foreground = 10 }, meths.nvim_get_hl_by_id(hl_id, false))
+    eq({ foreground = 10 }, api.nvim_get_hl_by_id(hl_id, false))
 
     -- Test highlight group without ctermfg value.
     command('hi clear NewConstant')
     command('hi NewConstant ctermbg=Magenta guifg=white guibg=blue')
-    eq({ background = 13 }, meths.nvim_get_hl_by_id(hl_id, false))
+    eq({ background = 13 }, api.nvim_get_hl_by_id(hl_id, false))
 
     -- Test highlight group with ctermfg and ctermbg values.
     command('hi clear NewConstant')
     command('hi NewConstant ctermfg=green ctermbg=Magenta guifg=white guibg=blue')
-    eq({ foreground = 10, background = 13 }, meths.nvim_get_hl_by_id(hl_id, false))
+    eq({ foreground = 10, background = 13 }, api.nvim_get_hl_by_id(hl_id, false))
   end)
 
   it('nvim_get_hl_by_name', function()
     local expected_normal = { background = Screen.colors.Yellow, foreground = Screen.colors.Red }
 
     -- Test `Normal` default values.
-    eq({}, meths.nvim_get_hl_by_name('Normal', true))
+    eq({}, api.nvim_get_hl_by_name('Normal', true))
 
-    eq(expected_cterm, meths.nvim_get_hl_by_name('NewHighlight', false))
-    eq(expected_rgb, meths.nvim_get_hl_by_name('NewHighlight', true))
+    eq(expected_cterm, api.nvim_get_hl_by_name('NewHighlight', false))
+    eq(expected_rgb, api.nvim_get_hl_by_name('NewHighlight', true))
 
     -- Test `Normal` modified values.
     command('hi Normal guifg=red guibg=yellow')
-    eq(expected_normal, meths.nvim_get_hl_by_name('Normal', true))
+    eq(expected_normal, api.nvim_get_hl_by_name('Normal', true))
 
     -- Test invalid name.
     eq(
       "Invalid highlight name: 'unknown_highlight'",
-      pcall_err(meths.nvim_get_hl_by_name, 'unknown_highlight', false)
+      pcall_err(api.nvim_get_hl_by_name, 'unknown_highlight', false)
     )
 
     -- Test nil argument.
     eq(
       'Wrong type for argument 1 when calling nvim_get_hl_by_name, expecting String',
-      pcall_err(meths.nvim_get_hl_by_name, { nil }, false)
+      pcall_err(api.nvim_get_hl_by_name, { nil }, false)
     )
 
     -- Test empty string argument.
-    eq('Invalid highlight name', pcall_err(meths.nvim_get_hl_by_name, '', false))
+    eq('Invalid highlight name', pcall_err(api.nvim_get_hl_by_name, '', false))
 
     -- Test "standout" attribute. #8054
-    eq({ underline = true }, meths.nvim_get_hl_by_name('cursorline', 0))
+    eq({ underline = true }, api.nvim_get_hl_by_name('cursorline', 0))
     command('hi CursorLine cterm=standout,underline term=standout,underline gui=standout,underline')
     command('set cursorline')
-    eq({ underline = true, standout = true }, meths.nvim_get_hl_by_name('cursorline', 0))
+    eq({ underline = true, standout = true }, api.nvim_get_hl_by_name('cursorline', 0))
 
     -- Test cterm & Normal values. #18024 (tail) & #18980
     -- Ensure Normal, and groups that match Normal return their fg & bg cterm values
-    meths.nvim_set_hl(0, 'Normal', { ctermfg = 17, ctermbg = 213 })
-    meths.nvim_set_hl(0, 'NotNormal', { ctermfg = 17, ctermbg = 213, nocombine = true })
+    api.nvim_set_hl(0, 'Normal', { ctermfg = 17, ctermbg = 213 })
+    api.nvim_set_hl(0, 'NotNormal', { ctermfg = 17, ctermbg = 213, nocombine = true })
     -- Note colors are "cterm" values, not rgb-as-ints
-    eq({ foreground = 17, background = 213 }, meths.nvim_get_hl_by_name('Normal', false))
+    eq({ foreground = 17, background = 213 }, api.nvim_get_hl_by_name('Normal', false))
     eq(
       { foreground = 17, background = 213, nocombine = true },
-      meths.nvim_get_hl_by_name('NotNormal', false)
+      api.nvim_get_hl_by_name('NotNormal', false)
     )
   end)
 
   it('nvim_get_hl_id_by_name', function()
     -- precondition: use a hl group that does not yet exist
-    eq(
-      "Invalid highlight name: 'Shrubbery'",
-      pcall_err(meths.nvim_get_hl_by_name, 'Shrubbery', true)
-    )
-    eq(0, funcs.hlID('Shrubbery'))
+    eq("Invalid highlight name: 'Shrubbery'", pcall_err(api.nvim_get_hl_by_name, 'Shrubbery', true))
+    eq(0, fn.hlID('Shrubbery'))
 
-    local hl_id = meths.nvim_get_hl_id_by_name('Shrubbery')
+    local hl_id = api.nvim_get_hl_id_by_name('Shrubbery')
     ok(hl_id > 0)
-    eq(hl_id, funcs.hlID('Shrubbery'))
+    eq(hl_id, fn.hlID('Shrubbery'))
 
     command('hi Shrubbery guifg=#888888 guibg=#888888')
     eq(
       { foreground = tonumber('0x888888'), background = tonumber('0x888888') },
-      meths.nvim_get_hl_by_id(hl_id, true)
+      api.nvim_get_hl_by_id(hl_id, true)
     )
     eq(
       { foreground = tonumber('0x888888'), background = tonumber('0x888888') },
-      meths.nvim_get_hl_by_name('Shrubbery', true)
+      api.nvim_get_hl_by_name('Shrubbery', true)
     )
   end)
 
   it("nvim_buf_add_highlight to other buffer doesn't crash if undo is disabled #12873", function()
     command('vsplit file')
-    local err, _ = pcall(meths.nvim_set_option_value, 'undofile', false, { buf = 1 })
+    local err, _ = pcall(api.nvim_set_option_value, 'undofile', false, { buf = 1 })
     eq(true, err)
-    err, _ = pcall(meths.nvim_set_option_value, 'undolevels', -1, { buf = 1 })
+    err, _ = pcall(api.nvim_set_option_value, 'undolevels', -1, { buf = 1 })
     eq(true, err)
-    err, _ = pcall(meths.nvim_buf_add_highlight, 1, -1, 'Question', 0, 0, -1)
+    err, _ = pcall(api.nvim_buf_add_highlight, 1, -1, 'Question', 0, 0, -1)
     eq(true, err)
     assert_alive()
   end)
@@ -244,8 +241,8 @@ describe('API: set highlight', function()
   }
 
   local function get_ns()
-    local ns = meths.nvim_create_namespace('Test_set_hl')
-    meths.nvim_set_hl_ns(ns)
+    local ns = api.nvim_create_namespace('Test_set_hl')
+    api.nvim_set_hl_ns(ns)
     return ns
   end
 
@@ -254,51 +251,51 @@ describe('API: set highlight', function()
   it('validation', function()
     eq(
       "Invalid 'blend': out of range",
-      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { fg = '#FF00FF', blend = 999 })
+      pcall_err(api.nvim_set_hl, 0, 'Test_hl3', { fg = '#FF00FF', blend = 999 })
     )
     eq(
       "Invalid 'blend': expected Integer, got Array",
-      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { fg = '#FF00FF', blend = {} })
+      pcall_err(api.nvim_set_hl, 0, 'Test_hl3', { fg = '#FF00FF', blend = {} })
     )
   end)
 
   it('can set gui highlight', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', highlight1)
-    eq(highlight1, meths.nvim_get_hl_by_name('Test_hl', true))
+    api.nvim_set_hl(ns, 'Test_hl', highlight1)
+    eq(highlight1, api.nvim_get_hl_by_name('Test_hl', true))
   end)
 
   it('can set cterm highlight', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', highlight2_config)
-    eq(highlight2_result, meths.nvim_get_hl_by_name('Test_hl', false))
+    api.nvim_set_hl(ns, 'Test_hl', highlight2_config)
+    eq(highlight2_result, api.nvim_get_hl_by_name('Test_hl', false))
   end)
 
   it('can set empty cterm attr', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', { cterm = {} })
-    eq({}, meths.nvim_get_hl_by_name('Test_hl', false))
+    api.nvim_set_hl(ns, 'Test_hl', { cterm = {} })
+    eq({}, api.nvim_get_hl_by_name('Test_hl', false))
   end)
 
   it('cterm attr defaults to gui attr', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', highlight1)
+    api.nvim_set_hl(ns, 'Test_hl', highlight1)
     eq({
       bold = true,
       italic = true,
-    }, meths.nvim_get_hl_by_name('Test_hl', false))
+    }, api.nvim_get_hl_by_name('Test_hl', false))
   end)
 
   it('can overwrite attr for cterm', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', highlight3_config)
-    eq(highlight3_result_gui, meths.nvim_get_hl_by_name('Test_hl', true))
-    eq(highlight3_result_cterm, meths.nvim_get_hl_by_name('Test_hl', false))
+    api.nvim_set_hl(ns, 'Test_hl', highlight3_config)
+    eq(highlight3_result_gui, api.nvim_get_hl_by_name('Test_hl', true))
+    eq(highlight3_result_cterm, api.nvim_get_hl_by_name('Test_hl', false))
   end)
 
   it('only allows one underline attribute #22371', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', {
+    api.nvim_set_hl(ns, 'Test_hl', {
       underdouble = true,
       underdotted = true,
       cterm = {
@@ -306,21 +303,21 @@ describe('API: set highlight', function()
         undercurl = true,
       },
     })
-    eq({ undercurl = true }, meths.nvim_get_hl_by_name('Test_hl', false))
-    eq({ underdotted = true }, meths.nvim_get_hl_by_name('Test_hl', true))
+    eq({ undercurl = true }, api.nvim_get_hl_by_name('Test_hl', false))
+    eq({ underdotted = true }, api.nvim_get_hl_by_name('Test_hl', true))
   end)
 
   it('can set a highlight in the global namespace', function()
-    meths.nvim_set_hl(0, 'Test_hl', highlight2_config)
+    api.nvim_set_hl(0, 'Test_hl', highlight2_config)
     eq(
       'Test_hl        xxx cterm=underline,reverse ctermfg=8 ctermbg=15 gui=underline,reverse',
       exec_capture('highlight Test_hl')
     )
 
-    meths.nvim_set_hl(0, 'Test_hl', { background = highlight_color.bg })
+    api.nvim_set_hl(0, 'Test_hl', { background = highlight_color.bg })
     eq('Test_hl        xxx guibg=#0032aa', exec_capture('highlight Test_hl'))
 
-    meths.nvim_set_hl(0, 'Test_hl2', highlight3_config)
+    api.nvim_set_hl(0, 'Test_hl2', highlight3_config)
     eq(
       'Test_hl2       xxx cterm=italic,reverse,strikethrough,altfont,nocombine ctermfg=8 ctermbg=15 gui=bold,underdashed,italic,reverse,strikethrough,altfont guifg=#ff0000 guibg=#0032aa',
       exec_capture('highlight Test_hl2')
@@ -328,63 +325,63 @@ describe('API: set highlight', function()
 
     -- Colors are stored with the name they are defined, but
     -- with canonical casing
-    meths.nvim_set_hl(0, 'Test_hl3', { bg = 'reD', fg = 'bLue' })
+    api.nvim_set_hl(0, 'Test_hl3', { bg = 'reD', fg = 'bLue' })
     eq('Test_hl3       xxx guifg=Blue guibg=Red', exec_capture('highlight Test_hl3'))
   end)
 
   it('can modify a highlight in the global namespace', function()
-    meths.nvim_set_hl(0, 'Test_hl3', { bg = 'red', fg = 'blue' })
+    api.nvim_set_hl(0, 'Test_hl3', { bg = 'red', fg = 'blue' })
     eq('Test_hl3       xxx guifg=Blue guibg=Red', exec_capture('highlight Test_hl3'))
 
-    meths.nvim_set_hl(0, 'Test_hl3', { bg = 'red' })
+    api.nvim_set_hl(0, 'Test_hl3', { bg = 'red' })
     eq('Test_hl3       xxx guibg=Red', exec_capture('highlight Test_hl3'))
 
-    meths.nvim_set_hl(0, 'Test_hl3', { ctermbg = 9, ctermfg = 12 })
+    api.nvim_set_hl(0, 'Test_hl3', { ctermbg = 9, ctermfg = 12 })
     eq('Test_hl3       xxx ctermfg=12 ctermbg=9', exec_capture('highlight Test_hl3'))
 
-    meths.nvim_set_hl(0, 'Test_hl3', { ctermbg = 'red', ctermfg = 'blue' })
+    api.nvim_set_hl(0, 'Test_hl3', { ctermbg = 'red', ctermfg = 'blue' })
     eq('Test_hl3       xxx ctermfg=12 ctermbg=9', exec_capture('highlight Test_hl3'))
 
-    meths.nvim_set_hl(0, 'Test_hl3', { ctermbg = 9 })
+    api.nvim_set_hl(0, 'Test_hl3', { ctermbg = 9 })
     eq('Test_hl3       xxx ctermbg=9', exec_capture('highlight Test_hl3'))
 
     eq(
       "Invalid highlight color: 'redd'",
-      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { fg = 'redd' })
+      pcall_err(api.nvim_set_hl, 0, 'Test_hl3', { fg = 'redd' })
     )
 
     eq(
       "Invalid highlight color: 'bleu'",
-      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { ctermfg = 'bleu' })
+      pcall_err(api.nvim_set_hl, 0, 'Test_hl3', { ctermfg = 'bleu' })
     )
 
-    meths.nvim_set_hl(0, 'Test_hl3', { fg = '#FF00FF' })
+    api.nvim_set_hl(0, 'Test_hl3', { fg = '#FF00FF' })
     eq('Test_hl3       xxx guifg=#ff00ff', exec_capture('highlight Test_hl3'))
 
     eq(
       "Invalid highlight color: '#FF00FF'",
-      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { ctermfg = '#FF00FF' })
+      pcall_err(api.nvim_set_hl, 0, 'Test_hl3', { ctermfg = '#FF00FF' })
     )
 
     for _, fg_val in ipairs { nil, 'NONE', 'nOnE', '', -1 } do
-      meths.nvim_set_hl(0, 'Test_hl3', { fg = fg_val })
+      api.nvim_set_hl(0, 'Test_hl3', { fg = fg_val })
       eq('Test_hl3       xxx cleared', exec_capture('highlight Test_hl3'))
     end
 
-    meths.nvim_set_hl(0, 'Test_hl3', { fg = '#FF00FF', blend = 50 })
+    api.nvim_set_hl(0, 'Test_hl3', { fg = '#FF00FF', blend = 50 })
     eq('Test_hl3       xxx guifg=#ff00ff blend=50', exec_capture('highlight Test_hl3'))
   end)
 
   it("correctly sets 'Normal' internal properties", function()
     -- Normal has some special handling internally. #18024
-    meths.nvim_set_hl(0, 'Normal', { fg = '#000083', bg = '#0000F3' })
-    eq({ foreground = 131, background = 243 }, meths.nvim_get_hl_by_name('Normal', true))
+    api.nvim_set_hl(0, 'Normal', { fg = '#000083', bg = '#0000F3' })
+    eq({ foreground = 131, background = 243 }, api.nvim_get_hl_by_name('Normal', true))
   end)
 
   it('does not segfault on invalid group name #20009', function()
     eq(
       "Invalid highlight name: 'foo bar'",
-      pcall_err(meths.nvim_set_hl, 0, 'foo bar', { bold = true })
+      pcall_err(api.nvim_set_hl, 0, 'foo bar', { bold = true })
     )
     assert_alive()
   end)
@@ -452,14 +449,14 @@ describe('API: get highlight', function()
 
   local function get_ns()
     -- Test namespace filtering behavior
-    local ns2 = meths.nvim_create_namespace('Another_namespace')
-    meths.nvim_set_hl(ns2, 'Test_hl', { ctermfg = 23 })
-    meths.nvim_set_hl(ns2, 'Test_another_hl', { link = 'Test_hl' })
-    meths.nvim_set_hl(ns2, 'Test_hl_link', { link = 'Test_another_hl' })
-    meths.nvim_set_hl(ns2, 'Test_another_hl_link', { link = 'Test_hl_link' })
+    local ns2 = api.nvim_create_namespace('Another_namespace')
+    api.nvim_set_hl(ns2, 'Test_hl', { ctermfg = 23 })
+    api.nvim_set_hl(ns2, 'Test_another_hl', { link = 'Test_hl' })
+    api.nvim_set_hl(ns2, 'Test_hl_link', { link = 'Test_another_hl' })
+    api.nvim_set_hl(ns2, 'Test_another_hl_link', { link = 'Test_hl_link' })
 
-    local ns = meths.nvim_create_namespace('Test_set_hl')
-    meths.nvim_set_hl_ns(ns)
+    local ns = api.nvim_create_namespace('Test_set_hl')
+    api.nvim_set_hl_ns(ns)
 
     return ns
   end
@@ -469,24 +466,24 @@ describe('API: get highlight', function()
   it('validation', function()
     eq(
       "Invalid 'name': expected String, got Integer",
-      pcall_err(meths.nvim_get_hl, 0, { name = 177 })
+      pcall_err(api.nvim_get_hl, 0, { name = 177 })
     )
-    eq('Highlight id out of bounds', pcall_err(meths.nvim_get_hl, 0, { name = 'Test set hl' }))
+    eq('Highlight id out of bounds', pcall_err(api.nvim_get_hl, 0, { name = 'Test set hl' }))
   end)
 
   it('nvim_get_hl with create flag', function()
-    eq({}, meths.nvim_get_hl(0, { name = 'Foo', create = false }))
-    eq(0, funcs.hlexists('Foo'))
-    meths.nvim_get_hl(0, { name = 'Bar', create = true })
-    eq(1, funcs.hlexists('Bar'))
-    meths.nvim_get_hl(0, { name = 'FooBar' })
-    eq(1, funcs.hlexists('FooBar'))
+    eq({}, api.nvim_get_hl(0, { name = 'Foo', create = false }))
+    eq(0, fn.hlexists('Foo'))
+    api.nvim_get_hl(0, { name = 'Bar', create = true })
+    eq(1, fn.hlexists('Bar'))
+    api.nvim_get_hl(0, { name = 'FooBar' })
+    eq(1, fn.hlexists('FooBar'))
   end)
 
   it('can get all highlights in current namespace', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', { bg = '#B4BEFE' })
-    meths.nvim_set_hl(ns, 'Test_hl_link', { link = 'Test_hl' })
+    api.nvim_set_hl(ns, 'Test_hl', { bg = '#B4BEFE' })
+    api.nvim_set_hl(ns, 'Test_hl_link', { link = 'Test_hl' })
     eq({
       Test_hl = {
         bg = 11845374,
@@ -494,42 +491,42 @@ describe('API: get highlight', function()
       Test_hl_link = {
         link = 'Test_hl',
       },
-    }, meths.nvim_get_hl(ns, {}))
+    }, api.nvim_get_hl(ns, {}))
   end)
 
   it('can get gui highlight', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', highlight1)
-    eq(highlight1, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
+    api.nvim_set_hl(ns, 'Test_hl', highlight1)
+    eq(highlight1, api.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('can get cterm highlight', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', highlight2)
-    eq(highlight2, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
+    api.nvim_set_hl(ns, 'Test_hl', highlight2)
+    eq(highlight2, api.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('can get empty cterm attr', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', { cterm = {} })
-    eq({}, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
+    api.nvim_set_hl(ns, 'Test_hl', { cterm = {} })
+    eq({}, api.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('cterm attr defaults to gui attr', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', highlight1)
-    eq(highlight1, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
+    api.nvim_set_hl(ns, 'Test_hl', highlight1)
+    eq(highlight1, api.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('can overwrite attr for cterm', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', highlight3_config)
-    eq(highlight3_result, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
+    api.nvim_set_hl(ns, 'Test_hl', highlight3_config)
+    eq(highlight3_result, api.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('only allows one underline attribute #22371', function()
     local ns = get_ns()
-    meths.nvim_set_hl(ns, 'Test_hl', {
+    api.nvim_set_hl(ns, 'Test_hl', {
       underdouble = true,
       underdotted = true,
       cterm = {
@@ -539,33 +536,33 @@ describe('API: get highlight', function()
     })
     eq(
       { underdotted = true, cterm = { undercurl = true } },
-      meths.nvim_get_hl(ns, { name = 'Test_hl' })
+      api.nvim_get_hl(ns, { name = 'Test_hl' })
     )
   end)
 
   it('can get a highlight in the global namespace', function()
-    meths.nvim_set_hl(0, 'Test_hl', highlight2)
-    eq(highlight2, meths.nvim_get_hl(0, { name = 'Test_hl' }))
+    api.nvim_set_hl(0, 'Test_hl', highlight2)
+    eq(highlight2, api.nvim_get_hl(0, { name = 'Test_hl' }))
 
-    meths.nvim_set_hl(0, 'Test_hl', { background = highlight_color.bg })
+    api.nvim_set_hl(0, 'Test_hl', { background = highlight_color.bg })
     eq({
       bg = 12970,
-    }, meths.nvim_get_hl(0, { name = 'Test_hl' }))
+    }, api.nvim_get_hl(0, { name = 'Test_hl' }))
 
-    meths.nvim_set_hl(0, 'Test_hl2', highlight3_config)
-    eq(highlight3_result, meths.nvim_get_hl(0, { name = 'Test_hl2' }))
+    api.nvim_set_hl(0, 'Test_hl2', highlight3_config)
+    eq(highlight3_result, api.nvim_get_hl(0, { name = 'Test_hl2' }))
 
     -- Colors are stored with the name they are defined, but
     -- with canonical casing
-    meths.nvim_set_hl(0, 'Test_hl3', { bg = 'reD', fg = 'bLue' })
+    api.nvim_set_hl(0, 'Test_hl3', { bg = 'reD', fg = 'bLue' })
     eq({
       bg = 16711680,
       fg = 255,
-    }, meths.nvim_get_hl(0, { name = 'Test_hl3' }))
+    }, api.nvim_get_hl(0, { name = 'Test_hl3' }))
   end)
 
   it('nvim_get_hl by id', function()
-    local hl_id = meths.nvim_get_hl_id_by_name('NewHighlight')
+    local hl_id = api.nvim_get_hl_id_by_name('NewHighlight')
 
     command(
       'hi NewHighlight cterm=underline ctermbg=green guifg=red guibg=yellow guisp=blue gui=bold'
@@ -577,14 +574,14 @@ describe('API: get highlight', function()
       bold = true,
       ctermbg = 10,
       cterm = { underline = true },
-    }, meths.nvim_get_hl(0, { id = hl_id }))
+    }, api.nvim_get_hl(0, { id = hl_id }))
 
     -- Test 0 argument
-    eq('Highlight id out of bounds', pcall_err(meths.nvim_get_hl, 0, { id = 0 }))
+    eq('Highlight id out of bounds', pcall_err(api.nvim_get_hl, 0, { id = 0 }))
 
     eq(
       "Invalid 'id': expected Integer, got String",
-      pcall_err(meths.nvim_get_hl, 0, { id = 'Test_set_hl' })
+      pcall_err(api.nvim_get_hl, 0, { id = 'Test_set_hl' })
     )
 
     -- Test all highlight properties.
@@ -602,7 +599,7 @@ describe('API: get highlight', function()
       underline = true,
       ctermbg = 10,
       cterm = { underline = true },
-    }, meths.nvim_get_hl(0, { id = hl_id }))
+    }, api.nvim_get_hl(0, { id = hl_id }))
 
     -- Test undercurl
     command('hi NewHighlight gui=undercurl')
@@ -613,16 +610,16 @@ describe('API: get highlight', function()
       undercurl = true,
       ctermbg = 10,
       cterm = { underline = true },
-    }, meths.nvim_get_hl(0, { id = hl_id }))
+    }, api.nvim_get_hl(0, { id = hl_id }))
   end)
 
   it('can correctly detect links', function()
     command('hi String guifg=#a6e3a1 ctermfg=NONE')
     command('hi link @string string')
     command('hi link @string.cpp @string')
-    eq({ fg = 10937249 }, meths.nvim_get_hl(0, { name = 'String' }))
-    eq({ link = 'String' }, meths.nvim_get_hl(0, { name = '@string' }))
-    eq({ fg = 10937249 }, meths.nvim_get_hl(0, { name = '@string.cpp', link = false }))
+    eq({ fg = 10937249 }, api.nvim_get_hl(0, { name = 'String' }))
+    eq({ link = 'String' }, api.nvim_get_hl(0, { name = '@string' }))
+    eq({ fg = 10937249 }, api.nvim_get_hl(0, { name = '@string.cpp', link = false }))
   end)
 
   it('can get all attributes for a linked group', function()
@@ -631,55 +628,55 @@ describe('API: get highlight', function()
     command('hi! link Foo Bar')
     eq(
       { link = 'Bar', fg = tonumber('00ff00', 16), bold = true, underline = true },
-      meths.nvim_get_hl(0, { name = 'Foo', link = true })
+      api.nvim_get_hl(0, { name = 'Foo', link = true })
     )
   end)
 
   it('can set link as well as other attributes', function()
     command('hi Bar guifg=red')
     local hl = { link = 'Bar', fg = tonumber('00ff00', 16), bold = true, cterm = { bold = true } }
-    meths.nvim_set_hl(0, 'Foo', hl)
-    eq(hl, meths.nvim_get_hl(0, { name = 'Foo', link = true }))
+    api.nvim_set_hl(0, 'Foo', hl)
+    eq(hl, api.nvim_get_hl(0, { name = 'Foo', link = true }))
   end)
 
   it("doesn't contain unset groups", function()
-    local id = meths.nvim_get_hl_id_by_name '@foobar.hubbabubba'
+    local id = api.nvim_get_hl_id_by_name '@foobar.hubbabubba'
     ok(id > 0)
 
-    local data = meths.nvim_get_hl(0, {})
+    local data = api.nvim_get_hl(0, {})
     eq(nil, data['@foobar.hubbabubba'])
     eq(nil, data['@foobar'])
 
     command 'hi @foobar.hubbabubba gui=bold'
-    data = meths.nvim_get_hl(0, {})
+    data = api.nvim_get_hl(0, {})
     eq({ bold = true }, data['@foobar.hubbabubba'])
     eq(nil, data['@foobar'])
 
     -- @foobar.hubbabubba was explicitly cleared and thus shows up
     -- but @foobar was never touched, and thus doesn't
     command 'hi clear @foobar.hubbabubba'
-    data = meths.nvim_get_hl(0, {})
+    data = api.nvim_get_hl(0, {})
     eq({}, data['@foobar.hubbabubba'])
     eq(nil, data['@foobar'])
   end)
 
   it('should return default flag', function()
-    meths.nvim_set_hl(0, 'Tried', { fg = '#00ff00', default = true })
-    eq({ fg = tonumber('00ff00', 16), default = true }, meths.nvim_get_hl(0, { name = 'Tried' }))
+    api.nvim_set_hl(0, 'Tried', { fg = '#00ff00', default = true })
+    eq({ fg = tonumber('00ff00', 16), default = true }, api.nvim_get_hl(0, { name = 'Tried' }))
   end)
 
   it('should not output empty gui and cterm #23474', function()
-    meths.nvim_set_hl(0, 'Foo', { default = true })
-    meths.nvim_set_hl(0, 'Bar', { default = true, fg = '#ffffff' })
-    meths.nvim_set_hl(0, 'FooBar', { default = true, fg = '#ffffff', cterm = { bold = true } })
-    meths.nvim_set_hl(
+    api.nvim_set_hl(0, 'Foo', { default = true })
+    api.nvim_set_hl(0, 'Bar', { default = true, fg = '#ffffff' })
+    api.nvim_set_hl(0, 'FooBar', { default = true, fg = '#ffffff', cterm = { bold = true } })
+    api.nvim_set_hl(
       0,
       'FooBarA',
       { default = true, fg = '#ffffff', cterm = { bold = true, italic = true } }
     )
 
     eq('Foo            xxx cleared', exec_capture('highlight Foo'))
-    eq({ default = true }, meths.nvim_get_hl(0, { name = 'Foo' }))
+    eq({ default = true }, api.nvim_get_hl(0, { name = 'Foo' }))
     eq('Bar            xxx guifg=#ffffff', exec_capture('highlight Bar'))
     eq('FooBar         xxx cterm=bold guifg=#ffffff', exec_capture('highlight FooBar'))
     eq('FooBarA        xxx cterm=bold,italic guifg=#ffffff', exec_capture('highlight FooBarA'))
@@ -688,27 +685,27 @@ describe('API: get highlight', function()
   it('can override exist highlight group by force #20323', function()
     local white = tonumber('ffffff', 16)
     local green = tonumber('00ff00', 16)
-    meths.nvim_set_hl(0, 'Foo', { fg = white })
-    meths.nvim_set_hl(0, 'Foo', { fg = green, force = true })
-    eq({ fg = green }, meths.nvim_get_hl(0, { name = 'Foo' }))
-    meths.nvim_set_hl(0, 'Bar', { link = 'Comment', default = true })
-    meths.nvim_set_hl(0, 'Bar', { link = 'Foo', default = true, force = true })
-    eq({ link = 'Foo', default = true }, meths.nvim_get_hl(0, { name = 'Bar' }))
+    api.nvim_set_hl(0, 'Foo', { fg = white })
+    api.nvim_set_hl(0, 'Foo', { fg = green, force = true })
+    eq({ fg = green }, api.nvim_get_hl(0, { name = 'Foo' }))
+    api.nvim_set_hl(0, 'Bar', { link = 'Comment', default = true })
+    api.nvim_set_hl(0, 'Bar', { link = 'Foo', default = true, force = true })
+    eq({ link = 'Foo', default = true }, api.nvim_get_hl(0, { name = 'Bar' }))
   end)
 end)
 
 describe('API: set/get highlight namespace', function()
   it('set/get highlight namespace', function()
-    eq(0, meths.nvim_get_hl_ns({}))
-    local ns = meths.nvim_create_namespace('')
-    meths.nvim_set_hl_ns(ns)
-    eq(ns, meths.nvim_get_hl_ns({}))
+    eq(0, api.nvim_get_hl_ns({}))
+    local ns = api.nvim_create_namespace('')
+    api.nvim_set_hl_ns(ns)
+    eq(ns, api.nvim_get_hl_ns({}))
   end)
 
   it('set/get window highlight namespace', function()
-    eq(-1, meths.nvim_get_hl_ns({ winid = 0 }))
-    local ns = meths.nvim_create_namespace('')
-    meths.nvim_win_set_hl_ns(0, ns)
-    eq(ns, meths.nvim_get_hl_ns({ winid = 0 }))
+    eq(-1, api.nvim_get_hl_ns({ winid = 0 }))
+    local ns = api.nvim_create_namespace('')
+    api.nvim_win_set_hl_ns(0, ns)
+    eq(ns, api.nvim_get_hl_ns({ winid = 0 }))
   end)
 end)