Skip to content

Commit

Permalink
fixup: adapt to deprecations in Nvim 0.10 (#3113)
Browse files Browse the repository at this point in the history
vim.iter.flatten() is not a full replacement (does not support arrays
with `nil`); a fix may be backported but for now only use it on nightly
(0.10 has no warnings yet).

(cherry picked from commit 0c12735)
  • Loading branch information
clason authored and Conni2461 committed May 20, 2024
1 parent a3a7f4c commit 6f32711
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lua/telescope/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ utils.islist = vim.fn.has "nvim-0.10" == 1 and vim.islist or vim.tbl_islist
local flatten = function(t)
return vim.iter(t):flatten():totable()
end
utils.flatten = vim.fn.has "nvim-0.10" == 1 and flatten or vim.tbl_flatten
utils.flatten = vim.fn.has "nvim-0.11" == 1 and flatten or vim.tbl_flatten

--- Hybrid of `vim.fn.expand()` and custom `vim.fs.normalize()`
---
Expand Down
2 changes: 1 addition & 1 deletion plugin/telescope.lua
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ end, {
if n == 0 then
local commands = { builtin_list, extensions_list }
-- TODO(clason): remove when dropping support for Nvim 0.9
if vim.fn.has "nvim-0.10" == 1 then
if vim.fn.has "nvim-0.11" == 1 then
commands = vim.iter(commands):flatten():totable()
else
commands = vim.tbl_flatten(commands)
Expand Down

0 comments on commit 6f32711

Please sign in to comment.