From dab40f43b18d35b283804ecb033310198cbf7548 Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Wed, 30 Oct 2019 20:53:09 +0100
Subject: Add v:lua.func() vimL syntax for calling lua

Also simplify error messages when calling lua from vimL.
---
 test/functional/lua/overrides_spec.lua | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'test/functional/lua/overrides_spec.lua')

diff --git a/test/functional/lua/overrides_spec.lua b/test/functional/lua/overrides_spec.lua
index f6439001ac..8c260632d9 100644
--- a/test/functional/lua/overrides_spec.lua
+++ b/test/functional/lua/overrides_spec.lua
@@ -54,11 +54,12 @@ describe('print', function()
       v_tblout = setmetatable({}, meta_tblout)
     ]])
     eq('', redir_exec('luafile ' .. fname))
-    eq('\nE5105: Error while calling lua chunk: E5114: Error while converting print argument #2: [NULL]',
+    -- TODO(bfredl): these look weird, print() should not use "E5114:" style errors..
+    eq('\nE5108: Error executing lua E5114: Error while converting print argument #2: [NULL]',
        redir_exec('lua print("foo", v_nilerr, "bar")'))
-    eq('\nE5105: Error while calling lua chunk: E5114: Error while converting print argument #2: Xtest-functional-lua-overrides-luafile:2: abc',
+    eq('\nE5108: Error executing lua E5114: Error while converting print argument #2: Xtest-functional-lua-overrides-luafile:2: abc',
        redir_exec('lua print("foo", v_abcerr, "bar")'))
-    eq('\nE5105: Error while calling lua chunk: E5114: Error while converting print argument #2: <Unknown error: lua_tolstring returned NULL for tostring result>',
+    eq('\nE5108: Error executing lua E5114: Error while converting print argument #2: <Unknown error: lua_tolstring returned NULL for tostring result>',
        redir_exec('lua print("foo", v_tblout, "bar")'))
   end)
   it('prints strings with NULs and NLs correctly', function()
@@ -156,7 +157,8 @@ describe('debug.debug', function()
       lua_debug> ^                                          |
     ]])
     feed('<C-c>')
-    screen:expect([[
+    screen:expect{grid=[[
+      {0:~                                                    }|
       {0:~                                                    }|
       {0:~                                                    }|
       {0:~                                                    }|
@@ -167,11 +169,10 @@ describe('debug.debug', function()
       lua_debug> print("TEST")                             |
       TEST                                                 |
                                                            |
-      {E:E5105: Error while calling lua chunk: [string "<VimL }|
-      {E:compiled string>"]:5: attempt to perform arithmetic o}|
-      {E:n local 'a' (a nil value)}                            |
+      {E:E5108: Error executing lua [string ":lua"]:5: attempt}|
+      {E: to perform arithmetic on local 'a' (a nil value)}    |
       Interrupt: {cr:Press ENTER or type command to continue}^   |
-    ]])
+    ]]}
     feed('<C-l>:lua Test()\n')
     screen:expect([[
       {0:~                                                    }|
@@ -190,7 +191,8 @@ describe('debug.debug', function()
       lua_debug> ^                                          |
     ]])
     feed('\n')
-    screen:expect([[
+    screen:expect{grid=[[
+      {0:~                                                    }|
       {0:~                                                    }|
       {0:~                                                    }|
       {0:~                                                    }|
@@ -201,11 +203,10 @@ describe('debug.debug', function()
       {0:~                                                    }|
       nil                                                  |
       lua_debug>                                           |
-      {E:E5105: Error while calling lua chunk: [string "<VimL }|
-      {E:compiled string>"]:5: attempt to perform arithmetic o}|
-      {E:n local 'a' (a nil value)}                            |
+      {E:E5108: Error executing lua [string ":lua"]:5: attempt}|
+      {E: to perform arithmetic on local 'a' (a nil value)}    |
       {cr:Press ENTER or type command to continue}^              |
-    ]])
+    ]]}
   end)
 
   it("can be safely exited with 'cont'", function()
-- 
cgit