fix: fzf_colors booleans (closes #1582)

Author: ibhagwan

lua/fzf-lua/config.lua

@@ -248,16 +248,29 @@ function M.normalize_opts(opts, globals, __resume_key)
   -- merge with provider defaults from globals (defaults + setup options)
   opts = vim.tbl_deep_extend("keep", opts, utils.tbl_deep_clone(globals))
 
-  -- Merge required tables from globals
+  -- Merge values from globals
   for _, k in ipairs({
     "winopts", "keymap", "fzf_opts", "fzf_colors", "fzf_tmux_opts", "hls"
   }) do
-    opts[k] = vim.tbl_deep_extend("keep",
+    local setup_val = M.globals[k]
+    if type(setup_val) == "table" then
       -- must clone or map will be saved as reference
       -- and then overwritten if found in 'backward_compat'
-      type(opts[k]) == "function" and opts[k]() or opts[k] or {},
-      type(M.globals[k]) == "function" and M.globals[k](opts) or
-      type(M.globals[k]) == "table" and utils.tbl_deep_clone(M.globals[k]) or {})
+      setup_val = utils.tbl_deep_clone(setup_val)
+    elseif type(setup_val) == "function" then
+      setup_val = setup_val(opts)
+    end
+    if opts[k] == nil then
+      opts[k] = setup_val
+    else
+      if type(opts[k]) == "function" then
+        opts[k] = opts[k](opts)
+      end
+      if type(opts[k]) == "table" then
+        opts[k] = vim.tbl_deep_extend("keep",
+          opts[k], type(setup_val) == "table" and setup_val or {})
+      end
+    end
   end
 
   -- backward compat: no-value flags should be set to `true`, in the past these

lua/fzf-lua/core.lua

@@ -534,7 +534,7 @@ M.create_fzf_colors = function(opts)
   --   fzf_colors = {
   --     ["fg"] = { "fg" , { "Comment", "Normal" } }
   --   }
-  colors = vim.tbl_extend("keep", colors or {},
+  colors = vim.tbl_extend("keep", type(colors) == "table" and colors or {},
     vim.tbl_map(function(v)
       -- Value isn't guaranteed a table, e.g:
       --   vim.g.fzf_colors = { ["gutter"] = "-1" }
@@ -709,7 +709,7 @@ M.build_fzf_cli = function(opts, fzf_win)
         table.insert(cli_args, v)
       end
     end
-  elseif opts._is_fzf_tmux == 2  and opts.__FZF_VERSION then
+  elseif opts._is_fzf_tmux == 2 and opts.__FZF_VERSION then
     -- "--height" specified after "--tmux" will take priority and cause
     -- the job to spawn in the background without a visible interface
     -- NOTE: this doesn't happen with skim and will cause issues if