End/neovim-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes (#259)

Browse source 
* Missed in 154ba7d

* utils/change-theme: Check theme name for magic chars
This commit is contained in:
Aki 2021-08-16 09:18:31 +05:30 committed by GitHub
parent 9c134872fb
commit 4abf43aa99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lua/telescope/_extensions/themes.lua
View file

@ -110,7 +110,6 @@ M.theme_switcher = function(opts)
end end
if reload_theme(final_theme) then if reload_theme(final_theme) then
vim.g.current_nvchad_theme = final_theme
if change then if change then
-- ask for confirmation to set as default theme -- 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 ans = string.lower(vim.fn.input("Set " .. new_theme .. " as default theme ? [y/N] ")) == "y"
@ -120,11 +119,8 @@ M.theme_switcher = function(opts)
else else
-- will be used in restoring nvchad theme var -- will be used in restoring nvchad theme var
final_theme = current_theme final_theme = current_theme
vim.g.current_nvchad_theme = final_theme
end end
end end
-- open a buffer and close it to reload the statusline
vim.cmd("new|bwipeout")
else else
final_theme = current_theme final_theme = current_theme
end end

3
lua/utils.lua
View file

@ -13,6 +13,9 @@ M.change_theme = function(current_theme, new_theme)
local file = vim.fn.stdpath("config") .. "/lua/chadrc.lua" local file = vim.fn.stdpath("config") .. "/lua/chadrc.lua"
-- store in data variable -- store in data variable
local data = assert(M.file("r", file)) local data = assert(M.file("r", file))
-- escape characters which can be parsed as magic chars
current_theme = current_theme:gsub("%p", "%%%0")
new_theme = new_theme:gsub("%p", "%%%0")
local find = "theme = .?" .. current_theme .. ".?" local find = "theme = .?" .. current_theme .. ".?"
local replace = 'theme = "' .. new_theme .. '"' local replace = 'theme = "' .. new_theme .. '"'
local content = string.gsub(data, find, replace) local content = string.gsub(data, find, replace)