fix: handle nil values in nested config #81

Allaman · May 4, 2024 · 63016fb · 63016fb
1 parent e0c4019
commit 63016fb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/lua/core/plugins/themes/catppuccin.lua b/lua/core/plugins/themes/catppuccin.lua
@@ -1,4 +1,8 @@
 local catppuccin = require("catppuccin")
+local utils = require("utils.functions")
+
+local harpoon_enabled = utils.safe_nested_config(vim.g.config.plugins, "harpoon", "enabled")
+local trouble_enabled = utils.safe_nested_config(vim.g.config.plugins, "trouble", "enabled")
 
 catppuccin.setup({
   default_integrations = false,
@@ -10,10 +14,10 @@ catppuccin.setup({
     dropbar = { enabled = true },
     fidget = false,
     gitsigns = true,
-    harpoon = (vim.g.config.plugins.harpoon.enabled or false),
+    harpoon = harpoon_enabled,
     headlines = true,
     indent_blankline = { enabled = true },
-    lsp_trouble = (vim.g.config.plugins.harpoon.trouble or false),
+    lsp_trouble = trouble_enabled,
     markdown = true,
     mason = true,
     mini = true,

diff --git a/lua/utils/functions.lua b/lua/utils/functions.lua
@@ -236,4 +236,20 @@ M.startLSP = function(lsp_name)
   require("lspconfig")[lsp_name].setup({})
 end
 
+---check if nested config is not nil
+---@param config any
+---@param ... string
+---@return any
+M.safe_nested_config = function(config, ...)
+  local elements = { ... }
+  local node = config
+  for i = 1, #elements do
+    node = node[elements[i]]
+    if node == nil then
+      return nil
+    end
+  end
+  return node
+end
+
 return M