From 6aa03e86da041284b5f27a59f73cef0991fc577e Mon Sep 17 00:00:00 2001
From: Siddhant Gupta <dpsrkp.sid@gmail.com>
Date: Sun, 6 Oct 2019 13:37:54 -0700
Subject: API: nvim_source

---
 test/functional/api/vim_spec.lua | 78 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

(limited to 'test/functional/api/vim_spec.lua')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 8b77dbcaa6..14ed474eb1 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -74,6 +74,84 @@ describe('API', function()
     eq({mode='i', blocking=false}, nvim("get_mode"))
   end)
 
+  describe('nvim_source', function()
+    it('works with a one-liner', function()
+      nvim('source', "let x1 = 'a'")
+      eq(nvim('get_var', 'x1'), 'a')
+    end)
+
+    it('works with stray newline character', function()
+      nvim('source', "let x2 = 'a'\n")
+      eq(nvim('get_var', 'x2'),'a')
+    end)
+
+    it('works with multiline command', function()
+      nvim('source', 'lua <<EOF\ny=3\nEOF')
+      eq(nvim('command_output', "echo luaeval('y')"),'3')
+    end)
+
+    it('works with multiple stray newline character', function()
+      nvim('source','lua <<EOF\n\n\n\ny=3\n\n\nEOF')
+      eq(nvim('command_output', "echo luaeval('y')"), '3')
+    end)
+
+    it('works with utf-8', function()
+      nvim('command', 'new')
+      nvim('command', 'normal i ax \n Ax ')
+      nvim('source', ":%s/ax/--a1234--/g | :%s/Ax/--A1234--/g")
+      nvim('command','1')
+      eq(' --a1234-- ',nvim('get_current_line'))
+      nvim('command','2')
+      eq(' --A1234-- ',nvim('get_current_line'))
+    end)
+
+    it('works with latin characters', function()
+      nvim('command', 'new')
+      nvim('command', "call setline(1,['xxx'])")
+      nvim('source', "call feedkeys('r')|call feedkeys('ñ', 'xt')")
+      eq('ñxx',nvim('get_current_line'))
+    end)
+
+    it('nvim_source validation error:fails with specific error', function()
+      local status, rv = pcall(nvim, "source", "bogus_command")
+      eq(false, status)                       -- nvim_command() failed.
+      eq("E492:", string.match(rv, "E%d*:"))  -- VimL error was returned.
+      eq('', nvim('eval', 'v:errmsg'))        -- v:errmsg was not updated.
+      eq('', eval('v:exception'))
+    end)
+
+    it('nvim_source execution error: fails with specific error', function()
+      local status, rv = pcall(nvim, "source", "buffer 23487")
+      eq(false, status)                 -- nvim_command() failed.
+      eq("E86: Buffer 23487 does not exist", string.match(rv, "E%d*:.*"))
+      eq('', eval('v:errmsg'))  -- v:errmsg was not updated.
+      eq('', eval('v:exception'))
+    end)
+
+    it('nvim_source autocommands work', function()
+      nvim('source','autocmd BufCreate * :let x1 = "Hello"')
+      local fname = helpers.tmpname()
+      nvim('command', 'new '..fname)
+      eq(nvim('command_output','echo x1'),"Hello")
+    end)
+
+    it('nvim_source: recursive source works', function()
+      local fname = helpers.tmpname()
+      nvim('command', 'new')
+      nvim('command','edit '..fname)
+      nvim('command','normal ilet x1 = "a"')
+      nvim('command','w')
+      nvim('source','call nvim_source("source '..fname..'")')
+      eq(nvim('get_var','x1'),'a')
+    end)
+
+    it('nvim_source: functions work', function()
+      nvim('source','function Foo()\ncall setline(1,["xxx"])\nendfunction')
+      nvim('source','call Foo()')
+      eq(nvim('get_current_line'),'xxx')
+    end)
+  end)
+
   describe('nvim_command', function()
     it('works', function()
       local fname = helpers.tmpname()
-- 
cgit 


From 276c2da28616d7a4f504c328dbb8857d38ab7a4a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 6 Oct 2019 19:40:36 -0700
Subject: API: nvim_source: fix multiline input

- DOCMD_REPEAT is needed to source all lines of input.
- Fix ":verbose set {option}?" by handling SID_STR in get_scriptname().

closes #8722
---
 test/functional/api/vim_spec.lua | 131 ++++++++++++++++++++++-----------------
 1 file changed, 73 insertions(+), 58 deletions(-)

(limited to 'test/functional/api/vim_spec.lua')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 14ed474eb1..a01ef2d6dd 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -16,6 +16,7 @@ local parse_context = helpers.parse_context
 local request = helpers.request
 local source = helpers.source
 local next_msg = helpers.next_msg
+local write_file = helpers.write_file
 
 local pcall_err = helpers.pcall_err
 local format_string = helpers.format_string
@@ -75,80 +76,94 @@ describe('API', function()
   end)
 
   describe('nvim_source', function()
-    it('works with a one-liner', function()
+    it('one-line input', function()
       nvim('source', "let x1 = 'a'")
-      eq(nvim('get_var', 'x1'), 'a')
+      eq('a', nvim('get_var', 'x1'))
     end)
 
-    it('works with stray newline character', function()
-      nvim('source', "let x2 = 'a'\n")
-      eq(nvim('get_var', 'x2'),'a')
-    end)
-
-    it('works with multiline command', function()
-      nvim('source', 'lua <<EOF\ny=3\nEOF')
-      eq(nvim('command_output', "echo luaeval('y')"),'3')
+    it(':verbose set {option}?', function()
+      nvim('source', 'set nowrap')
+      eq('nowrap\n\tLast set from :source (no file)',
+        nvim('command_output', 'verbose set wrap?'))
     end)
 
-    it('works with multiple stray newline character', function()
+    it('multiline input', function()
+      -- Heredoc + empty lines.
+      nvim('source', "let x2 = 'a'\n")
+      eq('a', nvim('get_var', 'x2'))
       nvim('source','lua <<EOF\n\n\n\ny=3\n\n\nEOF')
-      eq(nvim('command_output', "echo luaeval('y')"), '3')
-    end)
+      eq(3, nvim('eval', "luaeval('y')"))
 
-    it('works with utf-8', function()
-      nvim('command', 'new')
-      nvim('command', 'normal i ax \n Ax ')
-      nvim('source', ":%s/ax/--a1234--/g | :%s/Ax/--A1234--/g")
-      nvim('command','1')
-      eq(' --a1234-- ',nvim('get_current_line'))
-      nvim('command','2')
-      eq(' --A1234-- ',nvim('get_current_line'))
-    end)
-
-    it('works with latin characters', function()
-      nvim('command', 'new')
-      nvim('command', "call setline(1,['xxx'])")
-      nvim('source', "call feedkeys('r')|call feedkeys('ñ', 'xt')")
-      eq('ñxx',nvim('get_current_line'))
+      nvim('source', 'lua <<EOF\ny=3\nEOF')
+      eq(3, nvim('eval', "luaeval('y')"))
+
+      -- Multiple statements
+      nvim('source', 'let x1=1\nlet x2=2\nlet x3=3\n')
+      eq(1, nvim('eval', 'x1'))
+      eq(2, nvim('eval', 'x2'))
+      eq(3, nvim('eval', 'x3'))
+
+      -- Functions
+      nvim('source', 'function Foo()\ncall setline(1,["xxx"])\nendfunction')
+      eq(nvim('get_current_line'), '')
+      nvim('source', 'call Foo()')
+      eq(nvim('get_current_line'), 'xxx')
+
+      -- Autocmds
+      nvim('source','autocmd BufAdd * :let x1 = "Hello"')
+      nvim('command', 'new foo')
+      eq('Hello', request('nvim_eval', 'g:x1'))
+    end)
+
+    it('non-ASCII input', function()
+      nvim('source', [=[
+        new
+        exe "normal! i ax \n Ax "
+        :%s/ax/--a1234--/g | :%s/Ax/--A1234--/g
+      ]=])
+      nvim('command', '1')
+      eq(' --a1234-- ', nvim('get_current_line'))
+      nvim('command', '2')
+      eq(' --A1234-- ', nvim('get_current_line'))
+
+      nvim('source', [[
+        new
+        call setline(1,['xxx'])
+        call feedkeys('r')
+        call feedkeys('ñ', 'xt')
+      ]])
+      eq('ñxx', nvim('get_current_line'))
     end)
 
-    it('nvim_source validation error:fails with specific error', function()
-      local status, rv = pcall(nvim, "source", "bogus_command")
-      eq(false, status)                       -- nvim_command() failed.
-      eq("E492:", string.match(rv, "E%d*:"))  -- VimL error was returned.
-      eq('', nvim('eval', 'v:errmsg'))        -- v:errmsg was not updated.
+    it('execution error', function()
+      eq('Vim:E492: Not an editor command: bogus_command',
+        pcall_err(request, 'nvim_source', 'bogus_command'))
+      eq('', nvim('eval', 'v:errmsg'))  -- v:errmsg was not updated.
       eq('', eval('v:exception'))
-    end)
 
-    it('nvim_source execution error: fails with specific error', function()
-      local status, rv = pcall(nvim, "source", "buffer 23487")
-      eq(false, status)                 -- nvim_command() failed.
-      eq("E86: Buffer 23487 does not exist", string.match(rv, "E%d*:.*"))
+      eq('Vim(buffer):E86: Buffer 23487 does not exist',
+        pcall_err(request, 'nvim_source', 'buffer 23487'))
       eq('', eval('v:errmsg'))  -- v:errmsg was not updated.
       eq('', eval('v:exception'))
     end)
 
-    it('nvim_source autocommands work', function()
-      nvim('source','autocmd BufCreate * :let x1 = "Hello"')
+    it('recursion', function()
       local fname = helpers.tmpname()
-      nvim('command', 'new '..fname)
-      eq(nvim('command_output','echo x1'),"Hello")
-    end)
-
-    it('nvim_source: recursive source works', function()
-      local fname = helpers.tmpname()
-      nvim('command', 'new')
-      nvim('command','edit '..fname)
-      nvim('command','normal ilet x1 = "a"')
-      nvim('command','w')
-      nvim('source','call nvim_source("source '..fname..'")')
-      eq(nvim('get_var','x1'),'a')
-    end)
-
-    it('nvim_source: functions work', function()
-      nvim('source','function Foo()\ncall setline(1,["xxx"])\nendfunction')
-      nvim('source','call Foo()')
-      eq(nvim('get_current_line'),'xxx')
+      write_file(fname, 'let x1 = "set from :source file"\n')
+      -- nvim_source
+      --   :source
+      --     nvim_source
+      request('nvim_source', [[
+        let x2 = substitute('foo','o','X','g')
+        let x4 = 'should be overwritten'
+        call nvim_source("source ]]..fname..[[\nlet x3 = substitute('foo','foo','set by recursive nvim_source','g')\nlet x5='overwritten'\nlet x4=x5\n")
+      ]])
+      eq('set from :source file', request('nvim_get_var', 'x1'))
+      eq('fXX', request('nvim_get_var', 'x2'))
+      eq('set by recursive nvim_source', request('nvim_get_var', 'x3'))
+      eq('overwritten', request('nvim_get_var', 'x4'))
+      eq('overwritten', request('nvim_get_var', 'x5'))
+      os.remove(fname)
     end)
   end)
 
-- 
cgit 


From bd43e011b5b0feba644ec5feae6c174def31a9e4 Mon Sep 17 00:00:00 2001
From: Vikram Pal <vikrampal659@gmail.com>
Date: Wed, 9 Oct 2019 18:34:37 +0530
Subject: API: nvim_source_output

- Similar to nvim_source but will capture the output
- Add meaningful VimL tracebacks for nvim_source
- Handle got_int
- Add error reporting
---
 test/functional/api/vim_spec.lua | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'test/functional/api/vim_spec.lua')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index a01ef2d6dd..9a7744142a 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -84,7 +84,7 @@ describe('API', function()
     it(':verbose set {option}?', function()
       nvim('source', 'set nowrap')
       eq('nowrap\n\tLast set from :source (no file)',
-        nvim('command_output', 'verbose set wrap?'))
+        nvim('source_output', 'verbose set wrap?'))
     end)
 
     it('multiline input', function()
@@ -165,6 +165,36 @@ describe('API', function()
       eq('overwritten', request('nvim_get_var', 'x5'))
       os.remove(fname)
     end)
+
+    it('traceback', function()
+      local fname = helpers.tmpname()
+      write_file(fname, 'echo "hello"\n')
+      local sourcing_fname = helpers.tmpname()
+      write_file(sourcing_fname, 'call nvim_source("source '..fname..'")\n')
+      meths.source('set verbose=2')
+      print()
+      local traceback_output = 'line 0: sourcing "'..sourcing_fname..'"\n'..
+        'line 0: sourcing "'..fname..'"\n'..
+        'hello\n'..
+        'finished sourcing '..fname..'\n'..
+        'continuing in nvim_source(..) called at '..sourcing_fname..':1\n'..
+        'finished sourcing '..sourcing_fname..'\n'..
+        'continuing in nvim_source(..) called at nvim_source_output(..):0'
+      eq(traceback_output, meths.source_output('call nvim_source("source '..sourcing_fname..'")'))
+      os.remove(fname)
+      os.remove(sourcing_fname)
+    end)
+  end)
+
+  describe('nvim_source_output', function()
+    it('multiline input', function()
+      eq('this is spinal tap',
+         nvim('source_output', 'lua <<EOF\n\n\nprint("this is spinal tap")\n\n\nEOF'))
+    end)
+
+    it('empty output', function()
+      eq('', nvim('source_output', 'echo'))
+    end)
   end)
 
   describe('nvim_command', function()
-- 
cgit 


From b1991f66d5845ccb72c73fdf39153a0e1fbb1124 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 1 Dec 2019 22:26:36 -0800
Subject: API: rename nvim_source => nvim_exec

- Eliminate nvim_source_output(): add boolean `output` param to
  nvim_exec() instead.
---
 test/functional/api/vim_spec.lua | 79 +++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 41 deletions(-)

(limited to 'test/functional/api/vim_spec.lua')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 9a7744142a..d7baf68a5b 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -16,6 +16,7 @@ local parse_context = helpers.parse_context
 local request = helpers.request
 local source = helpers.source
 local next_msg = helpers.next_msg
+local tmpname = helpers.tmpname
 local write_file = helpers.write_file
 
 local pcall_err = helpers.pcall_err
@@ -75,131 +76,127 @@ describe('API', function()
     eq({mode='i', blocking=false}, nvim("get_mode"))
   end)
 
-  describe('nvim_source', function()
+  describe('nvim_exec', function()
     it('one-line input', function()
-      nvim('source', "let x1 = 'a'")
+      nvim('exec', "let x1 = 'a'", false)
       eq('a', nvim('get_var', 'x1'))
     end)
 
     it(':verbose set {option}?', function()
-      nvim('source', 'set nowrap')
+      nvim('exec', 'set nowrap', false)
       eq('nowrap\n\tLast set from :source (no file)',
-        nvim('source_output', 'verbose set wrap?'))
+        nvim('exec', 'verbose set wrap?', true))
     end)
 
     it('multiline input', function()
       -- Heredoc + empty lines.
-      nvim('source', "let x2 = 'a'\n")
+      nvim('exec', "let x2 = 'a'\n", false)
       eq('a', nvim('get_var', 'x2'))
-      nvim('source','lua <<EOF\n\n\n\ny=3\n\n\nEOF')
+      nvim('exec','lua <<EOF\n\n\n\ny=3\n\n\nEOF', false)
       eq(3, nvim('eval', "luaeval('y')"))
 
-      nvim('source', 'lua <<EOF\ny=3\nEOF')
+      eq('', nvim('exec', 'lua <<EOF\ny=3\nEOF', false))
       eq(3, nvim('eval', "luaeval('y')"))
 
       -- Multiple statements
-      nvim('source', 'let x1=1\nlet x2=2\nlet x3=3\n')
+      nvim('exec', 'let x1=1\nlet x2=2\nlet x3=3\n', false)
       eq(1, nvim('eval', 'x1'))
       eq(2, nvim('eval', 'x2'))
       eq(3, nvim('eval', 'x3'))
 
       -- Functions
-      nvim('source', 'function Foo()\ncall setline(1,["xxx"])\nendfunction')
+      nvim('exec', 'function Foo()\ncall setline(1,["xxx"])\nendfunction', false)
       eq(nvim('get_current_line'), '')
-      nvim('source', 'call Foo()')
+      nvim('exec', 'call Foo()', false)
       eq(nvim('get_current_line'), 'xxx')
 
       -- Autocmds
-      nvim('source','autocmd BufAdd * :let x1 = "Hello"')
+      nvim('exec','autocmd BufAdd * :let x1 = "Hello"', false)
       nvim('command', 'new foo')
       eq('Hello', request('nvim_eval', 'g:x1'))
     end)
 
     it('non-ASCII input', function()
-      nvim('source', [=[
+      nvim('exec', [=[
         new
         exe "normal! i ax \n Ax "
         :%s/ax/--a1234--/g | :%s/Ax/--A1234--/g
-      ]=])
+      ]=], false)
       nvim('command', '1')
       eq(' --a1234-- ', nvim('get_current_line'))
       nvim('command', '2')
       eq(' --A1234-- ', nvim('get_current_line'))
 
-      nvim('source', [[
+      nvim('exec', [[
         new
         call setline(1,['xxx'])
         call feedkeys('r')
         call feedkeys('ñ', 'xt')
-      ]])
+      ]], false)
       eq('ñxx', nvim('get_current_line'))
     end)
 
     it('execution error', function()
       eq('Vim:E492: Not an editor command: bogus_command',
-        pcall_err(request, 'nvim_source', 'bogus_command'))
+        pcall_err(request, 'nvim_exec', 'bogus_command', false))
       eq('', nvim('eval', 'v:errmsg'))  -- v:errmsg was not updated.
       eq('', eval('v:exception'))
 
       eq('Vim(buffer):E86: Buffer 23487 does not exist',
-        pcall_err(request, 'nvim_source', 'buffer 23487'))
+        pcall_err(request, 'nvim_exec', 'buffer 23487', false))
       eq('', eval('v:errmsg'))  -- v:errmsg was not updated.
       eq('', eval('v:exception'))
     end)
 
     it('recursion', function()
-      local fname = helpers.tmpname()
+      local fname = tmpname()
       write_file(fname, 'let x1 = "set from :source file"\n')
-      -- nvim_source
+      -- nvim_exec
       --   :source
-      --     nvim_source
-      request('nvim_source', [[
+      --     nvim_exec
+      request('nvim_exec', [[
         let x2 = substitute('foo','o','X','g')
         let x4 = 'should be overwritten'
-        call nvim_source("source ]]..fname..[[\nlet x3 = substitute('foo','foo','set by recursive nvim_source','g')\nlet x5='overwritten'\nlet x4=x5\n")
-      ]])
+        call nvim_exec("source ]]..fname..[[\nlet x3 = substitute('foo','foo','set by recursive nvim_exec','g')\nlet x5='overwritten'\nlet x4=x5\n", v:false)
+      ]], false)
       eq('set from :source file', request('nvim_get_var', 'x1'))
       eq('fXX', request('nvim_get_var', 'x2'))
-      eq('set by recursive nvim_source', request('nvim_get_var', 'x3'))
+      eq('set by recursive nvim_exec', request('nvim_get_var', 'x3'))
       eq('overwritten', request('nvim_get_var', 'x4'))
       eq('overwritten', request('nvim_get_var', 'x5'))
       os.remove(fname)
     end)
 
     it('traceback', function()
-      local fname = helpers.tmpname()
+      local fname = tmpname()
       write_file(fname, 'echo "hello"\n')
-      local sourcing_fname = helpers.tmpname()
-      write_file(sourcing_fname, 'call nvim_source("source '..fname..'")\n')
-      meths.source('set verbose=2')
-      print()
+      local sourcing_fname = tmpname()
+      write_file(sourcing_fname, 'call nvim_exec("source '..fname..'", v:false)\n')
+      meths.exec('set verbose=2', false)
       local traceback_output = 'line 0: sourcing "'..sourcing_fname..'"\n'..
         'line 0: sourcing "'..fname..'"\n'..
         'hello\n'..
         'finished sourcing '..fname..'\n'..
-        'continuing in nvim_source(..) called at '..sourcing_fname..':1\n'..
+        'continuing in nvim_exec() called at '..sourcing_fname..':1\n'..
         'finished sourcing '..sourcing_fname..'\n'..
-        'continuing in nvim_source(..) called at nvim_source_output(..):0'
-      eq(traceback_output, meths.source_output('call nvim_source("source '..sourcing_fname..'")'))
+        'continuing in nvim_exec() called at nvim_exec():0'
+      eq(traceback_output,
+        meths.exec('call nvim_exec("source '..sourcing_fname..'", v:false)', true))
       os.remove(fname)
       os.remove(sourcing_fname)
     end)
-  end)
 
-  describe('nvim_source_output', function()
-    it('multiline input', function()
+    it('returns output', function()
       eq('this is spinal tap',
-         nvim('source_output', 'lua <<EOF\n\n\nprint("this is spinal tap")\n\n\nEOF'))
-    end)
-
-    it('empty output', function()
-      eq('', nvim('source_output', 'echo'))
+         nvim('exec', 'lua <<EOF\n\n\nprint("this is spinal tap")\n\n\nEOF', true))
+      eq('', nvim('exec', 'echo', true))
+      eq('foo 42', nvim('exec', 'echo "foo" 42', true))
     end)
   end)
 
   describe('nvim_command', function()
     it('works', function()
-      local fname = helpers.tmpname()
+      local fname = tmpname()
       nvim('command', 'new')
       nvim('command', 'edit '..fname)
       nvim('command', 'normal itesting\napi')
-- 
cgit