From f02b0585a8f8dee12f98f6a460ee7ef14d5864f1 Mon Sep 17 00:00:00 2001 From: LostNeophyte Date: Mon, 12 Dec 2022 15:06:02 +0100 Subject: fix: only call theme's setup if it's selected (#3586) --- lua/lvim/core/theme.lua | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lua/lvim/core/theme.lua b/lua/lvim/core/theme.lua index 2b06363b..6bf67906 100644 --- a/lua/lvim/core/theme.lua +++ b/lua/lvim/core/theme.lua @@ -64,13 +64,16 @@ M.setup = function() end local selected_theme = lvim.builtin.theme.name - local status_ok, plugin = pcall(require, selected_theme) - if not status_ok then - return + + if vim.startswith(lvim.colorscheme, selected_theme) then + local status_ok, plugin = pcall(require, selected_theme) + if not status_ok then + return + end + pcall(function() + plugin.setup(lvim.builtin.theme[selected_theme].options) + end) end - pcall(function() - plugin.setup(lvim.builtin.theme[selected_theme].options) - end) -- ref: https://github.com/neovim/neovim/issues/18201#issuecomment-1104754564 local colors = vim.api.nvim_get_runtime_file(("colors/%s.*"):format(lvim.colorscheme), false) -- cgit v1.2.3