From 6f32711d762bfeeedc8203a752c1e84ff2acd45a Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 17 May 2024 20:02:19 +0200 Subject: [PATCH] fixup: adapt to deprecations in Nvim 0.10 (#3113) 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 0c12735d5aff6a48ffd8111bf144dc2ff44e5975) --- lua/telescope/utils.lua | 2 +- plugin/telescope.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/telescope/utils.lua b/lua/telescope/utils.lua index 655508372a..e3fb05c3ec 100644 --- a/lua/telescope/utils.lua +++ b/lua/telescope/utils.lua @@ -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()` --- diff --git a/plugin/telescope.lua b/plugin/telescope.lua index 6a670bc38a..982e9d84c6 100644 --- a/plugin/telescope.lua +++ b/plugin/telescope.lua @@ -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)