test: typing for helpers.meths

1 files changed, 380 insertions, 380 deletions

diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index 6febb2e2df..645cce25aa 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -30,9 +30,9 @@ describe('float window', function()
     -- Create three windows and test that ":wincmd <direction>" changes to the
     -- first window, if the previous window is invalid.
     command('split')
-    meths.open_win(0, true, {width=10, height=10, relative='editor', row=0, col=0})
+    meths.nvim_open_win(0, true, {width=10, height=10, relative='editor', row=0, col=0})
     eq(1002, funcs.win_getid())
-    eq('editor', meths.win_get_config(1002).relative)
+    eq('editor', meths.nvim_win_get_config(1002).relative)
     command([[
       call nvim_win_close(1001, v:false)
       wincmd j
@@ -41,9 +41,9 @@ describe('float window', function()
   end)
 
   it('win_execute() should work' , function()
-    local buf = meths.create_buf(false, false)
-    meths.buf_set_lines(buf, 0, -1, true, {'the floatwin', 'abc', 'def'})
-    local win = meths.open_win(buf, false, {relative='win', width=16, height=1, row=0, col=10})
+    local buf = meths.nvim_create_buf(false, false)
+    meths.nvim_buf_set_lines(buf, 0, -1, true, {'the floatwin', 'abc', 'def'})
+    local win = meths.nvim_open_win(buf, false, {relative='win', width=16, height=1, row=0, col=10})
     local line = funcs.win_execute(win, 'echo getline(1)')
     eq('\nthe floatwin', line)
     eq('\n1', funcs.win_execute(win, 'echo line(".",'..win.id..')'))
@@ -54,9 +54,9 @@ describe('float window', function()
 
   it("win_execute() call commands that are not allowed when 'hidden' is not set" , function()
     command('set nohidden')
-    local buf = meths.create_buf(false, false)
-    meths.buf_set_lines(buf, 0, -1, true, {'the floatwin'})
-    local win = meths.open_win(buf, true, {relative='win', width=16, height=1, row=0, col=10})
+    local buf = meths.nvim_create_buf(false, false)
+    meths.nvim_buf_set_lines(buf, 0, -1, true, {'the floatwin'})
+    local win = meths.nvim_open_win(buf, true, {relative='win', width=16, height=1, row=0, col=10})
     eq('Vim(close):E37: No write since last change (add ! to override)', pcall_err(funcs.win_execute, win, 'close'))
     eq('Vim(bdelete):E89: No write since last change for buffer 2 (add ! to override)', pcall_err(funcs.win_execute, win, 'bdelete'))
     funcs.win_execute(win, 'bwipe!')
@@ -192,7 +192,7 @@ describe('float window', function()
   end)
 
   it('opened with correct position relative to the mouse', function()
-    meths.input_mouse('left', 'press', '', 0, 10, 10)
+    meths.nvim_input_mouse('left', 'press', '', 0, 10, 10)
     local pos = exec_lua([[
       local bufnr = vim.api.nvim_create_buf(false, true)
 
@@ -479,67 +479,67 @@ describe('float window', function()
 
   it('no crash with bufpos and non-existent window', function()
     command('new')
-    local closed_win = meths.get_current_win().id
+    local closed_win = meths.nvim_get_current_win().id
     command('close')
-    local buf = meths.create_buf(false,false)
-    meths.open_win(buf, true, {relative='win', win=closed_win, width=1, height=1, bufpos={0,0}})
+    local buf = meths.nvim_create_buf(false,false)
+    meths.nvim_open_win(buf, true, {relative='win', win=closed_win, width=1, height=1, bufpos={0,0}})
     assert_alive()
   end)
 
   it("no segfault when setting minimal style after clearing local 'fillchars' #19510", function()
     local float_opts = {relative = 'editor', row = 1, col = 1, width = 1, height = 1}
-    local float_win = meths.open_win(0, true, float_opts)
-    meths.set_option_value('fillchars', NIL, {win=float_win.id})
+    local float_win = meths.nvim_open_win(0, true, float_opts)
+    meths.nvim_set_option_value('fillchars', NIL, {win=float_win.id})
     float_opts.style = 'minimal'
-    meths.win_set_config(float_win, float_opts)
+    meths.nvim_win_set_config(float_win, float_opts)
     assert_alive()
     end)
 
     it("should re-apply 'style' when present", function()
     local float_opts = {style = 'minimal', relative = 'editor', row = 1, col = 1, width = 1, height = 1}
-    local float_win = meths.open_win(0, true, float_opts)
-    meths.set_option_value('number', true, { win = float_win })
+    local float_win = meths.nvim_open_win(0, true, float_opts)
+    meths.nvim_set_option_value('number', true, { win = float_win })
     float_opts.row = 2
-    meths.win_set_config(float_win, float_opts)
-    eq(false, meths.get_option_value('number', { win = float_win }))
+    meths.nvim_win_set_config(float_win, float_opts)
+    eq(false, meths.nvim_get_option_value('number', { win = float_win }))
   end)
 
   it("should not re-apply 'style' when missing", function()
     local float_opts = {style = 'minimal', relative = 'editor', row = 1, col = 1, width = 1, height = 1}
-    local float_win = meths.open_win(0, true, float_opts)
-    meths.set_option_value('number', true, { win = float_win })
+    local float_win = meths.nvim_open_win(0, true, float_opts)
+    meths.nvim_set_option_value('number', true, { win = float_win })
     float_opts.row = 2
     float_opts.style = nil
-    meths.win_set_config(float_win, float_opts)
-    eq(true, meths.get_option_value('number', { win = float_win }))
+    meths.nvim_win_set_config(float_win, float_opts)
+    eq(true, meths.nvim_get_option_value('number', { win = float_win }))
   end)
 
   it("'scroll' is computed correctly when opening float with splitkeep=screen #20684", function()
-    meths.set_option_value('splitkeep', 'screen', {})
+    meths.nvim_set_option_value('splitkeep', 'screen', {})
     local float_opts = {relative = 'editor', row = 1, col = 1, width = 10, height = 10}
-    local float_win = meths.open_win(0, true, float_opts)
-    eq(5, meths.get_option_value('scroll', {win=float_win.id}))
+    local float_win = meths.nvim_open_win(0, true, float_opts)
+    eq(5, meths.nvim_get_option_value('scroll', {win=float_win.id}))
   end)
 
   it(':unhide works when there are floating windows', function()
     local float_opts = {relative = 'editor', row = 1, col = 1, width = 5, height = 5}
     local w0 = curwin()
-    meths.open_win(0, false, float_opts)
-    meths.open_win(0, false, float_opts)
-    eq(3, #meths.list_wins())
+    meths.nvim_open_win(0, false, float_opts)
+    meths.nvim_open_win(0, false, float_opts)
+    eq(3, #meths.nvim_list_wins())
     command('unhide')
-    eq({ w0 }, meths.list_wins())
+    eq({ w0 }, meths.nvim_list_wins())
   end)
 
   it(':all works when there are floating windows', function()
     command('args Xa.txt')
     local float_opts = {relative = 'editor', row = 1, col = 1, width = 5, height = 5}
     local w0 = curwin()
-    meths.open_win(0, false, float_opts)
-    meths.open_win(0, false, float_opts)
-    eq(3, #meths.list_wins())
+    meths.nvim_open_win(0, false, float_opts)
+    meths.nvim_open_win(0, false, float_opts)
+    eq(3, #meths.nvim_list_wins())
     command('all')
-    eq({ w0 }, meths.list_wins())
+    eq({ w0 }, meths.nvim_list_wins())
   end)
 
   describe('with only one tabpage,', function()
@@ -552,37 +552,37 @@ describe('float window', function()
     end)
     describe('closing the last non-floating window gives E444', function()
       before_each(function()
-        meths.open_win(old_buf, true, float_opts)
+        meths.nvim_open_win(old_buf, true, float_opts)
       end)
       it('if called from non-floating window', function()
-        meths.set_current_win(old_win)
+        meths.nvim_set_current_win(old_win)
         eq('Vim:E444: Cannot close last window',
-           pcall_err(meths.win_close, old_win, false))
+           pcall_err(meths.nvim_win_close, old_win, false))
       end)
       it('if called from floating window', function()
         eq('Vim:E444: Cannot close last window',
-           pcall_err(meths.win_close, old_win, false))
+           pcall_err(meths.nvim_win_close, old_win, false))
       end)
     end)
     describe("deleting the last non-floating window's buffer", function()
       describe('leaves one window with an empty buffer when there is only one buffer', function()
         local same_buf_float
         before_each(function()
-          same_buf_float = meths.open_win(old_buf, false, float_opts).id
+          same_buf_float = meths.nvim_open_win(old_buf, false, float_opts).id
         end)
         after_each(function()
           eq(old_win, curwin().id)
           expect('')
-          eq(1, #meths.list_wins())
+          eq(1, #meths.nvim_list_wins())
         end)
         it('if called from non-floating window', function()
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_buf_delete(old_buf, {force = true})
         end)
         it('if called from floating window', function()
-          meths.set_current_win(same_buf_float)
+          meths.nvim_set_current_win(same_buf_float)
           command('autocmd WinLeave * let g:win_leave = nvim_get_current_win()')
           command('autocmd WinEnter * let g:win_enter = nvim_get_current_win()')
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_buf_delete(old_buf, {force = true})
           eq(same_buf_float, eval('g:win_leave'))
           eq(old_win, eval('g:win_enter'))
         end)
@@ -590,67 +590,67 @@ describe('float window', function()
       describe('closes other windows with that buffer when there are other buffers', function()
         local same_buf_float, other_buf, other_buf_float
         before_each(function()
-          same_buf_float = meths.open_win(old_buf, false, float_opts).id
-          other_buf = meths.create_buf(true, false).id
-          other_buf_float = meths.open_win(other_buf, true, float_opts).id
+          same_buf_float = meths.nvim_open_win(old_buf, false, float_opts).id
+          other_buf = meths.nvim_create_buf(true, false).id
+          other_buf_float = meths.nvim_open_win(other_buf, true, float_opts).id
           insert('bar')
-          meths.set_current_win(old_win)
+          meths.nvim_set_current_win(old_win)
         end)
         after_each(function()
           eq(other_buf, curbuf().id)
           expect('bar')
-          eq(2, #meths.list_wins())
+          eq(2, #meths.nvim_list_wins())
         end)
         it('if called from non-floating window', function()
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_buf_delete(old_buf, {force = true})
           eq(old_win, curwin().id)
         end)
         it('if called from floating window with the same buffer', function()
-          meths.set_current_win(same_buf_float)
+          meths.nvim_set_current_win(same_buf_float)
           command('autocmd WinLeave * let g:win_leave = nvim_get_current_win()')
           command('autocmd WinEnter * let g:win_enter = nvim_get_current_win()')
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_buf_delete(old_buf, {force = true})
           eq(same_buf_float, eval('g:win_leave'))
           eq(old_win, eval('g:win_enter'))
           eq(old_win, curwin().id)
         end)
         -- TODO: this case is too hard to deal with
         pending('if called from floating window with another buffer', function()
-          meths.set_current_win(other_buf_float)
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_set_current_win(other_buf_float)
+          meths.nvim_buf_delete(old_buf, {force = true})
         end)
       end)
       describe('creates an empty buffer when there is only one listed buffer', function()
         local same_buf_float, unlisted_buf_float
         before_each(function()
-          same_buf_float = meths.open_win(old_buf, false, float_opts).id
-          local unlisted_buf = meths.create_buf(true, false).id
-          unlisted_buf_float = meths.open_win(unlisted_buf, true, float_opts).id
+          same_buf_float = meths.nvim_open_win(old_buf, false, float_opts).id
+          local unlisted_buf = meths.nvim_create_buf(true, false).id
+          unlisted_buf_float = meths.nvim_open_win(unlisted_buf, true, float_opts).id
           insert('unlisted')
           command('set nobuflisted')
-          meths.set_current_win(old_win)
+          meths.nvim_set_current_win(old_win)
         end)
         after_each(function()
           expect('')
-          eq(2, #meths.list_wins())
+          eq(2, #meths.nvim_list_wins())
         end)
         it('if called from non-floating window', function()
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_buf_delete(old_buf, {force = true})
           eq(old_win, curwin().id)
         end)
         it('if called from floating window with the same buffer', function()
-          meths.set_current_win(same_buf_float)
+          meths.nvim_set_current_win(same_buf_float)
           command('autocmd WinLeave * let g:win_leave = nvim_get_current_win()')
           command('autocmd WinEnter * let g:win_enter = nvim_get_current_win()')
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_buf_delete(old_buf, {force = true})
           eq(same_buf_float, eval('g:win_leave'))
           eq(old_win, eval('g:win_enter'))
           eq(old_win, curwin().id)
         end)
         -- TODO: this case is too hard to deal with
         pending('if called from floating window with an unlisted buffer', function()
-          meths.set_current_win(unlisted_buf_float)
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_set_current_win(unlisted_buf_float)
+          meths.nvim_buf_delete(old_buf, {force = true})
         end)
       end)
     end)
@@ -661,20 +661,20 @@ describe('float window', function()
           command('botright vnew')
           insert('unlisted')
           command('set nobuflisted')
-          meths.set_current_win(old_win)
-          same_buf_float = meths.open_win(old_buf, false, float_opts).id
+          meths.nvim_set_current_win(old_win)
+          same_buf_float = meths.nvim_open_win(old_buf, false, float_opts).id
         end)
         after_each(function()
           expect('')
-          eq(2, #meths.list_wins())
+          eq(2, #meths.nvim_list_wins())
         end)
         it('if called from non-floating window with the deleted buffer', function()
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_buf_delete(old_buf, {force = true})
           eq(old_win, curwin().id)
         end)
         it('if called from floating window with the deleted buffer', function()
-          meths.set_current_win(same_buf_float)
-          meths.buf_delete(old_buf, {force = true})
+          meths.nvim_set_current_win(same_buf_float)
+          meths.nvim_buf_delete(old_buf, {force = true})
           eq(same_buf_float, curwin().id)
         end)
       end)
@@ -696,28 +696,28 @@ describe('float window', function()
     describe('without splits, deleting the last listed buffer creates an empty buffer', function()
       local same_buf_float
       before_each(function()
-        meths.set_current_win(old_win)
-        same_buf_float = meths.open_win(old_buf, false, float_opts).id
+        meths.nvim_set_current_win(old_win)
+        same_buf_float = meths.nvim_open_win(old_buf, false, float_opts).id
       end)
       after_each(function()
         expect('')
-        eq(2, #meths.list_wins())
-        eq(2, #meths.list_tabpages())
+        eq(2, #meths.nvim_list_wins())
+        eq(2, #meths.nvim_list_tabpages())
       end)
       it('if called from non-floating window', function()
-        meths.buf_delete(old_buf, {force = true})
+        meths.nvim_buf_delete(old_buf, {force = true})
         eq(old_win, curwin().id)
       end)
       it('if called from non-floating window in another tabpage', function()
         command('tab split')
-        eq(3, #meths.list_tabpages())
-        meths.buf_delete(old_buf, {force = true})
+        eq(3, #meths.nvim_list_tabpages())
+        meths.nvim_buf_delete(old_buf, {force = true})
       end)
       it('if called from floating window with the same buffer', function()
-        meths.set_current_win(same_buf_float)
+        meths.nvim_set_current_win(same_buf_float)
         command('autocmd WinLeave * let g:win_leave = nvim_get_current_win()')
         command('autocmd WinEnter * let g:win_enter = nvim_get_current_win()')
-        meths.buf_delete(old_buf, {force = true})
+        meths.nvim_buf_delete(old_buf, {force = true})
         eq(same_buf_float, eval('g:win_leave'))
         eq(old_win, eval('g:win_enter'))
         eq(old_win, curwin().id)
@@ -727,22 +727,22 @@ describe('float window', function()
       local same_buf_float
       before_each(function()
         command('botright vsplit')
-        meths.set_current_buf(unlisted_buf)
-        meths.set_current_win(old_win)
-        same_buf_float = meths.open_win(old_buf, false, float_opts).id
+        meths.nvim_set_current_buf(unlisted_buf)
+        meths.nvim_set_current_win(old_win)
+        same_buf_float = meths.nvim_open_win(old_buf, false, float_opts).id
       end)
       after_each(function()
         expect('')
-        eq(3, #meths.list_wins())
-        eq(2, #meths.list_tabpages())
+        eq(3, #meths.nvim_list_wins())
+        eq(2, #meths.nvim_list_tabpages())
       end)
       it('if called from non-floating window with the deleted buffer', function()
-        meths.buf_delete(old_buf, {force = true})
+        meths.nvim_buf_delete(old_buf, {force = true})
         eq(old_win, curwin().id)
       end)
       it('if called from floating window with the deleted buffer', function()
-        meths.set_current_win(same_buf_float)
-        meths.buf_delete(old_buf, {force = true})
+        meths.nvim_set_current_win(same_buf_float)
+        meths.nvim_buf_delete(old_buf, {force = true})
         eq(same_buf_float, curwin().id)
       end)
     end)
@@ -762,38 +762,38 @@ describe('float window', function()
       describe('closes the tabpage when all floating windows are closeable', function()
         local same_buf_float
         before_each(function()
-          same_buf_float = meths.open_win(old_buf, false, float_opts).id
+          same_buf_float = meths.nvim_open_win(old_buf, false, float_opts).id
         end)
         after_each(function()
           eq(old_tabpage, curtab().id)
           expect('oldtab')
-          eq(1, #meths.list_tabpages())
+          eq(1, #meths.nvim_list_tabpages())
         end)
         it('if called from non-floating window', function()
-          meths.win_close(old_win, false)
+          meths.nvim_win_close(old_win, false)
         end)
         it('if called from floating window', function()
-          meths.set_current_win(same_buf_float)
-          meths.win_close(old_win, false)
+          meths.nvim_set_current_win(same_buf_float)
+          meths.nvim_win_close(old_win, false)
         end)
       end)
       describe('gives E5601 when there are non-closeable floating windows', function()
         local other_buf_float
         before_each(function()
           command('set nohidden')
-          local other_buf = meths.create_buf(true, false).id
-          other_buf_float = meths.open_win(other_buf, true, float_opts).id
+          local other_buf = meths.nvim_create_buf(true, false).id
+          other_buf_float = meths.nvim_open_win(other_buf, true, float_opts).id
           insert('foo')
-          meths.set_current_win(old_win)
+          meths.nvim_set_current_win(old_win)
         end)
         it('if called from non-floating window', function()
           eq('Vim:E5601: Cannot close window, only floating window would remain',
-             pcall_err(meths.win_close, old_win, false))
+             pcall_err(meths.nvim_win_close, old_win, false))
         end)
         it('if called from floating window', function()
-          meths.set_current_win(other_buf_float)
+          meths.nvim_set_current_win(other_buf_float)
           eq('Vim:E5601: Cannot close window, only floating window would remain',
-             pcall_err(meths.win_close, old_win, false))
+             pcall_err(meths.nvim_win_close, old_win, false))
         end)
       end)
     end)
@@ -801,27 +801,27 @@ describe('float window', function()
       describe('closes the tabpage when all floating windows are closeable', function()
         local same_buf_float, other_buf, other_buf_float
         before_each(function()
-          same_buf_float = meths.open_win(old_buf, false, float_opts).id
-          other_buf = meths.create_buf(true, false).id
-          other_buf_float = meths.open_win(other_buf, true, float_opts).id
-          meths.set_current_win(old_win)
+          same_buf_float = meths.nvim_open_win(old_buf, false, float_opts).id
+          other_buf = meths.nvim_create_buf(true, false).id
+          other_buf_float = meths.nvim_open_win(other_buf, true, float_opts).id
+          meths.nvim_set_current_win(old_win)
         end)
         after_each(function()
           eq(old_tabpage, curtab().id)
           expect('oldtab')
-          eq(1, #meths.list_tabpages())
+          eq(1, #meths.nvim_list_tabpages())
         end)
         it('if called from non-floating window', function()
-          meths.buf_delete(old_buf, {force = false})
+          meths.nvim_buf_delete(old_buf, {force = false})
         end)
         it('if called from floating window with the same buffer', function()
-          meths.set_current_win(same_buf_float)
-          meths.buf_delete(old_buf, {force = false})
+          meths.nvim_set_current_win(same_buf_float)
+          meths.nvim_buf_delete(old_buf, {force = false})
         end)
         -- TODO: this case is too hard to deal with
         pending('if called from floating window with another buffer', function()
-          meths.set_current_win(other_buf_float)
-          meths.buf_delete(old_buf, {force = false})
+          meths.nvim_set_current_win(other_buf_float)
+          meths.nvim_buf_delete(old_buf, {force = false})
         end)
       end)
       -- TODO: what to do when there are non-closeable floating windows?
@@ -868,8 +868,8 @@ describe('float window', function()
     end)
 
     it('can be created and reconfigured', function()
-      local buf = meths.create_buf(false,false)
-      local win = meths.open_win(buf, false, {relative='editor', width=20, height=2, row=2, col=5})
+      local buf = meths.nvim_create_buf(false,false)
+      local win = meths.nvim_open_win(buf, false, {relative='editor', width=20, height=2, row=2, col=5})
       local expected_pos = {
           [4]={{id=1001}, 'NW', 1, 2, 5, true},
       }
@@ -900,7 +900,7 @@ describe('float window', function()
       end
 
 
-      meths.win_set_config(win, {relative='editor', row=0, col=10})
+      meths.nvim_win_set_config(win, {relative='editor', row=0, col=10})
       expected_pos[4][4] = 0
       expected_pos[4][5] = 10
       if multigrid then
@@ -926,7 +926,7 @@ describe('float window', function()
         ]])
       end
 
-      meths.win_close(win, false)
+      meths.nvim_win_close(win, false)
       if multigrid then
         screen:expect([[
         ## grid 1
@@ -949,8 +949,8 @@ describe('float window', function()
 
     it('window position fixed', function()
       command('rightbelow 20vsplit')
-      local buf = meths.create_buf(false,false)
-      local win = meths.open_win(buf, false, {
+      local buf = meths.nvim_create_buf(false,false)
+      local win = meths.nvim_open_win(buf, false, {
         relative='win', width=15, height=2, row=2, col=10, anchor='NW', fixed=true})
 
       if multigrid then
@@ -985,7 +985,7 @@ describe('float window', function()
         ]])
       end
 
-      meths.win_set_config(win, {fixed=false})
+      meths.nvim_win_set_config(win, {fixed=false})
 
       if multigrid then
         screen:expect_unchanged()
@@ -1009,8 +1009,8 @@ describe('float window', function()
       -- or something.
       command("set redrawdebug=compositor")
       command("set wd=1")
-      local buf = meths.create_buf(false,false)
-      local win = meths.open_win(buf, false, {relative='editor', width=20, height=2, row=2, col=5})
+      local buf = meths.nvim_create_buf(false,false)
+      local win = meths.nvim_open_win(buf, false, {relative='editor', width=20, height=2, row=2, col=5})
       local expected_pos = {
           [4]={{id=1001}, 'NW', 1, 2, 5, true},
       }
@@ -1041,7 +1041,7 @@ describe('float window', function()
       end
 
 
-      meths.win_set_config(win, {relative='editor', row=0, col=10})
+      meths.nvim_win_set_config(win, {relative='editor', row=0, col=10})
       expected_pos[4][4] = 0
       expected_pos[4][5] = 10
       if multigrid then
@@ -1067,7 +1067,7 @@ describe('float window', function()
         ]])
       end
 
-      meths.win_close(win, false)
+      meths.nvim_win_close(win, false)
       if multigrid then
         screen:expect([[
         ## grid 1
@@ -1089,16 +1089,16 @@ describe('float window', function()
     end)
 
     it('return their configuration', function()
-      local buf = meths.create_buf(false, false)
-      local win = meths.open_win(buf, false, {relative='editor', width=20, height=2, row=3, col=5, zindex=60})
+      local buf = meths.nvim_create_buf(false, false)
+      local win = meths.nvim_open_win(buf, false, {relative='editor', width=20, height=2, row=3, col=5, zindex=60})
       local expected = {anchor='NW', col=5, external=false, focusable=true, height=2, relative='editor', row=3, width=20, zindex=60, hide=false}
-      eq(expected, meths.win_get_config(win))
+      eq(expected, meths.nvim_win_get_config(win))
 
-      eq({relative='', external=false, focusable=true, hide=false}, meths.win_get_config(0))
+      eq({relative='', external=false, focusable=true, hide=false}, meths.nvim_win_get_config(0))
 
       if multigrid then
-        meths.win_set_config(win, {external=true, width=10, height=1})
-        eq({external=true,focusable=true,width=10,height=1,relative='',hide=false}, meths.win_get_config(win))
+        meths.nvim_win_set_config(win, {external=true, width=10, height=1})
+        eq({external=true,focusable=true,width=10,height=1,relative='',hide=false}, meths.nvim_win_get_config(win))
       end
     end)
 
@@ -1106,7 +1106,7 @@ describe('float window', function()
       command('set number')
       command('hi NormalFloat guibg=#333333 guifg=NONE')
       feed('ix<cr>y<cr><esc>gg')
-      local win = meths.open_win(0, false, {relative='editor', width=20, height=4, row=4, col=10})
+      local win = meths.nvim_open_win(0, false, {relative='editor', width=20, height=4, row=4, col=10})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1137,8 +1137,8 @@ describe('float window', function()
         ]])
       end
 
-      local buf = meths.create_buf(false, true)
-      meths.win_set_buf(win, buf)
+      local buf = meths.nvim_create_buf(false, true)
+      meths.nvim_win_set_buf(win, buf)
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1174,7 +1174,7 @@ describe('float window', function()
       command('set foldcolumn=1')
       command('hi NormalFloat guibg=#333333 guifg=NONE')
       feed('ix<cr>y<cr><esc>gg')
-      local win = meths.open_win(0, false, {relative='editor', width=20, height=4, row=4, col=10, style='minimal'})
+      local win = meths.nvim_open_win(0, false, {relative='editor', width=20, height=4, row=4, col=10, style='minimal'})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1238,8 +1238,8 @@ describe('float window', function()
       end
       command('sign unplace 1 buffer=1')
 
-      local buf = meths.create_buf(false, true)
-      meths.win_set_buf(win, buf)
+      local buf = meths.nvim_create_buf(false, true)
+      meths.nvim_win_set_buf(win, buf)
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1274,7 +1274,7 @@ describe('float window', function()
       command('set foldcolumn=1')
       command('hi NormalFloat guibg=#333333 guifg=NONE')
       feed('ix<cr>y<cr><esc>gg')
-      local win = meths.open_win(0, false, {relative='editor', width=20, height=4, row=4, col=10, style='minimal'})
+      local win = meths.nvim_open_win(0, false, {relative='editor', width=20, height=4, row=4, col=10, style='minimal'})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1338,8 +1338,8 @@ describe('float window', function()
       end
       command('sign unplace 1 buffer=1')
 
-      local buf = meths.create_buf(false, true)
-      meths.win_set_buf(win, buf)
+      local buf = meths.nvim_create_buf(false, true)
+      meths.nvim_win_set_buf(win, buf)
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1375,7 +1375,7 @@ describe('float window', function()
       command('set statuscolumn=%l%s%C')
       command('hi NormalFloat guibg=#333333 guifg=NONE')
       feed('ix<cr>y<cr><esc>gg')
-      meths.open_win(0, false, {relative='editor', width=20, height=4, row=4, col=10, style='minimal'})
+      meths.nvim_open_win(0, false, {relative='editor', width=20, height=4, row=4, col=10, style='minimal'})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1406,10 +1406,10 @@ describe('float window', function()
     end)
 
     it('can have border', function()
-      local buf = meths.create_buf(false, false)
-      meths.buf_set_lines(buf, 0, -1, true, {' halloj! ',
+      local buf = meths.nvim_create_buf(false, false)
+      meths.nvim_buf_set_lines(buf, 0, -1, true, {' halloj! ',
                                              ' BORDAA  '})
-      local win = meths.open_win(buf, false, {relative='editor', width=9, height=2, row=2, col=5, border="double"})
+      local win = meths.nvim_open_win(buf, false, {relative='editor', width=9, height=2, row=2, col=5, border="double"})
 
       if multigrid then
         screen:expect{grid=[[
@@ -1444,7 +1444,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {border="single"})
+      meths.nvim_win_set_config(win, {border="single"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1478,7 +1478,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {border="rounded"})
+      meths.nvim_win_set_config(win, {border="rounded"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1512,7 +1512,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {border="solid"})
+      meths.nvim_win_set_config(win, {border="solid"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1547,7 +1547,7 @@ describe('float window', function()
       end
 
       -- support: ascii char, UTF-8 char, composed char, highlight per char
-      meths.win_set_config(win, {border={"x", {"å", "ErrorMsg"}, {"\\"}, {"n̈̊", "Search"}}})
+      meths.nvim_win_set_config(win, {border={"x", {"å", "ErrorMsg"}, {"\\"}, {"n̈̊", "Search"}}})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1581,7 +1581,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {border="none"})
+      meths.nvim_win_set_config(win, {border="none"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1612,7 +1612,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {border={"", "", "", ">", "", "", "", "<"}})
+      meths.nvim_win_set_config(win, {border={"", "", "", ">", "", "", "", "<"}})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1643,7 +1643,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {border={"", "_", "", "", "", "-", "", ""}})
+      meths.nvim_win_set_config(win, {border={"", "_", "", "", "", "-", "", ""}})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1685,7 +1685,7 @@ describe('float window', function()
         of border shadow
       ]]
 
-      meths.win_set_config(win, {border="shadow"})
+      meths.nvim_win_set_config(win, {border="shadow"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1724,13 +1724,13 @@ describe('float window', function()
     end)
 
     it('validates title title_pos', function()
-      local buf = meths.create_buf(false,false)
+      local buf = meths.nvim_create_buf(false,false)
       eq("title requires border to be set",
-         pcall_err(meths.open_win,buf, false, {
+         pcall_err(meths.nvim_open_win,buf, false, {
           relative='editor', width=9, height=2, row=2, col=5, title='Title',
          }))
       eq("title_pos requires title to be set",
-         pcall_err(meths.open_win,buf, false, {
+         pcall_err(meths.nvim_open_win,buf, false, {
           relative='editor', width=9, height=2, row=2, col=5,
           border='single', title_pos='left',
          }))
@@ -1758,13 +1758,13 @@ describe('float window', function()
     end)
 
     it('validates footer footer_pos', function()
-      local buf = meths.create_buf(false,false)
+      local buf = meths.nvim_create_buf(false,false)
       eq("footer requires border to be set",
-         pcall_err(meths.open_win,buf, false, {
+         pcall_err(meths.nvim_open_win,buf, false, {
           relative='editor', width=9, height=2, row=2, col=5, footer='Footer',
          }))
       eq("footer_pos requires footer to be set",
-         pcall_err(meths.open_win,buf, false, {
+         pcall_err(meths.nvim_open_win,buf, false, {
           relative='editor', width=9, height=2, row=2, col=5,
           border='single', footer_pos='left',
          }))
@@ -1792,10 +1792,10 @@ describe('float window', function()
     end)
 
     it('center aligned title longer than window width #25746', function()
-      local buf = meths.create_buf(false, false)
-      meths.buf_set_lines(buf, 0, -1, true, {' halloj! ',
+      local buf = meths.nvim_create_buf(false, false)
+      meths.nvim_buf_set_lines(buf, 0, -1, true, {' halloj! ',
                                              ' BORDAA  '})
-      local win = meths.open_win(buf, false, {
+      local win = meths.nvim_open_win(buf, false, {
         relative='editor', width=9, height=2, row=2, col=5, border="double",
         title = "abcdefghijklmnopqrstuvwxyz",title_pos = "center",
       })
@@ -1833,15 +1833,15 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_close(win, false)
+      meths.nvim_win_close(win, false)
       assert_alive()
     end)
 
     it('border with title', function()
-      local buf = meths.create_buf(false, false)
-      meths.buf_set_lines(buf, 0, -1, true, {' halloj! ',
+      local buf = meths.nvim_create_buf(false, false)
+      meths.nvim_buf_set_lines(buf, 0, -1, true, {' halloj! ',
                                              ' BORDAA  '})
-      local win = meths.open_win(buf, false, {
+      local win = meths.nvim_open_win(buf, false, {
         relative='editor', width=9, height=2, row=2, col=5, border="double",
         title = "Left",title_pos = "left",
       })
@@ -1879,7 +1879,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {title= "Center",title_pos="center"})
+      meths.nvim_win_set_config(win, {title= "Center",title_pos="center"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1913,7 +1913,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {title= "Right",title_pos="right"})
+      meths.nvim_win_set_config(win, {title= "Right",title_pos="right"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1947,7 +1947,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {title= { {"🦄"},{"BB"}},title_pos="right"})
+      meths.nvim_win_set_config(win, {title= { {"🦄"},{"BB"}},title_pos="right"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -1983,10 +1983,10 @@ describe('float window', function()
     end)
 
     it('border with footer', function()
-      local buf = meths.create_buf(false, false)
-      meths.buf_set_lines(buf, 0, -1, true, {' halloj! ',
+      local buf = meths.nvim_create_buf(false, false)
+      meths.nvim_buf_set_lines(buf, 0, -1, true, {' halloj! ',
                                              ' BORDAA  '})
-      local win = meths.open_win(buf, false, {
+      local win = meths.nvim_open_win(buf, false, {
         relative='editor', width=9, height=2, row=2, col=5, border="double",
         footer = "Left",footer_pos = "left",
       })
@@ -2024,7 +2024,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {footer= "Center",footer_pos="center"})
+      meths.nvim_win_set_config(win, {footer= "Center",footer_pos="center"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -2058,7 +2058,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {footer= "Right",footer_pos="right"})
+      meths.nvim_win_set_config(win, {footer= "Right",footer_pos="right"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -2092,7 +2092,7 @@ describe('float window', function()
         ]]}
       end
 
-      meths.win_set_config(win, {footer= { {"🦄"},{"BB"}},footer_pos="right"})
+      meths.nvim_win_set_config(win, {footer= { {"🦄"},{"BB"}},footer_pos="right"})
       if multigrid then
         screen:expect{grid=[[
         ## grid 1
@@ -2128,10 +2128,10 @@ describe('float window', function()
     end)
 
     it('border with title and footer', function()
-      local buf = meths.create_buf(false, false)
-      meths.buf_set_lines(buf, 0, -1, true, {' halloj! ',