Skip to content

Commit d4bb2ab

Browse files
committed
fix(table): regression in contains
Other changes are just whitespace.
1 parent 4596e43 commit d4bb2ab

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

imports/table/shared.lua

+19-19
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,23 @@ local pairs = pairs
99
---@return boolean
1010
---Checks if tbl contains the given values. Only intended for simple values and unnested tables.
1111
local function contains(tbl, value)
12-
if not next(tbl) then return false end
13-
1412
if type(value) ~= 'table' then
1513
for _, v in pairs(tbl) do
16-
if v == value then
17-
return true
14+
if v == value then
15+
return true
1816
end
1917
end
20-
18+
2119
return false
2220
else
2321
local set = {}
22+
2423
for _, v in pairs(tbl) do
2524
set[v] = true
2625
end
2726

2827
for _, v in pairs(value) do
29-
if not set[v] then
28+
if not set[v] then
3029
return false
3130
end
3231
end
@@ -40,11 +39,12 @@ end
4039
---@return boolean
4140
---Compares if two values are equal, iterating over tables and matching both keys and values.
4241
local function table_matches(t1, t2)
43-
local tabletype1 = table.type(t1)
42+
local tabletype1 = table.type(t1)
4443

4544
if not tabletype1 then return t1 == t2 end
46-
if tabletype1 ~= table.type(t2) or (tabletype1 == 'array' and #t1 ~= #t2) then
47-
return false
45+
46+
if tabletype1 ~= table.type(t2) or (tabletype1 == 'array' and #t1 ~= #t2) then
47+
return false
4848
end
4949

5050
for k, v1 in pairs(t1) do
@@ -68,15 +68,15 @@ end
6868
---@return T
6969
---Recursively clones a table to ensure no table references.
7070
local function table_deepclone(tbl)
71-
tbl = table.clone(tbl)
71+
tbl = table.clone(tbl)
7272

73-
for k, v in pairs(tbl) do
74-
if type(v) == 'table' then
75-
tbl[k] = table_deepclone(v)
76-
end
77-
end
73+
for k, v in pairs(tbl) do
74+
if type(v) == 'table' then
75+
tbl[k] = table_deepclone(v)
76+
end
77+
end
7878

79-
return tbl
79+
return tbl
8080
end
8181

8282
---@param t1 table
@@ -91,12 +91,12 @@ local function table_merge(t1, t2, addDuplicateNumbers)
9191
local type1 = type(v1)
9292
local type2 = type(v2)
9393

94-
if type1 == 'table' and type2 == 'table' then
94+
if type1 == 'table' and type2 == 'table' then
9595
table_merge(v1, v2, addDuplicateNumbers)
9696
elseif addDuplicateNumbers and (type1 == 'number' and type2 == 'number') then
9797
t1[k] = v1 + v2
98-
else
99-
t1[k] = v2
98+
else
99+
t1[k] = v2
100100
end
101101
end
102102

0 commit comments

Comments
 (0)