walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Merge pull request #1021 from Guldoman/PR_lax_common_merge 

Make `common.merge` work with invalid arguments
This commit is contained in:
Jefferson González 2022-06-07 20:05:22 -04:00 committed by GitHub
parent 61015dd382 0b96be7af2
commit 92c6f1c04f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/core/common.lua
View File

@ -18,9 +18,16 @@ end
function common.merge(a, b) function common.merge(a, b)
a = type(a) == "table" and a or {}
local t = {} local t = {}
for k, v in pairs(a) do t[k] = v end for k, v in pairs(a) do
if b then for k, v in pairs(b) do t[k] = v end end t[k] = v
end
if b and type(b) == "table" then
for k, v in pairs(b) do
t[k] = v
end
end
return t return t
end end