Merge remote-tracking branch 'upstream/master' into rahm

6 files changed, 63 insertions, 139 deletions

diff --git a/test/functional/provider/clipboard_spec.lua b/test/functional/provider/clipboard_spec.lua
index 986db96a18..5bdfec574e 100644
--- a/test/functional/provider/clipboard_spec.lua
+++ b/test/functional/provider/clipboard_spec.lua
@@ -50,29 +50,33 @@ local function basic_register_test(noblock)
     text, stuff and some more
     some some text, stuff and some more]])
 
-  -- deleting a word to named ("a) updates "1 (and not "-)
+  -- deleting a word to named ("a) doesn't update "1 or "-
   feed('gg"adwj"1P^"-P')
   expect([[
     , stuff and some more
-    some textsome some text, stuff and some more]])
+    some some random text
+    some some text, stuff and some more]])
 
   -- deleting a line does update ""
   feed('ggdd""P')
   expect([[
     , stuff and some more
-    some textsome some text, stuff and some more]])
+    some some random text
+    some some text, stuff and some more]])
 
   feed('ggw<c-v>jwyggP')
   if noblock then
     expect([[
       stuf
-      me t
+      me s
       , stuff and some more
-      some textsome some text, stuff and some more]])
+      some some random text
+      some some text, stuff and some more]])
   else
     expect([[
       stuf, stuff and some more
-      me tsome textsome some text, stuff and some more]])
+      me ssome some random text
+      some some text, stuff and some more]])
   end
 
   -- pasting in visual does unnamed delete of visual selection
diff --git a/test/functional/provider/nodejs_spec.lua b/test/functional/provider/nodejs_spec.lua
index 661a6f4f94..187f1c0412 100644
--- a/test/functional/provider/nodejs_spec.lua
+++ b/test/functional/provider/nodejs_spec.lua
@@ -29,7 +29,7 @@ describe('nodejs host', function()
     local fname = 'Xtest-nodejs-hello.js'
     write_file(fname, [[
       const neovim = require('neovim');
-      const nvim = neovim.attach({socket: process.env.NVIM_LISTEN_ADDRESS});
+      const nvim = neovim.attach({socket: process.env.NVIM});
       nvim.command('let g:job_out = "hello"');
     ]])
     command('let g:job_id = jobstart(["node", "'..fname..'"])')
@@ -39,7 +39,7 @@ describe('nodejs host', function()
     local fname = 'Xtest-nodejs-hello-plugin.js'
     write_file(fname, [[
       const neovim = require('neovim');
-      const nvim = neovim.attach({socket: process.env.NVIM_LISTEN_ADDRESS});
+      const nvim = neovim.attach({socket: process.env.NVIM});
 
       class TestPlugin {
         hello() {
diff --git a/test/functional/provider/perl_spec.lua b/test/functional/provider/perl_spec.lua
index 125674660b..aff5e36e24 100644
--- a/test/functional/provider/perl_spec.lua
+++ b/test/functional/provider/perl_spec.lua
@@ -83,7 +83,7 @@ describe('perl provider', function()
       use Neovim::Ext;
       use Neovim::Ext::MsgPack::RPC;
 
-      my $session = Neovim::Ext::MsgPack::RPC::socket_session($ENV{NVIM_LISTEN_ADDRESS});
+      my $session = Neovim::Ext::MsgPack::RPC::socket_session($ENV{NVIM});
       my $nvim = Neovim::Ext::from_session($session);
       $nvim->command('let g:job_out = "hello"');
       1;
@@ -116,7 +116,7 @@ describe('perl provider', function()
       use Neovim::Ext;
       use Neovim::Ext::MsgPack::RPC;
 
-      my $session = Neovim::Ext::MsgPack::RPC::socket_session($ENV{NVIM_LISTEN_ADDRESS});
+      my $session = Neovim::Ext::MsgPack::RPC::socket_session($ENV{NVIM});
       my $nvim = Neovim::Ext::from_session($session);
       my $plugin = TestPlugin->new($nvim);
       $plugin->test_command();
diff --git a/test/functional/provider/provider_spec.lua b/test/functional/provider/provider_spec.lua
index 78bc4a4edb..3895b8613f 100644
--- a/test/functional/provider/provider_spec.lua
+++ b/test/functional/provider/provider_spec.lua
@@ -14,8 +14,8 @@ describe('providers', function()
     command('set loadplugins')
     -- Using test-fixture with broken impl:
     -- test/functional/fixtures/autoload/provider/python.vim
-    eq('Vim:provider: python: missing required variable g:loaded_python_provider',
-      pcall_err(eval, "has('python')"))
+    eq('Vim:provider: python3: missing required variable g:loaded_python3_provider',
+      pcall_err(eval, "has('python3')"))
   end)
 
   it('with g:loaded_xx_provider, missing #Call()', function()
diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua
index d100db8de2..d9c44c3315 100644
--- a/test/functional/provider/python3_spec.lua
+++ b/test/functional/provider/python3_spec.lua
@@ -8,6 +8,8 @@ local source = helpers.source
 local missing_provider = helpers.missing_provider
 local matches = helpers.matches
 local pcall_err = helpers.pcall_err
+local funcs = helpers.funcs
+local dedent = helpers.dedent
 
 do
   clear()
@@ -48,7 +50,12 @@ describe('python3 provider', function()
     local very_long_symbol = string.rep('a', 1200)
     feed_command(':silent! py3 print('..very_long_symbol..' b)')
     -- Error message will contain this (last) line.
-    eq('Error invoking \'python_execute\' on channel 3 (python3-script-host):\n  File "<string>", line 1\n    print('..very_long_symbol..' b)\n          '..string.rep(' ',1200)..' ^\nSyntaxError: invalid syntax', eval('v:errmsg'))
+    matches(string.format(dedent([[
+      ^Error invoking 'python_execute' on channel 3 %%(python3%%-script%%-host%%):
+        File "<string>", line 1
+          print%%(%s b%%)
+      %%C*
+      SyntaxError: invalid syntax%%C*$]]), very_long_symbol), eval('v:errmsg'))
   end)
 
   it('python3_execute with nested commands', function()
@@ -93,16 +100,40 @@ describe('python3 provider', function()
       ghi]])
   end)
 
-  it('py3eval', function()
-    eq({1, 2, {['key'] = 'val'}}, eval([[py3eval('[1, 2, {"key": "val"}]')]]))
+  describe('py3eval()', function()
+    it('works', function()
+      eq({1, 2, {['key'] = 'val'}}, funcs.py3eval('[1, 2, {"key": "val"}]'))
+    end)
+
+    it('errors out when given non-string', function()
+      eq('Vim:E474: Invalid argument', pcall_err(eval, 'py3eval(10)'))
+      eq('Vim:E474: Invalid argument', pcall_err(eval, 'py3eval(v:_null_dict)'))
+      eq('Vim:E474: Invalid argument', pcall_err(eval, 'py3eval(v:_null_list)'))
+      eq('Vim:E474: Invalid argument', pcall_err(eval, 'py3eval(0.0)'))
+      eq('Vim:E474: Invalid argument', pcall_err(eval, 'py3eval(function("tr"))'))
+      eq('Vim:E474: Invalid argument', pcall_err(eval, 'py3eval(v:true)'))
+      eq('Vim:E474: Invalid argument', pcall_err(eval, 'py3eval(v:false)'))
+      eq('Vim:E474: Invalid argument', pcall_err(eval, 'py3eval(v:null)'))
+    end)
+
+    it('accepts NULL string', function()
+      matches('.*SyntaxError.*', pcall_err(eval, 'py3eval($XXX_NONEXISTENT_VAR_XXX)'))
+    end)
   end)
 
   it('pyxeval #10758', function()
-    eq(0, eval([[&pyxversion]]))
+    eq(3, eval([[&pyxversion]]))
     eq(3, eval([[pyxeval('sys.version_info[:3][0]')]]))
     eq(3, eval([[&pyxversion]]))
   end)
 
+  it("setting 'pyxversion'", function()
+    command 'set pyxversion=3' -- no error
+    eq('Vim(set):E474: Invalid argument: pyxversion=2', pcall_err(command, 'set pyxversion=2'))
+    command 'set pyxversion=0' -- allowed, but equivalent to pyxversion=3
+    eq(3, eval'&pyxversion')
+  end)
+
   it('RPC call to expand("<afile>") during BufDelete #5245 #5617', function()
     helpers.add_builddir_to_rtp()
     source([=[
@@ -120,3 +151,15 @@ describe('python3 provider', function()
     assert_alive()
   end)
 end)
+
+describe('python2 feature test', function()
+  -- python2 is not supported, so correct behaviour is to return 0
+  it('works', function()
+    eq(0, funcs.has('python2'))
+    eq(0, funcs.has('python'))
+    eq(0, funcs.has('python_compiled'))
+    eq(0, funcs.has('python_dynamic'))
+    eq(0, funcs.has('python_dynamic_'))
+    eq(0, funcs.has('python_'))
+  end)
+end)
diff --git a/test/functional/provider/python_spec.lua b/test/functional/provider/python_spec.lua
deleted file mode 100644
index d60d8d1001..0000000000
--- a/test/functional/provider/python_spec.lua
+++ /dev/null
@@ -1,123 +0,0 @@
-local helpers = require('test.functional.helpers')(after_each)
-
-local eq = helpers.eq
-local neq = helpers.neq
-local feed = helpers.feed
-local clear = helpers.clear
-local funcs = helpers.funcs
-local meths = helpers.meths
-local insert = helpers.insert
-local expect = helpers.expect
-local command = helpers.command
-local exc_exec = helpers.exc_exec
-local write_file = helpers.write_file
-local curbufmeths = helpers.curbufmeths
-local missing_provider = helpers.missing_provider
-local matches = helpers.matches
-local pcall_err = helpers.pcall_err
-
-do
-  clear()
-  local reason = missing_provider('python')
-  if reason then
-    it(':python reports E319 if provider is missing', function()
-      local expected = [[Vim%(py.*%):E319: No "python" provider found.*]]
-      matches(expected, pcall_err(command, 'py print("foo")'))
-      matches(expected, pcall_err(command, 'pyfile foo'))
-    end)
-    pending(string.format('Python 2 (or the pynvim module) is broken/missing (%s)', reason), function() end)
-    return
-  end
-end
-
-before_each(function()
-  clear()
-  command('python import vim')
-end)
-
-describe('python feature test', function()
-  it('works', function()
-    eq(1, funcs.has('python'))
-    eq(1, funcs.has('python_compiled'))
-    eq(1, funcs.has('python_dynamic'))
-    eq(0, funcs.has('python_dynamic_'))
-    eq(0, funcs.has('python_'))
-  end)
-end)
-
-describe(':python command', function()
-  it('works with a line', function()
-    command('python vim.vars["set_by_python"] = [100, 0]')
-    eq({100, 0}, meths.get_var('set_by_python'))
-  end)
-
-  -- TODO(ZyX-I): works with << EOF
-  -- TODO(ZyX-I): works with execute 'python' line1."\n".line2."\n"…
-
-  it('supports nesting', function()
-    command([[python vim.command('python vim.command("python vim.command(\'let set_by_nested_python = 555\')")')]])
-    eq(555, meths.get_var('set_by_nested_python'))
-  end)
-
-  it('supports range', function()
-    insert([[
-      line1
-      line2
-      line3
-      line4]])
-    feed('ggjvj:python vim.vars["range"] = vim.current.range[:]<CR>')
-    eq({'line2', 'line3'}, meths.get_var('range'))
-  end)
-end)
-
-describe(':pyfile command', function()
-  it('works', function()
-    local fname = 'pyfile.py'
-    write_file(fname, 'vim.command("let set_by_pyfile = 123")')
-    command('pyfile pyfile.py')
-    eq(123, meths.get_var('set_by_pyfile'))
-    os.remove(fname)
-  end)
-end)
-
-describe(':pydo command', function()
-  it('works', function()
-    -- :pydo 42 returns None for all lines,
-    -- the buffer should not be changed
-    command('normal :pydo 42')
-    eq(false, curbufmeths.get_option('modified'))
-    -- insert some text
-    insert('abc\ndef\nghi')
-    expect([[
-      abc
-      def
-      ghi]])
-    -- go to top and select and replace the first two lines
-    feed('ggvj:pydo return str(linenr)<CR>')
-    expect([[
-      1
-      2
-      ghi]])
-  end)
-end)
-
-describe('pyeval()', function()
-  it('works', function()
-    eq({1, 2, {['key'] = 'val'}}, funcs.pyeval('[1, 2, {"key": "val"}]'))
-  end)
-
-  it('errors out when given non-string', function()
-    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(10)'))
-    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:_null_dict)'))
-    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:_null_list)'))
-    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(0.0)'))
-    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(function("tr"))'))
-    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:true)'))
-    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:false)'))
-    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:null)'))
-  end)
-
-  it('accepts NULL string', function()
-    neq(0, exc_exec('call pyeval($XXX_NONEXISTENT_VAR_XXX)'))
-  end)
-end)