refactor: update the init of solarized

colors/solarized.vim

@@ -1,5 +1,3 @@
 lua << EOF
-local solarized = require('solarized')
-
-solarized.setup()
+require('solarized').load()
 EOF

lua/solarized/init.lua

@@ -3,9 +3,25 @@ local solarized_palette = require('solarized.palette')
 local solarized_highlights = require('solarized.highlights')
 
 local M = {}
-M.is_configured = false
-M.has_set_highlights = false
-M.config = {}
+M.config = nil
+M.colors = nil
+
+function M.load()
+  if vim.g.colors_name then
+    vim.cmd('hi clear')
+  end
+
+  if vim.fn.exists('syntax_on') then
+    vim.cmd('syntax reset')
+  end
+
+  vim.o.termguicolors = true
+  vim.g.colors_name = 'solarized'
+
+  local default_config = solarized_config()
+  local colors = solarized_palette.get_colors()
+  solarized_highlights(M.colors or colors, M.config or default_config)
+end
 
 --- Solarized setup
 ---
@@ -24,33 +40,16 @@ M.config = {}
 ---       - enables (table): A table specifying plugins to be enabled or disabled
 ---       - theme (string): Specifies the theme to be used.
 function M.setup(opts)
-  if vim.g.colors_name then
-    vim.cmd('hi clear')
-  end
-
-  if vim.fn.exists('syntax_on') then
-    vim.cmd('syntax reset')
-  end
-
-  vim.o.termguicolors = true
-  vim.g.colors_name = 'solarized'
-
-  if not M.is_configured then
-    local default_config = solarized_config()
-    M.config = vim.tbl_deep_extend('force', default_config, opts or {})
-    M.is_configured = true
-  end
-
+  local default_config = solarized_config()
+  M.config = vim.tbl_deep_extend('force', default_config, opts or {})
   local colors = solarized_palette.get_colors()
 
   if type(M.config.colors) == 'table' and not vim.tbl_isempty(M.config.colors) then
-    colors = solarized_palette.extend_colors(colors, M.config.colors)
+    M.colors = solarized_palette.extend_colors(colors, M.config.colors)
   elseif type(M.config.colors) == 'function' then
     local colorhelper = require('solarized.utils.colors')
-    colors = solarized_palette.extend_colors(colors, M.config.colors(colors, colorhelper))
+    M.colors = solarized_palette.extend_colors(colors, M.config.colors(colors, colorhelper))
   end
-
-  solarized_highlights(colors, M.config)
 end
 
 return M

tests/setup_spec.lua

@@ -1,7 +1,8 @@
 describe('Solarized', function()
-  it('should setup without any errors', function()
-    vim.cmd.colorscheme('solarized')
+  vim.o.background = 'light'
+  vim.cmd.colorscheme('solarized')
 
+  it('should load without any errors', function()
     assert.equal('solarized', vim.g.colors_name)
     assert.is_true(vim.o.termguicolors)
   end)
@@ -11,11 +12,7 @@ describe('Solarized', function()
       return string.format('#%06x', decimal)
     end
 
-    vim.o.background = 'light'
-
     local output = vim.api.nvim_get_hl(0, { name = 'Normal' })
     assert.equals('#fdf6e3', tohex(output.bg))
-
-    vim.cmd.colorscheme('solarized')
   end)
 end)