api: consistently use nvim_ prefix and update documentation

test/functional/api/buffer_spec.lua

@@ -3,105 +3,111 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, buffer = helpers.clear, helpers.nvim, helpers.buffer
 local curbuf, curwin, eq = helpers.curbuf, helpers.curwin, helpers.eq
 local curbufmeths, ok = helpers.curbufmeths, helpers.ok
-local funcs = helpers.funcs
+local funcs, request = helpers.funcs, helpers.request
 
 describe('buffer_* functions', function()
   before_each(clear)
 
+  -- access deprecated functions
+  local function curbuf_depr(method, ...)
+    return request('buffer_'..method, 0, ...)
+  end
+
+
   describe('line_count, insert and del_line', function()
     it('works', function()
-      eq(1, curbuf('line_count'))
-      curbuf('insert', -1, {'line'})
-      eq(2, curbuf('line_count'))
-      curbuf('insert', -1, {'line'})
-      eq(3, curbuf('line_count'))
-      curbuf('del_line', -1)
-      eq(2, curbuf('line_count'))
-      curbuf('del_line', -1)
-      curbuf('del_line', -1)
+      eq(1, curbuf_depr('line_count'))
+      curbuf_depr('insert', -1, {'line'})
+      eq(2, curbuf_depr('line_count'))
+      curbuf_depr('insert', -1, {'line'})
+      eq(3, curbuf_depr('line_count'))
+      curbuf_depr('del_line', -1)
+      eq(2, curbuf_depr('line_count'))
+      curbuf_depr('del_line', -1)
+      curbuf_depr('del_line', -1)
       -- There's always at least one line
-      eq(1, curbuf('line_count'))
+      eq(1, curbuf_depr('line_count'))
     end)
   end)
 
 
   describe('{get,set,del}_line', function()
     it('works', function()
-      eq('', curbuf('get_line', 0))
-      curbuf('set_line', 0, 'line1')
-      eq('line1', curbuf('get_line', 0))
-      curbuf('set_line', 0, 'line2')
-      eq('line2', curbuf('get_line', 0))
-      curbuf('del_line', 0)
-      eq('', curbuf('get_line', 0))
+      eq('', curbuf_depr('get_line', 0))
+      curbuf_depr('set_line', 0, 'line1')
+      eq('line1', curbuf_depr('get_line', 0))
+      curbuf_depr('set_line', 0, 'line2')
+      eq('line2', curbuf_depr('get_line', 0))
+      curbuf_depr('del_line', 0)
+      eq('', curbuf_depr('get_line', 0))
     end)
 
     it('get_line: out-of-bounds is an error', function()
-      curbuf('set_line', 0, 'line1.a')
-      eq(1, curbuf('line_count')) -- sanity
-      eq(false, pcall(curbuf, 'get_line', 1))
-      eq(false, pcall(curbuf, 'get_line', -2))
+      curbuf_depr('set_line', 0, 'line1.a')
+      eq(1, curbuf_depr('line_count')) -- sanity
+      eq(false, pcall(curbuf_depr, 'get_line', 1))
+      eq(false, pcall(curbuf_depr, 'get_line', -2))
     end)
 
     it('set_line, del_line: out-of-bounds is an error', function()
-      curbuf('set_line', 0, 'line1.a')
-      eq(false, pcall(curbuf, 'set_line', 1, 'line1.b'))
-      eq(false, pcall(curbuf, 'set_line', -2, 'line1.b'))
-      eq(false, pcall(curbuf, 'del_line', 2))
-      eq(false, pcall(curbuf, 'del_line', -3))
+      curbuf_depr('set_line', 0, 'line1.a')
+      eq(false, pcall(curbuf_depr, 'set_line', 1, 'line1.b'))
+      eq(false, pcall(curbuf_depr, 'set_line', -2, 'line1.b'))
+      eq(false, pcall(curbuf_depr, 'del_line', 2))
+      eq(false, pcall(curbuf_depr, 'del_line', -3))
     end)
 
     it('can handle NULs', function()
-      curbuf('set_line', 0, 'ab\0cd')
-      eq('ab\0cd', curbuf('get_line', 0))
+      curbuf_depr('set_line', 0, 'ab\0cd')
+      eq('ab\0cd', curbuf_depr('get_line', 0))
     end)
   end)
 
 
   describe('{get,set}_line_slice', function()
     it('get_line_slice: out-of-bounds returns empty array', function()
-      curbuf('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 2, true, true)) --sanity
+      curbuf_depr('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, 2, true, true)) --sanity
 
-      eq({}, curbuf('get_line_slice', 2, 3, false, true))
-      eq({}, curbuf('get_line_slice', 3, 9, true, true))
-      eq({}, curbuf('get_line_slice', 3, -1, true, true))
-      eq({}, curbuf('get_line_slice', -3, -4, false, true))
-      eq({}, curbuf('get_line_slice', -4, -5, true, true))
+      eq({}, curbuf_depr('get_line_slice', 2, 3, false, true))
+      eq({}, curbuf_depr('get_line_slice', 3, 9, true, true))
+      eq({}, curbuf_depr('get_line_slice', 3, -1, true, true))
+      eq({}, curbuf_depr('get_line_slice', -3, -4, false, true))
+      eq({}, curbuf_depr('get_line_slice', -4, -5, true, true))
     end)
 
     it('set_line_slice: out-of-bounds extends past end', function()
-      curbuf('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 2, true, true)) --sanity
+      curbuf_depr('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, 2, true, true)) --sanity
 
-      eq({'c'}, curbuf('get_line_slice', -1, 4, true, true))
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 5, true, true))
-      curbuf('set_line_slice', 4, 5, true, true, {'d'})
-      eq({'a', 'b', 'c', 'd'}, curbuf('get_line_slice', 0, 5, true, true))
-      curbuf('set_line_slice', -4, -5, true, true, {'e'})
-      eq({'e', 'a', 'b', 'c', 'd'}, curbuf('get_line_slice', 0, 5, true, true))
+      eq({'c'}, curbuf_depr('get_line_slice', -1, 4, true, true))
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, 5, true, true))
+      curbuf_depr('set_line_slice', 4, 5, true, true, {'d'})
+      eq({'a', 'b', 'c', 'd'}, curbuf_depr('get_line_slice', 0, 5, true, true))
+      curbuf_depr('set_line_slice', -4, -5, true, true, {'e'})
+      eq({'e', 'a', 'b', 'c', 'd'}, curbuf_depr('get_line_slice', 0, 5, true, true))
     end)
 
     it('works', function()
-      eq({''}, curbuf('get_line_slice', 0, -1, true, true))
+      eq({''}, curbuf_depr('get_line_slice', 0, -1, true, true))
       -- Replace buffer
-      curbuf('set_line_slice', 0, -1, true, true, {'a', 'b', 'c'})
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, -1, true, true))
-      eq({'b', 'c'}, curbuf('get_line_slice', 1, -1, true, true))
-      eq({'b'}, curbuf('get_line_slice', 1, 2, true, false))
-      eq({}, curbuf('get_line_slice', 1, 1, true, false))
-      eq({'a', 'b'}, curbuf('get_line_slice', 0, -1, true, false))
-      eq({'b'}, curbuf('get_line_slice', 1, -1, true, false))
-      eq({'b', 'c'}, curbuf('get_line_slice', -2, -1, true, true))
-      curbuf('set_line_slice', 1, 2, true, false, {'a', 'b', 'c'})
-      eq({'a', 'a', 'b', 'c', 'c'}, curbuf('get_line_slice', 0, -1, true, true))
-      curbuf('set_line_slice', -1, -1, true, true, {'a', 'b', 'c'})
+      curbuf_depr('set_line_slice', 0, -1, true, true, {'a', 'b', 'c'})
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, -1, true, true))
+      eq({'b', 'c'}, curbuf_depr('get_line_slice', 1, -1, true, true))
+      eq({'b'}, curbuf_depr('get_line_slice', 1, 2, true, false))
+      eq({}, curbuf_depr('get_line_slice', 1, 1, true, false))
+      eq({'a', 'b'}, curbuf_depr('get_line_slice', 0, -1, true, false))
+      eq({'b'}, curbuf_depr('get_line_slice', 1, -1, true, false))
+      eq({'b', 'c'}, curbuf_depr('get_line_slice', -2, -1, true, true))
+      curbuf_depr('set_line_slice', 1, 2, true, false, {'a', 'b', 'c'})
+      eq({'a', 'a', 'b', 'c', 'c'}, curbuf_depr('get_line_slice', 0, -1, true, true))
+      curbuf_depr('set_line_slice', -1, -1, true, true, {'a', 'b', 'c'})
       eq({'a', 'a', 'b', 'c', 'a', 'b', 'c'},
-        curbuf('get_line_slice', 0, -1, true, true))
-      curbuf('set_line_slice', 0, -3, true, false, {})
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, -1, true, true))
-      curbuf('set_line_slice', 0, -1, true, true, {})
-      eq({''}, curbuf('get_line_slice', 0, -1, true, true))
+        curbuf_depr('get_line_slice', 0, -1, true, true))
+      curbuf_depr('set_line_slice', 0, -3, true, false, {})
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, -1, true, true))
+      curbuf_depr('set_line_slice', 0, -1, true, true, {})
+      eq({''}, curbuf_depr('get_line_slice', 0, -1, true, true))
     end)
   end)
 
@@ -286,7 +292,7 @@ describe('buffer_* functions', function()
 
   describe('get_mark', function()
     it('works', function()
-      curbuf('insert', -1, {'a', 'bit of', 'text'})
+      curbuf('set_lines', -1, -1, true, {'a', 'bit of', 'text'})
       curwin('set_cursor', {3, 4})
       nvim('command', 'mark V')
       eq({3, 0}, curbuf('get_mark', 'V'))

test/functional/api/vim_spec.lua

@@ -7,6 +7,7 @@ local ok, nvim_async, feed = helpers.ok, helpers.nvim_async, helpers.feed
 local os_name = helpers.os_name
 local meths = helpers.meths
 local funcs = helpers.funcs
+local request = helpers.request
 
 describe('vim_* functions', function()
   before_each(clear)
@@ -41,6 +42,10 @@ describe('vim_* functions', function()
       eq(1, nvim('eval',"matcharg(1) == ['', '']"))
       eq({'', ''}, nvim('eval','matcharg(1)'))
     end)
+
+    it('works under deprecated name', function()
+      eq(2, request("vim_eval", "1+1"))
+    end)
   end)
 
   describe('call_function', function()

test/functional/helpers.lua

@@ -133,11 +133,11 @@ local function stop()
 end
 
 local function nvim_command(cmd)
-  request('vim_command', cmd)
+  request('nvim_command', cmd)
 end
 
 local function nvim_eval(expr)
-  return request('vim_eval', expr)
+  return request('nvim_eval', expr)
 end
 
 local os_name = (function()
@@ -157,12 +157,12 @@ local os_name = (function()
 end)()
 
 local function nvim_call(name, ...)
-  return request('vim_call_function', name, {...})
+  return request('nvim_call_function', name, {...})
 end
 
 local function nvim_feed(input)
   while #input > 0 do
-    local written = request('vim_input', input)
+    local written = request('nvim_input', input)
     input = input:sub(written + 1)
   end
 end
@@ -339,7 +339,7 @@ local function source(code)
 end
 
 local function nvim(method, ...)
-  return request('vim_'..method, ...)
+  return request('nvim_'..method, ...)
 end
 
 local function ui(method, ...)
@@ -347,27 +347,26 @@ local function ui(method, ...)
 end
 
 local function nvim_async(method, ...)
-  session:notify('vim_'..method, ...)
+  session:notify('nvim_'..method, ...)
 end
 
 local function buffer(method, ...)
-  return request('buffer_'..method, ...)
+  return request('nvim_buf_'..method, ...)
 end
 
 local function window(method, ...)
-  return request('window_'..method, ...)
+  return request('nvim_win_'..method, ...)
 end
 
 local function tabpage(method, ...)
-  return request('tabpage_'..method, ...)
+  return request('nvim_tabpage_'..method, ...)
 end
 
 local function curbuf(method, ...)
-  local buf = nvim('get_current_buffer')
   if not method then
-    return buf
+    return nvim('get_current_buffer')
   end
-  return buffer(method, buf, ...)
+  return buffer(method, 0, ...)
 end
 
 local function wait()
@@ -387,19 +386,17 @@ local function curbuf_contents()
 end
 
 local function curwin(method, ...)
-  local win = nvim('get_current_window')
   if not method then
-    return win
+    return nvim('get_current_window')
   end
-  return window(method, win, ...)
+  return window(method, 0, ...)
 end
 
 local function curtab(method, ...)
-  local tab = nvim('get_current_tabpage')
   if not method then
-    return tab
+    return nvim('get_current_tabpage')
   end
-  return tabpage(method, tab, ...)
+  return tabpage(method, 0, ...)
 end
 
 local function expect(contents)

test/functional/plugin/shada_spec.lua

@@ -2463,17 +2463,17 @@ describe('ftplugin/shada.vim', function()
     nvim_command('setlocal filetype=shada')
     funcs.setline(1, '  Replacement with timestamp ' .. epoch)
     nvim_feed('ggA:\027')
-    eq('Replacement with timestamp ' .. epoch .. ':', curbuf('get_line', 0))
+    eq('Replacement with timestamp ' .. epoch .. ':', curbuf('get_lines', 0, 1, true)[1])
     nvim_feed('o-\027')
-    eq('  -', curbuf('get_line', 1))
+    eq({'  -'}, curbuf('get_lines', 1, 2, true))
     nvim_feed('ggO+\027')
-    eq('+', curbuf('get_line', 0))
+    eq({'+'}, curbuf('get_lines', 0, 1, true))
     nvim_feed('GO*\027')
-    eq('  *', curbuf('get_line', 2))
+    eq({'  *'}, curbuf('get_lines', 2, 3, true))
     nvim_feed('ggO  /\027')
-    eq('  /', curbuf('get_line', 0))
+    eq({'  /'}, curbuf('get_lines', 0, 1, true))
     nvim_feed('ggOx\027')
-    eq('x', curbuf('get_line', 0))
+    eq({'x'}, curbuf('get_lines', 0, 1, true))
   end)
 end)
 

test/functional/shada/buffers_spec.lua

@@ -80,9 +80,9 @@ describe('ShaDa support code', function()
   it('does not dump unnamed buffers', function()
     set_additional_cmd('set shada+=% hidden')
     reset()
-    curbufmeths.set_line(0, 'foo')
+    curbufmeths.set_lines(0, 1, true, {'foo'})
     nvim_command('enew')
-    curbufmeths.set_line(0, 'bar')
+    curbufmeths.set_lines(0, 1, true, {'bar'})
     eq(2, funcs.bufnr('$'))
     nvim_command('qall!')
     reset()