diff --git a/lua/nvim-tree/appearance/init.lua b/lua/nvim-tree/appearance/init.lua index 61714af6..e3e3ab26 100644 --- a/lua/nvim-tree/appearance/init.lua +++ b/lua/nvim-tree/appearance/init.lua @@ -134,6 +134,29 @@ M.HIGHLIGHT_GROUPS = { { group = "NvimTreeDiagnosticHintFolderHL", link = "NvimTreeDiagnosticHintFileHL" }, } +-- winhighlight for most cases +M.WIN_HL = table.concat({ + "EndOfBuffer:NvimTreeEndOfBuffer", + "CursorLine:NvimTreeCursorLine", + "CursorLineNr:NvimTreeCursorLineNr", + "LineNr:NvimTreeLineNr", + "WinSeparator:NvimTreeWinSeparator", + "StatusLine:NvimTreeStatusLine", + "StatusLineNC:NvimTreeStatuslineNC", + "SignColumn:NvimTreeSignColumn", + "Normal:NvimTreeNormal", + "NormalNC:NvimTreeNormalNC", + "NormalFloat:NvimTreeNormalFloat", + "FloatBorder:NvimTreeNormalFloatBorder", +}, ",") + +-- winhighlight for help +M.WIN_HL_HELP = table.concat({ + "NormalFloat:NvimTreeNormalFloat", + "WinSeparator:NvimTreeWinSeparator", + "CursorLine:NvimTreeCursorLine", +}, ",") + -- nvim-tree highlight groups to legacy M.LEGACY_LINKS = { NvimTreeModifiedIcon = "NvimTreeModifiedFile", diff --git a/lua/nvim-tree/explorer/view.lua b/lua/nvim-tree/explorer/view.lua index cbe4ebb8..ec7ea2d7 100644 --- a/lua/nvim-tree/explorer/view.lua +++ b/lua/nvim-tree/explorer/view.lua @@ -1,3 +1,4 @@ +local appearance = require("nvim-tree.appearance") local events = require("nvim-tree.events") local utils = require("nvim-tree.utils") local log = require("nvim-tree.log") @@ -78,20 +79,7 @@ function View:new(args) cursorlineopt = "both", colorcolumn = "0", wrap = false, - winhl = table.concat({ - "EndOfBuffer:NvimTreeEndOfBuffer", - "CursorLine:NvimTreeCursorLine", - "CursorLineNr:NvimTreeCursorLineNr", - "LineNr:NvimTreeLineNr", - "WinSeparator:NvimTreeWinSeparator", - "StatusLine:NvimTreeStatusLine", - "StatusLineNC:NvimTreeStatuslineNC", - "SignColumn:NvimTreeSignColumn", - "Normal:NvimTreeNormal", - "NormalNC:NvimTreeNormalNC", - "NormalFloat:NvimTreeNormalFloat", - "FloatBorder:NvimTreeNormalFloatBorder", - }, ","), + winhl = appearance.WIN_HL, } self:configure_width(self.explorer.opts.view.width) @@ -640,7 +628,7 @@ end function View:reset_winhl() local winnr = self:get_winnr() if winnr and vim.api.nvim_win_is_valid(winnr) then - vim.wo[self:get_winnr()].winhl = self.winopts.winhl + vim.wo[self:get_winnr()].winhl = appearance.WIN_HL end end diff --git a/lua/nvim-tree/help.lua b/lua/nvim-tree/help.lua index a5a0dbd6..34f6db2d 100644 --- a/lua/nvim-tree/help.lua +++ b/lua/nvim-tree/help.lua @@ -1,3 +1,4 @@ +local appearance = require("nvim-tree.appearance") local keymap = require("nvim-tree.keymap") local api = {} -- circular dependency @@ -5,12 +6,6 @@ local PAT_MOUSE = "^<.*Mouse" local PAT_CTRL = "^