Skip to content
This repository was archived by the owner on Apr 29, 2025. It is now read-only.

fix(table): Respect falsy value for addDuplicateNumbers #672

Merged
merged 3 commits into from
Jan 16, 2025
Merged

fix(table): Respect falsy value for addDuplicateNumbers #672

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0e6181
fix(table): Respect falsy value for addDuplicateNumbers
tom-osborne Nov 18, 2024
1b34c14
Merge branch 'overextended:master' into master
tom-osborne Jan 16, 2025
7598407
refactor: Simplify conditional
tom-osborne Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion imports/table/shared.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ end
---@return table
---Merges two tables together. Defaults to adding duplicate keys together if they are numbers, otherwise they are overriden.
local function table_merge(t1, t2, addDuplicateNumbers)
addDuplicateNumbers = addDuplicateNumbers ~= nil and addDuplicateNumbers or true
addDuplicateNumbers = addDuplicateNumbers == nil and true or addDuplicateNumbers
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

addDuplicateNumbers = addDuplicateNumbers == nil or addDuplicateNumbers

Copy link
Contributor Author

@tom-osborne tom-osborne Jan 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thelindat Changes made as requested. Thanks

for k, v2 in pairs(t2) do
local v1 = t1[k]
local type1 = type(v1)
Expand Down