mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-21 09:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/vim.validate(): assert normalized stacktrace

Browse Source 
- The previous commit lost information in the tests. Instead, add some
  more "normalization" substitutions in pcall_err(), so that the general
  shape of the stacktrace is included in the asserted text.
- Eliminate contains(), it is redundant with matches()
This commit is contained in:
Justin M. Keyes
2020-09-12 19:04:22 -07:00
committed by TJ DeVries
parent aad7a74053
commit 8e77d70e29
9 changed files with 190 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/lua/vim/shared.lua
View File

@@ -514,20 +514,20 @@ do
local optional = (true == spec[3])
if type(t) == 'string' then
local translated_type_name = type_names[t]
if not translated_type_name then
local t_name = type_names[t]
if not t_name then
return false, string.format('invalid type name: %s', t)
end
if (not optional or val ~= nil) and not _is_type(val, translated_type_name) then
return false, string.format("%s: expected %s, got %s", param_name, translated_type_name, type(val))
if (not optional or val ~= nil) and not _is_type(val, t_name) then
return false, string.format("%s: expected %s, got %s", param_name, t_name, type(val))
end
elseif vim.is_callable(t) then
-- Check user-provided validation function.
local valid, optional_message = t(val)
if not valid then
local error_message = string.format("%s: expected %s, got %s", param_name, (spec[3] or '?'), val)
if not (optional_message == nil) then
if optional_message ~= nil then
error_message = error_message .. string.format(". Info: %s", optional_message)
end