fix(colors): fallback to default colors on wrong config (#72)

Author: cpea2506

colors/one_monokai.lua

@@ -1,3 +1 @@
-package.loaded["one_monokai.colors"] = nil
-
 require("one_monokai").setup()

lua/one_monokai/colors.lua

@@ -1,10 +1,8 @@
+---@class palette
 local colors = {}
 
-local config = require "one_monokai.config"
-local logs = require "one_monokai.logs"
-
----@class palette
-colors.default = {
+---@type palette
+local defaults = {
     fg = "#abb2bf",
     bg = "#282c34",
     gray = "#676e7b",
@@ -30,6 +28,8 @@ colors.default = {
     none = "NONE",
 }
 
+colors = vim.deepcopy(defaults)
+
 ---Convert hex value to rgb
 ---@param color string
 local function hex2rgb(color)
@@ -74,14 +74,16 @@ end
 ---@param value any #value of the color
 ---@return string? #hex string or `nil` if invalid
 local function get_hex_value(name, value)
+    local logs = require "one_monokai.logs"
+
     local type_ok, err = pcall(vim.validate, {
         ["colors(" .. name .. ")"] = { value, "string" },
     })
 
     if not type_ok then
         logs.error.notify(err)
 
-        return nil
+        return defaults[name]
     end
 
     if value:lower() == "none" then
@@ -93,17 +95,16 @@ local function get_hex_value(name, value)
     if rgb == -1 then
         logs.error.notify("colors(%s): %q is not a valid color", name, value)
 
-        return nil
+        return defaults[name]
     end
 
     return ("#%06x"):format(rgb)
 end
 
----@type palette
-colors.extended = vim.deepcopy(colors.default)
+local config = require "one_monokai.config"
 
 for name, value in pairs(config.colors) do
-    colors.extended[name] = get_hex_value(name, value)
+    colors[name] = get_hex_value(name, value)
 end
 
-return colors.extended
+return colors

tests/spec/config_spec.lua

@@ -51,38 +51,4 @@ describe("Override config", function()
         assert.is_nil(comment_hl.italic)
         assert.is_nil(paremeter_hl.italic)
     end)
-
-    describe("with errors", function()
-        local logs = require "one_monokai.logs"
-
-        before_each(function()
-            logs.error.msg = ""
-        end)
-
-        it("should log error on wrong colors", function()
-            local wrong_config = {
-                colors = {
-                    lmao = true,
-                },
-            }
-
-            one_monokai.setup(wrong_config)
-
-            assert.is_not.equal("", logs.error.msg)
-        end)
-
-        it("should log error on wrong highlight groups", function()
-            local wrong_config = {
-                themes = function()
-                    return {
-                        lmao = true,
-                    }
-                end,
-            }
-
-            one_monokai.setup(wrong_config)
-
-            assert.is_not.equal("", logs.error.msg)
-        end)
-    end)
 end)