Add v:lua.func() vimL syntax for calling lua

Also simplify error messages when calling lua from vimL.

1 files changed, 68 insertions, 69 deletions

diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 8ad3aff21f..40ea030f73 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -747,7 +747,7 @@ describe('ui/ext_messages', function()
       {1:~                        }|
       {1:~                        }|
     ]], messages={{
-        content = {{'E5105: Error while calling lua chunk: [string "<VimL compiled string>"]:1: such\nmultiline\nerror', 2}},
+        content = {{'E5108: Error executing lua [string ":lua"]:1: such\nmultiline\nerror', 2}},
         kind = "lua_error"
      }}}
   end)
@@ -1146,97 +1146,96 @@ aliquip ex ea commodo consequat.]])
   it('handles wrapped lines with line scroll', function()
     feed(':lua error(_G.x)<cr>')
     screen:expect{grid=[[
-      {2:E5105: Error while calling lua chun}|
-      {2:k: [string "<VimL compiled string>"}|
-      {2:]:1: Lorem ipsum dolor sit amet, co}|
-      {2:nsectetur}                          |
+      {2:E5108: Error executing lua [string }|
+      {2:":lua"]:1: Lorem ipsum dolor sit am}|
+      {2:et, consectetur}                    |
       {2:adipisicing elit, sed do eiusmod te}|
       {2:mpor}                               |
       {2:incididunt ut labore et dolore magn}|
+      {2:a aliqua.}                          |
       {4:-- More --}^                         |
     ]]}
 
     feed('j')
     screen:expect{grid=[[
-      {2:k: [string "<VimL compiled string>"}|
-      {2:]:1: Lorem ipsum dolor sit amet, co}|
-      {2:nsectetur}                          |
+      {2:":lua"]:1: Lorem ipsum dolor sit am}|
+      {2:et, consectetur}                    |
       {2:adipisicing elit, sed do eiusmod te}|
       {2:mpor}                               |
       {2:incididunt ut labore et dolore magn}|
       {2:a aliqua.}                          |
+      {2:Ut enim ad minim veniam, quis nostr}|
       {4:-- More --}^                         |
     ]]}
 
     feed('k')
     screen:expect{grid=[[
-      {2:E5105: Error while calling lua chun}|
-      {2:k: [string "<VimL compiled string>"}|
-      {2:]:1: Lorem ipsum dolor sit amet, co}|
-      {2:nsectetur}                          |
+      {2:E5108: Error executing lua [string }|
+      {2:":lua"]:1: Lorem ipsum dolor sit am}|
+      {2:et, consectetur}                    |
       {2:adipisicing elit, sed do eiusmod te}|
       {2:mpor}                               |
       {2:incididunt ut labore et dolore magn}|
+      {2:a aliqua.}                          |
       {4:-- More --}^                         |
     ]]}
 
     feed('j')
     screen:expect{grid=[[
-      {2:k: [string "<VimL compiled string>"}|
-      {2:]:1: Lorem ipsum dolor sit amet, co}|
-      {2:nsectetur}                          |
+      {2:":lua"]:1: Lorem ipsum dolor sit am}|
+      {2:et, consectetur}                    |
       {2:adipisicing elit, sed do eiusmod te}|
       {2:mpor}                               |
       {2:incididunt ut labore et dolore magn}|
       {2:a aliqua.}                          |
+      {2:Ut enim ad minim veniam, quis nostr}|
       {4:-- More --}^                         |
     ]]}
-
   end)
 
   it('handles wrapped lines with page scroll', function()
     feed(':lua error(_G.x)<cr>')
     screen:expect{grid=[[
-      {2:E5105: Error while calling lua chun}|
-      {2:k: [string "<VimL compiled string>"}|
-      {2:]:1: Lorem ipsum dolor sit amet, co}|
-      {2:nsectetur}                          |
+      {2:E5108: Error executing lua [string }|
+      {2:":lua"]:1: Lorem ipsum dolor sit am}|
+      {2:et, consectetur}                    |
       {2:adipisicing elit, sed do eiusmod te}|
       {2:mpor}                               |
       {2:incididunt ut labore et dolore magn}|
+      {2:a aliqua.}                          |
       {4:-- More --}^                         |
     ]]}
     feed('d')
     screen:expect{grid=[[
-      {2:adipisicing elit, sed do eiusmod te}|
-      {2:mpor}                               |
       {2:incididunt ut labore et dolore magn}|
       {2:a aliqua.}                          |
       {2:Ut enim ad minim veniam, quis nostr}|
       {2:ud xercitation}                     |
       {2:ullamco laboris nisi ut}            |
-      {4:-- More --}^                         |
+      {2:aliquip ex ea commodo consequat.}   |
+      {4:Press ENTER or type command to cont}|
+      {4:inue}^                               |
     ]]}
     feed('u')
     screen:expect{grid=[[
-      {2:E5105: Error while calling lua chun}|
-      {2:k: [string "<VimL compiled string>"}|
-      {2:]:1: Lorem ipsum dolor sit amet, co}|
-      {2:nsectetur}                          |
+      {2:E5108: Error executing lua [string }|
+      {2:":lua"]:1: Lorem ipsum dolor sit am}|
+      {2:et, consectetur}                    |
       {2:adipisicing elit, sed do eiusmod te}|
       {2:mpor}                               |
       {2:incididunt ut labore et dolore magn}|
+      {2:a aliqua.}                          |
       {4:-- More --}^                         |
     ]]}
     feed('d')
     screen:expect{grid=[[
-      {2:adipisicing elit, sed do eiusmod te}|
       {2:mpor}                               |
       {2:incididunt ut labore et dolore magn}|
       {2:a aliqua.}                          |
       {2:Ut enim ad minim veniam, quis nostr}|
       {2:ud xercitation}                     |
       {2:ullamco laboris nisi ut}            |
+      {2:aliquip ex ea commodo consequat.}   |
       {4:-- More --}^                         |
     ]]}
   end)
@@ -1246,49 +1245,49 @@ aliquip ex ea commodo consequat.]])
 
     feed(':lua error(_G.x)<cr>')
     screen:expect{grid=[[
-      {3:E5105: Error while calling lua chun}|
-      {3:k: [string "<VimL compiled string>"}|
-      {3:]:1: Lorem ipsum dolor sit amet, co}|
-      {3:nsectetur}{5:                          }|
+      {3:E5108: Error executing lua [string }|
+      {3:":lua"]:1: Lorem ipsum dolor sit am}|
+      {3:et, consectetur}{5:                    }|
       {3:adipisicing elit, sed do eiusmod te}|
       {3:mpor}{5:                               }|
       {3:incididunt ut labore et dolore magn}|
+      {3:a aliqua.}{5:                          }|
       {6:-- More --}{5:^                         }|
     ]]}
 
     feed('j')
     screen:expect{grid=[[
-      {3:k: [string "<VimL compiled string>"}|
-      {3:]:1: Lorem ipsum dolor sit amet, co}|
-      {3:nsectetur}{5:                          }|
+      {3:":lua"]:1: Lorem ipsum dolor sit am}|
+      {3:et, consectetur}{5:                    }|
       {3:adipisicing elit, sed do eiusmod te}|
       {3:mpor}{5:                               }|
       {3:incididunt ut labore et dolore magn}|
       {3:a aliqua.}{5:                          }|
+      {3:Ut enim ad minim veniam, quis nostr}|
       {6:-- More --}{5:^                         }|
     ]]}
 
     feed('k')
     screen:expect{grid=[[
-      {3:E5105: Error while calling lua chun}|
-      {3:k: [string "<VimL compiled string>"}|
-      {3:]:1: Lorem ipsum dolor sit amet, co}|
-      {3:nsectetur}{5:                          }|
+      {3:E5108: Error executing lua [string }|
+      {3:":lua"]:1: Lorem ipsum dolor sit am}|
+      {3:et, consectetur}{5:                    }|
       {3:adipisicing elit, sed do eiusmod te}|
       {3:mpor}{5:                               }|
       {3:incididunt ut labore et dolore magn}|
+      {3:a aliqua.}{5:                          }|
       {6:-- More --}{5:^                         }|
     ]]}
 
     feed('j')
     screen:expect{grid=[[
-      {3:k: [string "<VimL compiled string>"}|
-      {3:]:1: Lorem ipsum dolor sit amet, co}|
-      {3:nsectetur}{5:                          }|
+      {3:":lua"]:1: Lorem ipsum dolor sit am}|
+      {3:et, consectetur}{5:                    }|
       {3:adipisicing elit, sed do eiusmod te}|
       {3:mpor}{5:                               }|
       {3:incididunt ut labore et dolore magn}|
       {3:a aliqua.}{5:                          }|
+      {3:Ut enim ad minim veniam, quis nostr}|
       {6:-- More --}{5:^                         }|
     ]]}
   end)
@@ -1297,46 +1296,46 @@ aliquip ex ea commodo consequat.]])
     command("hi MsgArea guisp=Yellow")
     feed(':lua error(_G.x)<cr>')
     screen:expect{grid=[[
-      {3:E5105: Error while calling lua chun}|
-      {3:k: [string "<VimL compiled string>"}|
-      {3:]:1: Lorem ipsum dolor sit amet, co}|
-      {3:nsectetur}{5:                          }|
+      {3:E5108: Error executing lua [string }|
+      {3:":lua"]:1: Lorem ipsum dolor sit am}|
+      {3:et, consectetur}{5:                    }|
       {3:adipisicing elit, sed do eiusmod te}|
       {3:mpor}{5:                               }|
       {3:incididunt ut labore et dolore magn}|
+      {3:a aliqua.}{5:                          }|
       {6:-- More --}{5:^                         }|
     ]]}
     feed('d')
     screen:expect{grid=[[
-      {3:adipisicing elit, sed do eiusmod te}|
-      {3:mpor}{5:                               }|
       {3:incididunt ut labore et dolore magn}|
       {3:a aliqua.}{5:                          }|
       {3:Ut enim ad minim veniam, quis nostr}|
       {3:ud xercitation}{5:                     }|
       {3:ullamco laboris nisi ut}{5:            }|
-      {6:-- More --}{5:^                         }|
+      {3:aliquip ex ea commodo consequat.}{5:   }|
+      {6:Press ENTER or type command to cont}|
+      {6:inue}{5:^                               }|
     ]]}
     feed('u')
     screen:expect{grid=[[
-      {3:E5105: Error while calling lua chun}|
-      {3:k: [string "<VimL compiled string>"}|
-      {3:]:1: Lorem ipsum dolor sit amet, co}|
-      {3:nsectetur}{5:                          }|
+      {3:E5108: Error executing lua [string }|
+      {3:":lua"]:1: Lorem ipsum dolor sit am}|
+      {3:et, consectetur}{5:                    }|
       {3:adipisicing elit, sed do eiusmod te}|
       {3:mpor}{5:                               }|
       {3:incididunt ut labore et dolore magn}|
+      {3:a aliqua.}{5:                          }|
       {6:-- More --}{5:^                         }|
     ]]}
     feed('d')
     screen:expect{grid=[[
-      {3:adipisicing elit, sed do eiusmod te}|
       {3:mpor}{5:                               }|
       {3:incididunt ut labore et dolore magn}|
       {3:a aliqua.}{5:                          }|
       {3:Ut enim ad minim veniam, quis nostr}|
       {3:ud xercitation}{5:                     }|
       {3:ullamco laboris nisi ut}{5:            }|
+      {3:aliquip ex ea commodo consequat.}{5:   }|
       {6:-- More --}{5:^                         }|
     ]]}
   end)
@@ -1473,23 +1472,23 @@ aliquip ex ea commodo consequat.]])
   it('can be resized', function()
     feed(':lua error(_G.x)<cr>')
     screen:expect{grid=[[
-      {2:E5105: Error while calling lua chun}|
-      {2:k: [string "<VimL compiled string>"}|
-      {2:]:1: Lorem ipsum dolor sit amet, co}|
-      {2:nsectetur}                          |
+      {2:E5108: Error executing lua [string }|
+      {2:":lua"]:1: Lorem ipsum dolor sit am}|
+      {2:et, consectetur}                    |
       {2:adipisicing elit, sed do eiusmod te}|
       {2:mpor}                               |
       {2:incididunt ut labore et dolore magn}|
+      {2:a aliqua.}                          |
       {4:-- More --}^                         |
     ]]}
 
     -- responds to resize, but text is not reflown
     screen:try_resize(45, 5)
     screen:expect{grid=[[
-      {2:nsectetur}                                    |
       {2:adipisicing elit, sed do eiusmod te}          |
       {2:mpor}                                         |
       {2:incididunt ut labore et dolore magn}          |
+      {2:a aliqua.}                                    |
       {4:-- More --}^                                   |
     ]]}
 
@@ -1497,14 +1496,14 @@ aliquip ex ea commodo consequat.]])
     -- text is not reflown; existing lines get cut
     screen:try_resize(30, 12)
     screen:expect{grid=[[
-      {2:E5105: Error while calling lua}|
-      {2:k: [string "<VimL compiled str}|
-      {2:]:1: Lorem ipsum dolor sit ame}|
-      {2:nsectetur}                     |
+      {2:E5108: Error executing lua [st}|
+      {2:":lua"]:1: Lorem ipsum dolor s}|
+      {2:et, consectetur}               |
       {2:adipisicing elit, sed do eiusm}|
       {2:mpore}                         |
       {2:incididunt ut labore et dolore}|
-      {2: magn}                         |
+      {2:a aliqua.}                     |
+                                    |
                                     |
                                     |
                                     |
@@ -1515,18 +1514,18 @@ aliquip ex ea commodo consequat.]])
     -- wrapped at the new screen size.
     feed('<cr>')
     screen:expect{grid=[[
-      {2:k: [string "<VimL compiled str}|
-      {2:]:1: Lorem ipsum dolor sit ame}|
-      {2:nsectetur}                     |
+      {2:et, consectetur}               |
       {2:adipisicing elit, sed do eiusm}|
       {2:mpore}                         |
       {2:incididunt ut labore et dolore}|
-      {2: magna aliqua.}                |
+      {2:a aliqua.}                     |
       {2:Ut enim ad minim veniam, quis }|
       {2:nostrud xercitation}           |
       {2:ullamco laboris nisi ut}       |
       {2:aliquip ex ea commodo consequa}|
-      {4:-- More --}^                    |
+      {2:t.}                            |
+      {4:Press ENTER or type command to}|
+      {4: continue}^                     |
     ]]}
 
     feed('q')