fix(extras.opencode): made opencode gen idempotent

Author: folke

lua/tokyonight/extra/fzf.lua

@@ -1,5 +1,3 @@
-local util = require("tokyonight.util")
-
 local M = {}
 
 --- @param colors ColorScheme
@@ -46,7 +44,6 @@ function M.generate(colors)
     if vim.fn.hlexists(v[2]) == 1 then
       hl_group = v[2]
     end
-    print(hl_group)
     assert(hl_group, "hl_group not found for " .. v[2])
     local hl = vim.api.nvim_get_hl(0, { name = hl_group, link = false })
     assert(hl, "hl not found for " .. hl_group)
@@ -75,6 +72,4 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 "
 ]]
 
-print(M.generate())
-
 return M

lua/tokyonight/extra/init.lua

@@ -54,7 +54,7 @@ M.extras = {
 }
 
 function M.setup()
-  local tokyonight = require("tokyonight")
+  local tokyonight = require("tokyonight.theme")
   vim.o.background = "dark"
 
   -- map of style to style name
@@ -74,7 +74,7 @@ function M.setup()
     local info = M.extras[extra]
     local plugin = require("tokyonight.extra." .. extra)
     for style, style_name in pairs(styles) do
-      local colors, groups, opts = tokyonight.load({ style = style, plugins = { all = true } })
+      local colors, groups, opts = tokyonight.setup({ style = style, plugins = { all = true } })
       local fname = extra
         .. (info.subdir and "/" .. info.subdir .. "/" or "")
         .. "/tokyonight"

lua/tokyonight/extra/opencode.lua

@@ -7,7 +7,10 @@ local M = {}
 local function generate_defs(colors)
   local defs = {}
 
-  for key, value in pairs(colors) do
+  local keys = vim.tbl_keys(colors)
+  table.sort(keys)
+  for _, key in ipairs(keys) do
+    local value = colors[key]
     -- Skip keys that start with underscore (metadata) and "none"
     if not key:match("^_") and key ~= "none" then
       if type(value) == "string" then

lua/tokyonight/theme.lua

@@ -1,5 +1,3 @@
-local Util = require("tokyonight.util")
-
 local M = {}
 
 ---@param opts? tokyonight.Config