diff --git a/lua/cmp/utils/misc.lua b/lua/cmp/utils/misc.lua index 90d07cf..8ce41d4 100644 --- a/lua/cmp/utils/misc.lua +++ b/lua/cmp/utils/misc.lua @@ -46,7 +46,7 @@ misc.merge = function(v1, v2) new_tbl[k] = misc.merge(v1[k], v) end for k, v in pairs(v1) do - if v2[k] == nil then + if v2[k] == nil and v ~= misc.none then new_tbl[k] = v end end @@ -56,7 +56,11 @@ misc.merge = function(v1, v2) return nil end if v1 == nil then - return v2 + if v2 == misc.none then + return nil + else + return v2 + end end if v1 == true then if merge2 then diff --git a/lua/cmp/utils/misc_spec.lua b/lua/cmp/utils/misc_spec.lua index d7cec0b..4e705ef 100644 --- a/lua/cmp/utils/misc_spec.lua +++ b/lua/cmp/utils/misc_spec.lua @@ -33,5 +33,19 @@ describe('misc', function() }, }) assert.are.equal(merged.a, nil) + + merged = misc.merge({ + a = misc.none, + }, { + a = nil, + }) + assert.are.equal(merged.a, nil) + + merged = misc.merge({ + a = nil, + }, { + a = misc.none, + }) + assert.are.equal(merged.a, nil) end) end)