IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

screen.lua: always print keyword-args snapshot

Browse Source
This commit is contained in:
Justin M. Keyes 2019-07-20 14:19:57 +02:00
parent 6b45e12d67
commit d19d9e4d9e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/functional/ui/screen.lua
View File

@ -1251,12 +1251,9 @@ function Screen:get_snapshot(attrs, ignore)
local lines = self:render(true, attr_state, true) local lines = self:render(true, attr_state, true)
local ext_state = self:_extstate_repr(attr_state) local ext_state = self:_extstate_repr(attr_state)
local keys = false
for k, v in pairs(ext_state) do for k, v in pairs(ext_state) do
if isempty(v) then if isempty(v) then
ext_state[k] = nil -- deleting keys while iterating is ok ext_state[k] = nil -- deleting keys while iterating is ok
else
keys = true
end end
end end
@ -1275,11 +1272,11 @@ function Screen:get_snapshot(attrs, ignore)
end end
end end
return kwargs, ext_state, attr_state, keys return kwargs, ext_state, attr_state
end end
function Screen:print_snapshot(attrs, ignore) function Screen:print_snapshot(attrs, ignore)
local kwargs, ext_state, attr_state, keys = self:get_snapshot(attrs, ignore) local kwargs, ext_state, attr_state = self:get_snapshot(attrs, ignore)
local attrstr = "" local attrstr = ""
if attr_state.modified then if attr_state.modified then
local attrstrs = {} local attrstrs = {}
@ -1293,10 +1290,9 @@ function Screen:print_snapshot(attrs, ignore)
local keyval = (type(i) == "number") and "["..tostring(i).."]" or i local keyval = (type(i) == "number") and "["..tostring(i).."]" or i
table.insert(attrstrs, " "..keyval.." = "..dict..",") table.insert(attrstrs, " "..keyval.." = "..dict..",")
end end
attrstr = (", "..(keys and "attr_ids=" or "") attrstr = (", attr_ids={\n"..table.concat(attrstrs, "\n").."\n}")
.."{\n"..table.concat(attrstrs, "\n").."\n}")
end end
print( "\nscreen:expect"..(keys and "{grid=" or "(").."[[") print( "\nscreen:expect{grid=[[")
print(kwargs.grid) print(kwargs.grid)
io.stdout:write( "]]"..attrstr) io.stdout:write( "]]"..attrstr)
for _, k in ipairs(ext_keys) do for _, k in ipairs(ext_keys) do
@ -1305,7 +1301,7 @@ function Screen:print_snapshot(attrs, ignore)
io.stdout:write(", "..k.."="..inspect(ext_state[k],{process=remove_all_metatables})) io.stdout:write(", "..k.."="..inspect(ext_state[k],{process=remove_all_metatables}))
end end
end end
print((keys and "}" or ")").."\n") print("}\n")
io.stdout:flush() io.stdout:flush()
end end