fix(lualine): make lualine work again with just tokyonight. Fixes #551

Author: folke

lua/lualine/themes/_tokyonight.lua

@@ -0,0 +1,56 @@
+local M = {}
+
+---@param style? string
+function M.get(style)
+  local colors, config = require("tokyonight.colors").setup({
+    style = style,
+  })
+
+  local hl = {}
+
+  hl.normal = {
+    a = { bg = colors.blue, fg = colors.black },
+    b = { bg = colors.fg_gutter, fg = colors.blue },
+    c = { bg = colors.bg_statusline, fg = colors.fg_sidebar },
+  }
+
+  hl.insert = {
+    a = { bg = colors.green, fg = colors.black },
+    b = { bg = colors.fg_gutter, fg = colors.green },
+  }
+
+  hl.command = {
+    a = { bg = colors.yellow, fg = colors.black },
+    b = { bg = colors.fg_gutter, fg = colors.yellow },
+  }
+
+  hl.visual = {
+    a = { bg = colors.magenta, fg = colors.black },
+    b = { bg = colors.fg_gutter, fg = colors.magenta },
+  }
+
+  hl.replace = {
+    a = { bg = colors.red, fg = colors.black },
+    b = { bg = colors.fg_gutter, fg = colors.red },
+  }
+
+  hl.terminal = {
+    a = { bg = colors.green1, fg = colors.black },
+    b = { bg = colors.fg_gutter, fg = colors.green1 },
+  }
+
+  hl.inactive = {
+    a = { bg = colors.bg_statusline, fg = colors.blue },
+    b = { bg = colors.bg_statusline, fg = colors.fg_gutter, gui = "bold" },
+    c = { bg = colors.bg_statusline, fg = colors.fg_gutter },
+  }
+
+  if config.lualine_bold then
+    for _, mode in pairs(hl) do
+      mode.a.gui = "bold"
+    end
+  end
+  return hl
+end
+
+return M

lua/lualine/themes/tokyonight-day.lua

@@ -1 +1 @@
-return require("lualine.themes.tokyonight")("day")
+return require("lualine.themes._tokyonight").get("day")

lua/lualine/themes/tokyonight-moon.lua

@@ -1 +1 @@
-return require("lualine.themes.tokyonight")("moon")
+return require("lualine.themes._tokyonight").get("moon")

lua/lualine/themes/tokyonight-night.lua

@@ -1 +1 @@
-return require("lualine.themes.tokyonight")("night")
+return require("lualine.themes._tokyonight").get("night")

lua/lualine/themes/tokyonight-storm.lua

@@ -1 +1 @@
-return require("lualine.themes.tokyonight")("storm")
+return require("lualine.themes._tokyonight").get("storm")

lua/lualine/themes/tokyonight.lua

@@ -1,66 +1 @@
-local M = {}
-
----@param style? string
-function M.get(style)
-  local colors, config = require("tokyonight.colors").setup({
-    style = style,
-  })
-
-  local hl = {}
-
-  hl.normal = {
-    a = { bg = colors.blue, fg = colors.black },
-    b = { bg = colors.fg_gutter, fg = colors.blue },
-    c = { bg = colors.bg_statusline, fg = colors.fg_sidebar },
-  }
-
-  hl.insert = {
-    a = { bg = colors.green, fg = colors.black },
-    b = { bg = colors.fg_gutter, fg = colors.green },
-  }
-
-  hl.command = {
-    a = { bg = colors.yellow, fg = colors.black },
-    b = { bg = colors.fg_gutter, fg = colors.yellow },
-  }
-
-  hl.visual = {
-    a = { bg = colors.magenta, fg = colors.black },
-    b = { bg = colors.fg_gutter, fg = colors.magenta },
-  }
-
-  hl.replace = {
-    a = { bg = colors.red, fg = colors.black },
-    b = { bg = colors.fg_gutter, fg = colors.red },
-  }
-
-  hl.terminal = {
-    a = { bg = colors.green1, fg = colors.black },
-    b = { bg = colors.fg_gutter, fg = colors.green1 },
-  }
-
-  hl.inactive = {
-    a = { bg = colors.bg_statusline, fg = colors.blue },
-    b = { bg = colors.bg_statusline, fg = colors.fg_gutter, gui = "bold" },
-    c = { bg = colors.bg_statusline, fg = colors.fg_gutter },
-  }
-
-  if config.lualine_bold then
-    for _, mode in pairs(hl) do
-      mode.a.gui = "bold"
-    end
-  end
-  return hl
-end
-
-local default
-
-return setmetatable({}, {
-  __index = function(_, k)
-    default = default or M.get()
-    return default[k]
-  end,
-  __call = function(_, style)
-    return M.get(style)
-  end,
-})
+return require("lualine.themes._tokyonight").get()