Skip to content

Commit cdb40dc

Browse files
committed
neovim requirement 0.7.0 -> 0.8.0, remove WinSeparator/VertSplit compatibility shims
1 parent 949913f commit cdb40dc

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Take a look at the [wiki](https://github.com/nvim-tree/nvim-tree.lua/wiki) for S
2828

2929
## Requirements
3030

31-
[neovim >=0.7.0](https://github.com/neovim/neovim/wiki/Installing-Neovim)
31+
[neovim >=0.8.0](https://github.com/neovim/neovim/wiki/Installing-Neovim)
3232

3333
[nvim-web-devicons](https://github.com/nvim-tree/nvim-web-devicons) is optional and used to display file icons. It requires a [patched font](https://www.nerdfonts.com/). Your terminal emulator must be configured to use that font, usually "Hack Nerd Font"
3434

doc/nvim-tree-lua.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Git Integration
5858

5959
Requirements
6060

61-
This file explorer requires `neovim >= 0.7.0`
61+
This file explorer requires `neovim >= 0.8.0`
6262

6363
==============================================================================
6464
2. QUICK START *nvim-tree-quickstart*
@@ -1474,8 +1474,7 @@ NvimTreeEndOfBuffer (NonText)
14741474
NvimTreeCursorLine (CursorLine)
14751475
NvimTreeCursorLineNr (CursorLineNr)
14761476
NvimTreeLineNr (LineNr)
1477-
NvimTreeVertSplit (VertSplit) [deprecated, use NvimTreeWinSeparator]
1478-
NvimTreeWinSeparator (VertSplit)
1477+
NvimTreeWinSeparator (WinSeparator)
14791478
NvimTreeCursorColumn (CursorColumn)
14801479

14811480
There are also links for file highlight with git properties, linked to their

lua/nvim-tree.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,8 +745,8 @@ local function validate_options(conf)
745745
end
746746

747747
function M.setup(conf)
748-
if vim.fn.has "nvim-0.7" == 0 then
749-
vim.notify_once("nvim-tree.lua requires Neovim 0.7 or higher", vim.log.levels.WARN)
748+
if vim.fn.has "nvim-0.8" == 0 then
749+
vim.notify_once("nvim-tree.lua requires Neovim 0.8 or higher", vim.log.levels.WARN)
750750
return
751751
end
752752

lua/nvim-tree/colors.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ local function get_links()
6969
CursorLineNr = "CursorLineNr",
7070
LineNr = "LineNr",
7171
CursorLine = "CursorLine",
72-
VertSplit = "VertSplit",
73-
WinSeparator = "NvimTreeVertSplit",
72+
WinSeparator = "WinSeparator",
7473
CursorColumn = "CursorColumn",
7574
FileDirty = "NvimTreeGitDirty",
7675
FileNew = "NvimTreeGitNew",

lua/nvim-tree/view.lua

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ local events = require "nvim-tree.events"
44
local utils = require "nvim-tree.utils"
55
local log = require "nvim-tree.log"
66

7-
local function get_win_sep_hl()
8-
-- #1221 WinSeparator not present in nvim 0.6.1 and some builds of 0.7.0
9-
local has_win_sep = pcall(vim.cmd, "silent hi WinSeparator")
10-
return has_win_sep and "WinSeparator:NvimTreeWinSeparator" or "VertSplit:NvimTreeWinSeparator"
11-
end
12-
137
M.View = {
148
adaptive_size = false,
159
centralize_selection = false,
@@ -38,7 +32,7 @@ M.View = {
3832
"CursorLine:NvimTreeCursorLine",
3933
"CursorLineNr:NvimTreeCursorLineNr",
4034
"LineNr:NvimTreeLineNr",
41-
get_win_sep_hl(),
35+
"WinSeparator:NvimTreeWinSeparator",
4236
"StatusLine:NvimTreeStatusLine",
4337
"StatusLineNC:NvimTreeStatuslineNC",
4438
"SignColumn:NvimTreeSignColumn",

0 commit comments

Comments
 (0)