refactor: simplify set themes function and types (#74)

Author: cpea2506

lua/one_monokai/colors.lua

@@ -1,7 +1,7 @@
----@class palette
+---@class colors
 local colors = {}
 
----@type palette
+---@type colors
 local defaults = {
     fg = "#abb2bf",
     bg = "#282c34",

lua/one_monokai/config.lua

@@ -1,13 +1,11 @@
 local config = {}
 
----@alias colors table<string,string> #colors table
----
----@class config
----@field transparent boolean #whether to enable transparent background
----@field colors colors #custom colors
----@field themes fun(colors:colors):table #custom highlight groups
----@field italics boolean #whether to italicize some highlight groups
-config.default = {
+---@class options
+---@field transparent boolean #Whether to enable transparent background
+---@field colors colors #Custom colors
+---@field themes fun(colors:colors):groups #Custom highlight groups
+---@field italics boolean #Whether to italicize some highlight groups
+local defaults = {
     transparent = false,
     colors = {},
     themes = function(_)
@@ -16,17 +14,16 @@ config.default = {
     italics = true,
 }
 
----@type config
-config.extended = vim.deepcopy(config.default)
+config.options = vim.deepcopy(defaults)
 
----Extend default with user config
----@param user_config config
-function config:extend(user_config)
-    self.extended = vim.tbl_deep_extend("force", self.extended, user_config or {})
+---Extend default with user's config
+---@param opts options
+function config:extend(opts)
+    self.options = vim.tbl_deep_extend("force", self.options, opts or {})
 end
 
 return setmetatable(config, {
     __index = function(_, key)
-        return config.extended[key]
+        return config.options[key]
     end,
 })

lua/one_monokai/init.lua

@@ -1,10 +1,10 @@
 local M = {}
 
-local set = vim.cmd
-local config = require "one_monokai.config"
-local themes = require "one_monokai.themes"
+function M.setup(opts)
+    local set = vim.cmd
+    local config = require "one_monokai.config"
+    local themes = require "one_monokai.themes"
 
-function M.setup(user_config)
     if vim.g.colors_name then
         set.hi "clear"
     end
@@ -17,11 +17,10 @@ function M.setup(user_config)
     vim.o.termguicolors = true
     vim.g.colors_name = "one_monokai"
 
-    -- load user config and themes
-    config:extend(user_config)
+    config:extend(opts)
     themes.load()
 
-    if user_config then
+    if opts then
         set.colorscheme "one_monokai"
     end
 end

lua/one_monokai/themes/highlight.lua

@@ -1,34 +1,27 @@
 local themes = {}
 
-local config = require "one_monokai.config"
-local highlight = require "one_monokai.themes.highlight"
-local logs = require "one_monokai.logs"
+---Set highlight groups
+---@param groups groups
+local function set_highlight(groups)
+    local logs = require "one_monokai.logs"
+    local set_hl = vim.api.nvim_set_hl
+
+    for name, attrs in pairs(groups) do
+        local status_ok, err = pcall(set_hl, 0, name, attrs)
+
+        if not status_ok then
+            logs.error.notify(("themes(%s): %s"):format(name, err), 0)
+        end
+    end
+end
 
 function themes.load()
+    local config = require "one_monokai.config"
     local colors = require "one_monokai.colors"
-    local groups = require "one_monokai.themes.groups"
-
-    local default = highlight:new(groups)
-    local user_themes = config.themes(colors)
+    local default = require "one_monokai.themes.groups"
 
-    -- set default if user has no custom themes
-    if vim.tbl_isempty(user_themes) then
-        default:set()
-
-        return
-    end
-
-    -- extend default with user config
-    local extended = default:extend(user_themes)
-    local set_theme_ok, err = pcall(function()
-        extended:set()
-    end)
-
-    if not set_theme_ok then
-        default:set()
-
-        logs.error.notify(err)
-    end
+    set_highlight(default)
+    set_highlight(config.themes(colors))
 end
 
 return themes