api: consistently use nvim_ prefix and update documentation

1 files changed, 70 insertions, 64 deletions

diff --git a/test/functional/api/buffer_spec.lua b/test/functional/api/buffer_spec.lua
index cf8a83ad81..2cc803da52 100644
--- a/test/functional/api/buffer_spec.lua
+++ b/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
-
-      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))
+      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_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
-
-      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))
+      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_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'))