Skip to content

Commit c7add15

Browse files
committed
refactor(#2787): replace deprecated
1 parent 146a687 commit c7add15

File tree

1 file changed

+26
-6
lines changed

1 file changed

+26
-6
lines changed

lua/nvim-tree/actions/node/open-file.lua

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,29 @@ local function pick_win_id()
116116
-- Setup UI
117117
for _, id in ipairs(selectable) do
118118
local char = M.window_picker.chars:sub(i, i)
119-
local ok_status, statusline = pcall(vim.api.nvim_win_get_option, id, "statusline")
120-
local ok_hl, winhl = pcall(vim.api.nvim_win_get_option, id, "winhl")
119+
120+
local ok_status, statusline, ok_hl, winhl
121+
if vim.fn.has "nvim-0.10" == 1 then
122+
ok_status, statusline = pcall(vim.api.nvim_get_option_value, "statusline", { win = id })
123+
ok_hl, winhl = pcall(vim.api.nvim_get_option_value, "winhl", { win = id })
124+
else
125+
ok_status, statusline = pcall(vim.api.nvim_win_get_option, id, "statusline") ---@diagnostic disable-line: deprecated
126+
ok_hl, winhl = pcall(vim.api.nvim_win_get_option, id, "winhl") ---@diagnostic disable-line: deprecated
127+
end
121128

122129
win_opts[id] = {
123130
statusline = ok_status and statusline or "",
124131
winhl = ok_hl and winhl or "",
125132
}
126133
win_map[char] = id
127134

128-
vim.api.nvim_win_set_option(id, "statusline", "%=" .. char .. "%=")
129-
vim.api.nvim_win_set_option(id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker")
135+
if vim.fn.has "nvim-0.10" == 1 then
136+
vim.api.nvim_set_option_value("statusline", "%=" .. char .. "%=", { win = id })
137+
vim.api.nvim_set_option_value("winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker", { win = id })
138+
else
139+
vim.api.nvim_win_set_option(id, "statusline", "%=" .. char .. "%=") ---@diagnostic disable-line: deprecated
140+
vim.api.nvim_win_set_option(id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker") ---@diagnostic disable-line: deprecated
141+
end
130142

131143
i = i + 1
132144
if i > #M.window_picker.chars then
@@ -145,14 +157,22 @@ local function pick_win_id()
145157
-- Restore window options
146158
for _, id in ipairs(selectable) do
147159
for opt, value in pairs(win_opts[id]) do
148-
vim.api.nvim_win_set_option(id, opt, value)
160+
if vim.fn.has "nvim-0.10" == 1 then
161+
vim.api.nvim_set_option_value(opt, value, { win = id })
162+
else
163+
vim.api.nvim_win_set_option(id, opt, value) ---@diagnostic disable-line: deprecated
164+
end
149165
end
150166
end
151167

152168
if laststatus == 3 then
153169
for _, id in ipairs(not_selectable) do
154170
for opt, value in pairs(win_opts[id]) do
155-
vim.api.nvim_win_set_option(id, opt, value)
171+
if vim.fn.has "nvim-0.10" == 1 then
172+
vim.api.nvim_set_option_value(opt, value, { win = id })
173+
else
174+
vim.api.nvim_win_set_option(id, opt, value) ---@diagnostic disable-line: deprecated
175+
end
156176
end
157177
end
158178
end

0 commit comments

Comments
 (0)