feat(utils): re-add merge & cleanup merge_inplace usage;

AlexvZyl · Jun 16, 2024 · 8c8fff4 · 8c8fff4
1 parent 4f5b445
commit 8c8fff4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/lua/nordic/groups/init.lua b/lua/nordic/groups/init.lua
@@ -5,7 +5,10 @@ local M = {}
 function M.get_groups()
     local native = require('nordic.groups.native').get_groups()
     local integrations = require('nordic.groups.integrations').get_groups()
-    local groups = merge_inplace(native, integrations)
+
+    local groups = {}
+    merge_inplace(groups, native)
+    merge_inplace(groups, integrations)
 
     -- Apply on_highlight
     local palette = require('nordic.colors')

diff --git a/lua/nordic/tests/utils.lua b/lua/nordic/tests/utils.lua
@@ -20,10 +20,6 @@ local t2 = {b = 2}
 U.merge_inplace(t1, t2)
 assert_eq(t1, {a = 1, b = 2}, 'U.merge_inplace(t1, t2) basic merge')
 
-local t1 = {a = 1}
-local t2 = {b = 2}
-assert_eq(U.merge_inplace(t1, t2) == t1, true, 'U.merge_inplace(t1, t2) should return t1')
-
 local t1 = {a = 1, b = 3}
 local t2 = {b = 2, c = 4}
 U.merge_inplace(t1, t2)
@@ -46,6 +42,16 @@ local t2 = {d = nested, e = 5}
 U.merge_inplace(t1, t2)
 assert_eq(t1['d'] ~= nested, true, 'U.merge_inplace(t1, t2) copy t2 nested values')
 
+-- merge
+assert_eq(U.merge({}, {}), {}, 'U.merge({}, {}) should return an empty table')
+
+assert_eq(U.merge(nil, nil), {}, 'U.merge(nil, nil) should return an empty table')
+
+assert_eq(U.merge(nil, {a = 1}), {a = 1}, 'U.merge(nil, {a = 1}) should return {a = 1}')
+assert_eq(U.merge({a = 1}, nil), {a = 1}, 'U.merge({a = 1}, nil) should return {a = 1}')
+
+assert_eq(U.merge({a = 1, b = 3}, {b = 2, c = 4}), {a = 1, b = 2, c = 4}, 'U.merge({a = 1, b = 3}, {b = 2, c = 4}) should return {a = 1, b = 2, c = 4}')
+
 -- hex_to_rgb
 assert_eq({ U.hex_to_rgb('#191D24') }, {25, 29, 36}, 'U.hex_to_rgb("#191D24") should return 25, 29, 36')
 

diff --git a/lua/nordic/utils.lua b/lua/nordic/utils.lua
@@ -23,6 +23,15 @@ function M.is_table(value)
     return type(value) == 'table'
 end
 
+function M.merge(t1, t2)
+    if not t1 then
+        return t2 or {}
+    elseif not t2 then
+        return t1
+    end
+    return vim.tbl_deep_extend('force', t1, t2)
+end
+
 function M.merge_inplace(t1, t2)
     -- clone values
     for k, v in pairs(t1) do
@@ -41,8 +50,6 @@ function M.merge_inplace(t1, t2)
             t1[k] = v
         end
     end
-
-    return t1
 end
 
 function M.hex_to_rgb(str)