fix: theme type check fix (#165)

* fix: theme type check fix

* fix: string concat bug

* fix: removed semmicolon
This commit is contained in:
Hubert Pelczarski 2021-04-08 04:06:31 -07:00 committed by GitHub
parent 23e6bd5dd7
commit 2b32fb090f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions

View File

@ -266,23 +266,24 @@ end
local function tabline() return statusline(config.tabline, true) end local function tabline() return statusline(config.tabline, true) end
local function setup_theme() local function setup_theme()
local function get_theme_from_config()
local theme_name = config.options.theme local theme_name = config.options.theme
local ok, theme
if type(theme_name) == 'string' then if type(theme_name) == 'string' then
ok, theme = pcall(require, 'lualine.themes.' .. theme_name) local ok, theme = pcall(require, 'lualine.themes.' .. theme_name)
if not ok then if ok then return theme end
elseif type(theme_name) == 'table' then
-- use the provided theme as-is
return config.options.theme
end
vim.api.nvim_echo({ vim.api.nvim_echo({
{ {
'theme ' .. theme_name .. ' not found defaulting to gruvbox', 'theme ' .. tostring(theme_name) .. ' not found, defaulting to gruvbox',
'ErrorMsg' 'ErrorMsg'
} }
}, true, {}) }, true, {})
theme = require 'lualine.themes.gruvbox' return require 'lualine.themes.gruvbox'
end
else
-- use the provided theme as-is, assuming it's a dictionary
theme = config.options.theme
end end
local theme = get_theme_from_config()
highlight.create_highlight_groups(theme) highlight.create_highlight_groups(theme)
vim.api.nvim_exec([[ vim.api.nvim_exec([[
augroup lualine augroup lualine