theme_switcher: Handle some edgecases | Clear cmdline after default theme prompt
This commit is contained in:
parent
6468de54c1
commit
e0f1cb3687
|
@ -12,7 +12,8 @@ M.reload_theme = function(theme_name)
|
|||
end
|
||||
|
||||
if not pcall(require, "themes/" .. theme_name) then
|
||||
error("No such theme ( " .. theme_name .. " )")
|
||||
print("No such theme ( " .. theme_name .. " )")
|
||||
return false
|
||||
end
|
||||
|
||||
vim.g.nvchad_theme = theme_name
|
||||
|
@ -20,16 +21,22 @@ M.reload_theme = function(theme_name)
|
|||
-- reload the base16 theme
|
||||
local ok, base16 = pcall(require, "base16")
|
||||
if not ok then
|
||||
error("Error: Cannot load base16 plugin!")
|
||||
print("Error: Cannot load base16 plugin!")
|
||||
return false
|
||||
end
|
||||
base16(base16.themes[theme_name], true)
|
||||
|
||||
reload_plugin {
|
||||
"highlights",
|
||||
"plugins.bufferline",
|
||||
"galaxyline",
|
||||
"plugins.statusline"
|
||||
}
|
||||
if
|
||||
not reload_plugin {
|
||||
"highlights",
|
||||
"plugins.bufferline",
|
||||
"galaxyline",
|
||||
"plugins.statusline"
|
||||
}
|
||||
then
|
||||
print "Error: Not able to reload all plugins."
|
||||
return false
|
||||
end
|
||||
|
||||
-- now send the provider info to actual refresh
|
||||
require("galaxyline.provider").async_load_providers:send()
|
||||
|
@ -152,6 +159,7 @@ M.theme_switcher = function(opts)
|
|||
if change then
|
||||
-- ask for confirmation to set as default theme
|
||||
local ans = string.lower(vim.fn.input("Set " .. new_theme .. " as default theme ? [y/N] ")) == "y"
|
||||
local_utils.clear_cmdline()
|
||||
if ans then
|
||||
local_utils.change_theme(current_theme, final_theme)
|
||||
else
|
||||
|
@ -161,9 +169,11 @@ M.theme_switcher = function(opts)
|
|||
end
|
||||
-- open a buffer and close it to reload the statusline
|
||||
vim.cmd("new|bwipeout")
|
||||
else
|
||||
final_theme = current_theme
|
||||
end
|
||||
-- set nvchad_theme global var
|
||||
vim.g.nvchad_theme = current_theme
|
||||
vim.g.nvchad_theme = final_theme
|
||||
end
|
||||
-- launch the telescope picker
|
||||
picker:find()
|
||||
|
|
|
@ -2,14 +2,17 @@ local M = {}
|
|||
|
||||
-- reload a plugin ( will try to load even if not loaded)
|
||||
-- can take a string or list ( table )
|
||||
-- return true or false
|
||||
M.reload_plugin = function(plugins)
|
||||
local status = true
|
||||
local function _reload_plugin(plugin)
|
||||
local loaded = package.loaded[plugin]
|
||||
if loaded then
|
||||
package.loaded[plugin] = nil
|
||||
end
|
||||
if not pcall(require, plugin) then
|
||||
error("Error: Cannot load " .. plugin .. " plugin!")
|
||||
print("Error: Cannot load " .. plugin .. " plugin!")
|
||||
status = false
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -20,6 +23,7 @@ M.reload_plugin = function(plugins)
|
|||
_reload_plugin(plugin)
|
||||
end
|
||||
end
|
||||
return status
|
||||
end
|
||||
|
||||
-- return a table of available themes
|
||||
|
@ -73,7 +77,8 @@ end
|
|||
-- 1st arg as current theme, 2nd as new theme
|
||||
M.change_theme = function(current_theme, new_theme)
|
||||
if current_theme == nil or new_theme == nil then
|
||||
error "Provide current and new theme name"
|
||||
print "Error: Provide current and new theme name"
|
||||
return false
|
||||
end
|
||||
if current_theme == new_theme then
|
||||
return
|
||||
|
@ -87,10 +92,20 @@ M.change_theme = function(current_theme, new_theme)
|
|||
local content = string.gsub(data, find, replace)
|
||||
-- see if the find string exists in file
|
||||
if content == data then
|
||||
error("Cannot change default theme with " .. new_theme .. ", edit " .. file .. " manually")
|
||||
print("Error: Cannot change default theme with " .. new_theme .. ", edit " .. file .. " manually")
|
||||
return false
|
||||
else
|
||||
assert(M.file("w", file, content))
|
||||
end
|
||||
end
|
||||
|
||||
M.clear_cmdline = function()
|
||||
vim.defer_fn(
|
||||
function()
|
||||
vim.cmd("echo")
|
||||
end,
|
||||
0
|
||||
)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
Loading…
Reference in New Issue