aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/lua/vim.lua
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2020-12-10 12:15:40 +0100
committerGitHub <noreply@github.com>2020-12-10 12:15:40 +0100
commit52e660e8570346d28f5c7f5dde0a5ca9b614a801 (patch)
treee8c812008bf726eeff5519193a633211fd97853f /src/nvim/lua/vim.lua
parent99007bcc1254717bb7d3803bf4b892a6153bd091 (diff)
parent3421485253eca065eb9b0a3031228313c278f435 (diff)
downloadrneovim-52e660e8570346d28f5c7f5dde0a5ca9b614a801.tar.gz
rneovim-52e660e8570346d28f5c7f5dde0a5ca9b614a801.tar.bz2
rneovim-52e660e8570346d28f5c7f5dde0a5ca9b614a801.zip
Merge pull request #13482 from dm1try/propagate_lua_file_loading_errors
runtime: propagate lua parsing errors while using "require"
Diffstat (limited to 'src/nvim/lua/vim.lua')
-rw-r--r--src/nvim/lua/vim.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua
index 2c7ab46ffe..b20fbbf038 100644
--- a/src/nvim/lua/vim.lua
+++ b/src/nvim/lua/vim.lua
@@ -115,7 +115,8 @@ function vim._load_package(name)
for _,path in ipairs(paths) do
local found = vim.api.nvim_get_runtime_file(path, false)
if #found > 0 then
- return loadfile(found[1])
+ local f, err = loadfile(found[1])
+ return f or error(err)
end
end
@@ -123,7 +124,8 @@ function vim._load_package(name)
local path = "lua/"..trail:gsub('?',basename)
local found = vim.api.nvim_get_runtime_file(path, false)
if #found > 0 then
- return package.loadlib(found[1])
+ local f, err = package.loadlib(found[1])
+ return f or error(err)
end
end
return nil