Revert "Performence improvments (#205)" (#212)

This reverts commit 141417de61.
This commit is contained in:
Hubert Pelczarski 2021-05-06 04:45:07 +02:00 committed by GitHub
parent 8572db014a
commit d3cc343053
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 57 deletions

View File

@ -1,10 +1,11 @@
-- Copyright (c) 2020-2021 hoob3rt
-- MIT license, see LICENSE for more details.
local M = {}
local cterm_colors
local utils_colors = require 'lualine.utils.cterm_colors'
local utils = require 'lualine.utils.utils'
local section_highlight_map = {x = 'c', y = 'b', z = 'a'}
local active_theme = nil
local cterm_colors = false
function M.highlight(name, foreground, background, gui, reload)
local command = {'highlight', name}
@ -12,14 +13,14 @@ function M.highlight(name, foreground, background, gui, reload)
table.insert(command, 'guifg=' .. foreground)
if cterm_colors then
table.insert(command,
'ctermfg=' .. cterm_colors.get_cterm_color(foreground))
'ctermfg=' .. utils_colors.get_cterm_color(foreground))
end
end
if background and background ~= 'none' then
table.insert(command, 'guibg=' .. background)
if cterm_colors then
table.insert(command,
'ctermbg=' .. cterm_colors.get_cterm_color(background))
'ctermbg=' .. utils_colors.get_cterm_color(background))
end
end
if gui then
@ -35,9 +36,7 @@ end
function M.create_highlight_groups(theme)
utils.clear_highlights()
active_theme = theme
if not vim.o.termguicolors then
cterm_colors = require 'lualine.utils.cterm_colors'
end
cterm_colors = not vim.o.termguicolors
for mode, sections in pairs(theme) do
for section, colorscheme in pairs(sections) do
local highlight_group_name = {'lualine', section, mode}

View File

@ -5,6 +5,7 @@ local highlight = require('lualine.highlight')
local config = {}
local function apply_configuration(config_table)
if not config_table then return end
local function parse_sections(section_group_name)
if not config_table[section_group_name] then return end
for section_name, section in pairs(config_table[section_group_name]) do
@ -80,8 +81,6 @@ local function component_loader(component)
end
local function load_sections(sections)
local async_loader
async_loader = vim.loop.new_async(vim.schedule_wrap(function()
for section_name, section in pairs(sections) do
for index, component in pairs(section) do
if type(component) == 'string' or type(component) == 'function' then
@ -94,9 +93,6 @@ local function load_sections(sections)
section[index] = component_loader(component)
end
end
async_loader:close()
end))
async_loader:send()
end
local function load_components()
@ -238,8 +234,6 @@ end
local function tabline() return statusline(config.tabline, true) end
local function setup_theme()
local async_loader
async_loader = vim.loop.new_async(vim.schedule_wrap(function()
local function get_theme_from_config()
local theme_name = config.options.theme
if type(theme_name) == 'string' then
@ -265,9 +259,6 @@ local function setup_theme()
autocmd ColorScheme * lua require'lualine.utils.utils'.reload_highlights()
augroup END
]], false)
async_loader:close()
end))
async_loader:send()
end
local function set_tabline()
@ -281,10 +272,8 @@ local function set_statusline()
if next(config.sections) ~= nil or next(config.inactive_sections) ~= nil then
vim.o.statusline = '%!v:lua.require\'lualine\'.statusline()'
vim.api.nvim_exec([[
augroup lualine
autocmd WinLeave,BufLeave * lua vim.wo.statusline=require'lualine'.statusline()
autocmd WinEnter,BufEnter * set statusline<
augroup END
autocmd lualine WinLeave,BufLeave * lua vim.wo.statusline=require'lualine'.statusline()
autocmd lualine WinEnter,BufEnter * set statusline<
]], false)
end
end

View File

@ -7,9 +7,6 @@ function M.draw_section(section, highlight_name)
local status = {}
for _, component in pairs(section) do
-- load components into status table
if type(component) ~= 'table' or (type(component) == 'table' and not component.component_no) then
return '' -- unknown element in section. section posibly not yet loaded
end
table.insert(status, component:draw(highlight_name))
end