From e215911c75f539bac3d43b50a88a289297b56b30 Mon Sep 17 00:00:00 2001 From: Jae-Heon Ji Date: Wed, 13 Apr 2022 23:55:59 +0900 Subject: [PATCH 1/3] fix: missing signcolumn highlight group --- lua/neo-tree/setup/init.lua | 8 ++++++-- lua/neo-tree/ui/highlights.lua | 13 ++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lua/neo-tree/setup/init.lua b/lua/neo-tree/setup/init.lua index 452b97b1..849833d3 100644 --- a/lua/neo-tree/setup/init.lua +++ b/lua/neo-tree/setup/init.lua @@ -49,7 +49,11 @@ local define_events = function() return args end) - events.define_autocmd_event(events.VIM_BUFFER_CHANGED, { "BufWritePost", "BufFilePost", "BufModifiedSet" }, 200) + events.define_autocmd_event( + events.VIM_BUFFER_CHANGED, + { "BufWritePost", "BufFilePost", "BufModifiedSet" }, + 200 + ) events.define_autocmd_event(events.VIM_BUFFER_MODIFIED_SET, { "BufModifiedSet" }, 0) events.define_autocmd_event(events.VIM_BUFFER_ADDED, { "BufAdd" }, 200) events.define_autocmd_event(events.VIM_BUFFER_DELETED, { "BufDelete" }, 200) @@ -69,7 +73,7 @@ M.buffer_enter_event = function() vim.cmd([[ setlocal cursorline setlocal nowrap - setlocal winhighlight=Normal:NeoTreeNormal,NormalNC:NeoTreeNormalNC,CursorLine:NeoTreeCursorLine,FloatBorder:NeoTreeFloatBorder,StatusLine:NeoTreeStatusLine,StatusLineNC:NeoTreeStatusLineNC,VertSplit:NeoTreeVertSplit,EndOfBuffer:NeoTreeEndOfBuffer + setlocal winhighlight=Normal:NeoTreeNormal,NormalNC:NeoTreeNormalNC,SignColumn:NeoTreeSignColumn,CursorLine:NeoTreeCursorLine,FloatBorder:NeoTreeFloatBorder,StatusLine:NeoTreeStatusLine,StatusLineNC:NeoTreeStatusLineNC,VertSplit:NeoTreeVertSplit,EndOfBuffer:NeoTreeEndOfBuffer setlocal nolist nospell nonumber norelativenumber ]]) events.fire_event(events.NEO_TREE_BUFFER_ENTER) diff --git a/lua/neo-tree/ui/highlights.lua b/lua/neo-tree/ui/highlights.lua index daaf3404..18a4674b 100644 --- a/lua/neo-tree/ui/highlights.lua +++ b/lua/neo-tree/ui/highlights.lua @@ -29,6 +29,7 @@ M.INDENT_MARKER = "NeoTreeIndentMarker" M.MODIFIED = "NeoTreeModified" M.NORMAL = "NeoTreeNormal" M.NORMALNC = "NeoTreeNormalNC" +M.SIGNCOLUMN = "NeoTreeSignColumn" M.STATUS_LINE = "NeoTreeStatusLine" M.STATUS_LINE_NC = "NeoTreeStatusLineNC" M.VERTSPLIT = "NeoTreeVertSplit" @@ -104,7 +105,7 @@ local function create_highlight_group(hl_group_name, link_to_if_exists, backgrou end local faded_highlight_group_cache = {} -M.get_faded_highlight_group = function (hl_group_name, fade_percentage) +M.get_faded_highlight_group = function(hl_group_name, fade_percentage) if type(hl_group_name) ~= "string" then error("hl_group_name must be a string") end @@ -177,7 +178,12 @@ M.get_faded_highlight_group = function (hl_group_name, fade_percentage) local green = (f_green * fade_percentage) + (b_green * (1 - fade_percentage)) local blue = (f_blue * fade_percentage) + (b_blue * (1 - fade_percentage)) - local new_foreground = string.format("%s%s%s", dec_to_hex(red, 2), dec_to_hex(green, 2), dec_to_hex(blue, 2)) + local new_foreground = string.format( + "%s%s%s", + dec_to_hex(red, 2), + dec_to_hex(green, 2), + dec_to_hex(blue, 2) + ) create_highlight_group(key, {}, hl_group.background, new_foreground, gui) faded_highlight_group_cache[key] = key @@ -188,6 +194,8 @@ M.setup = function() local normal_hl = create_highlight_group(M.NORMAL, { "Normal" }) local normalnc_hl = create_highlight_group(M.NORMALNC, { "NormalNC", M.NORMAL }) + create_highlight_group(M.SIGNCOLUMN, { "SignColumn", M.NORMAL }) + create_highlight_group(M.STATUS_LINE, { "StatusLine" }) create_highlight_group(M.STATUS_LINE_NC, { "StatusLineNC" }) @@ -238,5 +246,4 @@ M.setup = function() create_highlight_group(M.GIT_UNTRACKED, {}, nil, conflict.foreground, "italic") end - return M From dea29047c9ad8d37d93e50a6c3a67f97017930ed Mon Sep 17 00:00:00 2001 From: Jae-Heon Ji Date: Thu, 14 Apr 2022 00:08:02 +0900 Subject: [PATCH 2/3] docs: add highlight --- doc/neo-tree.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/neo-tree.txt b/doc/neo-tree.txt index 39b33ca0..77163313 100644 --- a/doc/neo-tree.txt +++ b/doc/neo-tree.txt @@ -758,6 +758,7 @@ NeoTreeIndentMarker The style of indentation markers (guides). By default, NeoTreeExpander Used for collapsed/expanded icons. NeoTreeNormal |hl-Normal| override in Neo-tree window. NeoTreeNormalNC |hi-NormalNC| override in Neo-tree window. +NeoTreeSignColumn |hl-SignColumn| override in Neo-tree window. NeoTreeStatusLine |hl-StatusLine| override in Neo-tree window. NeoTreeStatusLineNC |hl-StatusLineNC| override in Neo-tree window. NeoTreeVertSplit |hl-VertSplit| override in Neo-tree window. From 9ebeda12a679f720e482e7415efde1e7fb10a9fd Mon Sep 17 00:00:00 2001 From: Jae-Heon Ji Date: Thu, 14 Apr 2022 00:09:47 +0900 Subject: [PATCH 3/3] docs: fix typo --- doc/neo-tree.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/neo-tree.txt b/doc/neo-tree.txt index 77163313..7d965296 100644 --- a/doc/neo-tree.txt +++ b/doc/neo-tree.txt @@ -731,7 +731,7 @@ these yourself before the plugin loads, it will not be touched. If they do not exist, they will be created. NeoTreeBufferNumber The buffer number shown in the buffers source. -NeoTreeCursorLine |hi-CursorLine| override in Neo-tree window. +NeoTreeCursorLine |hl-CursorLine| override in Neo-tree window. NeoTreeDimText Greyed out text used in various places. NeoTreeDirectoryIcon Directory icon. NeoTreeDirectoryName Directory name. @@ -757,7 +757,7 @@ NeoTreeIndentMarker The style of indentation markers (guides). By default, the "Normal" highlight is used. NeoTreeExpander Used for collapsed/expanded icons. NeoTreeNormal |hl-Normal| override in Neo-tree window. -NeoTreeNormalNC |hi-NormalNC| override in Neo-tree window. +NeoTreeNormalNC |hl-NormalNC| override in Neo-tree window. NeoTreeSignColumn |hl-SignColumn| override in Neo-tree window. NeoTreeStatusLine |hl-StatusLine| override in Neo-tree window. NeoTreeStatusLineNC |hl-StatusLineNC| override in Neo-tree window.