diff --git a/.gitignore b/.gitignore index 6fd0a37..b66220c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ luac.out *.x86_64 *.hex +# ctags +tags diff --git a/lua/lualine/components/mode.lua b/lua/lualine/components/mode.lua index c3218b6..57daf6a 100644 --- a/lua/lualine/components/mode.lua +++ b/lua/lualine/components/mode.lua @@ -1,44 +1,41 @@ -- Copyright (c) 2020-2021 hoob3rt -- MIT license, see LICENSE for more details. +local mode_map = { + ['n'] = 'NORMAL', + ['no'] = 'O-PENDING', + ['nov'] = 'O-PENDING', + ['noV'] = 'O-PENDING', + ['no'] = 'O-PENDING', + ['niI'] = 'NORMAL', + ['niR'] = 'NORMAL', + ['niV'] = 'NORMAL', + ['v'] = 'VISUAL', + ['V'] = 'V-LINE', + [''] = 'V-BLOCK', + ['s'] = 'SELECT', + ['S'] = 'S-LINE', + [''] = 'S-BLOCK', + ['i'] = 'INSERT', + ['ic'] = 'INSERT', + ['ix'] = 'INSERT', + ['R'] = 'REPLACE', + ['Rc'] = 'REPLACE', + ['Rv'] = 'V-REPLACE', + ['Rx'] = 'REPLACE', + ['c'] = 'COMMAND', + ['cv'] = 'EX', + ['ce'] = 'EX', + ['r'] = 'REPLACE', + ['rm'] = 'MORE', + ['r?'] = 'CONFIRM', + ['!'] = 'SHELL', + ['t'] = 'TERMINAL', +} local function mode() - local mode_map = { - ['n'] = 'NORMAL', - ['no'] = 'O-PENDING', - ['nov'] = 'O-PENDING', - ['noV'] = 'O-PENDING', - ['no'] = 'O-PENDING', - ['niI'] = 'NORMAL', - ['niR'] = 'NORMAL', - ['niV'] = 'NORMAL', - ['v'] = 'VISUAL', - ['V'] = 'V-LINE', - [''] = 'V-BLOCK', - ['s'] = 'SELECT', - ['S'] = 'S-LINE', - [''] = 'S-BLOCK', - ['i'] = 'INSERT', - ['ic'] = 'INSERT', - ['ix'] = 'INSERT', - ['R'] = 'REPLACE', - ['Rc'] = 'REPLACE', - ['Rv'] = 'V-REPLACE', - ['Rx'] = 'REPLACE', - ['c'] = 'COMMAND', - ['cv'] = 'EX', - ['ce'] = 'EX', - ['r'] = 'REPLACE', - ['rm'] = 'MORE', - ['r?'] = 'CONFIRM', - ['!'] = 'SHELL', - ['t'] = 'TERMINAL', - } - local function get_mode() - local mode_code = vim.api.nvim_get_mode().mode - if mode_map[mode_code] == nil then return mode_code end - return mode_map[mode_code] - end - return get_mode() + local mode_code = vim.api.nvim_get_mode().mode + if mode_map[mode_code] == nil then return mode_code end + return mode_map[mode_code] end return mode diff --git a/lua/lualine/highlight.lua b/lua/lualine/highlight.lua index 5fa8f91..e7cfb6c 100644 --- a/lua/lualine/highlight.lua +++ b/lua/lualine/highlight.lua @@ -89,7 +89,7 @@ function M.create_component_highlight_group(color , highlight_tag, options) local fg = (color.fg or default_color_table.fg) -- Check if it's same as normal mode if it is no need to create aditional highlight if mode ~= 'normal' then - if bg ~= normal_hl.bg and fg ~= normal_hl.fg then + if bg ~= normal_hl.bg or fg ~= normal_hl.fg then highlight(table.concat(highlight_group_name, '_'), fg, bg, color.gui) end else