mirror of
https://github.com/neovim/neovim.git
synced 2024-12-19 18:55:14 -07:00
refactor(lua): deprecate tbl_flatten
Problem: Besides being redundant with vim.iter():flatten(), `tbl_flatten` has these problems: - Has `tbl_` prefix but only accepts lists. - Discards some results! Compare the following: - iter.flatten(): ``` vim.iter({1, { { a = 2 } }, { 3 } }):flatten():totable() ``` - tbl_flatten: ``` vim.tbl_flatten({1, { { a = 2 } }, { 3 } }) ``` Solution: Deprecate tbl_flatten. Note: iter:flatten() currently fails ("flatten() requires a list-like table") on this code from gen_lsp.lua: local anonym = vim.iter({ -- remove nil anonymous_num > 1 and '' or nil, '---@class ' .. anonymous_classname, }):flatten():totable() Should we enhance :flatten() to work for arrays?
This commit is contained in:
parent
35e38833c5
commit
9912a4c81b
@ -2285,20 +2285,6 @@ vim.tbl_filter({func}, {t}) *vim.tbl_filter()*
|
|||||||
Return: ~
|
Return: ~
|
||||||
(`any[]`) Table of filtered values
|
(`any[]`) Table of filtered values
|
||||||
|
|
||||||
vim.tbl_flatten({t}) *vim.tbl_flatten()*
|
|
||||||
Creates a copy of a list-like table such that any nested tables are
|
|
||||||
"unrolled" and appended to the result.
|
|
||||||
|
|
||||||
Parameters: ~
|
|
||||||
• {t} (`table`) List-like table
|
|
||||||
|
|
||||||
Return: ~
|
|
||||||
(`table`) Flattened copy of the given list-like table
|
|
||||||
|
|
||||||
See also: ~
|
|
||||||
• From
|
|
||||||
https://github.com/premake/premake-core/blob/master/src/base/table.lua
|
|
||||||
|
|
||||||
vim.tbl_get({o}, {...}) *vim.tbl_get()*
|
vim.tbl_get({o}, {...}) *vim.tbl_get()*
|
||||||
Index into a table (first argument) via string keys passed as subsequent
|
Index into a table (first argument) via string keys passed as subsequent
|
||||||
arguments. Return `nil` if the key does not exist.
|
arguments. Return `nil` if the key does not exist.
|
||||||
|
@ -366,14 +366,15 @@ end
|
|||||||
local PATTERNS = { '/autoload/health/*.vim', '/lua/**/**/health.lua', '/lua/**/**/health/init.lua' }
|
local PATTERNS = { '/autoload/health/*.vim', '/lua/**/**/health.lua', '/lua/**/**/health/init.lua' }
|
||||||
--- :checkhealth completion function used by cmdexpand.c get_healthcheck_names()
|
--- :checkhealth completion function used by cmdexpand.c get_healthcheck_names()
|
||||||
M._complete = function()
|
M._complete = function()
|
||||||
local names = vim.tbl_flatten(vim.tbl_map(function(pattern)
|
local unique = vim
|
||||||
return vim.tbl_map(path2name, vim.api.nvim_get_runtime_file(pattern, true))
|
.iter(vim.tbl_map(function(pattern)
|
||||||
end, PATTERNS))
|
return vim.tbl_map(path2name, vim.api.nvim_get_runtime_file(pattern, true))
|
||||||
-- Remove duplicates
|
end, PATTERNS))
|
||||||
local unique = {}
|
:flatten()
|
||||||
vim.tbl_map(function(f)
|
:fold({}, function(t, name)
|
||||||
unique[f] = true
|
t[name] = true -- Remove duplicates
|
||||||
end, names)
|
return t
|
||||||
|
end)
|
||||||
-- vim.health is this file, which is not a healthcheck
|
-- vim.health is this file, which is not a healthcheck
|
||||||
unique['vim'] = nil
|
unique['vim'] = nil
|
||||||
return vim.tbl_keys(unique)
|
return vim.tbl_keys(unique)
|
||||||
|
@ -722,7 +722,7 @@ local wait_result_reason = { [-1] = 'timeout', [-2] = 'interrupted', [-3] = 'err
|
|||||||
---
|
---
|
||||||
--- @param ... string List to write to the buffer
|
--- @param ... string List to write to the buffer
|
||||||
local function err_message(...)
|
local function err_message(...)
|
||||||
local message = table.concat(vim.tbl_flatten({ ... }))
|
local message = table.concat(vim.iter({ ... }):flatten():totable())
|
||||||
if vim.in_fast_event() then
|
if vim.in_fast_event() then
|
||||||
vim.schedule(function()
|
vim.schedule(function()
|
||||||
api.nvim_err_writeln(message)
|
api.nvim_err_writeln(message)
|
||||||
|
@ -12,7 +12,7 @@ local M = {}
|
|||||||
--- Writes to error buffer.
|
--- Writes to error buffer.
|
||||||
---@param ... string Will be concatenated before being written
|
---@param ... string Will be concatenated before being written
|
||||||
local function err_message(...)
|
local function err_message(...)
|
||||||
vim.notify(table.concat(vim.tbl_flatten({ ... })), vim.log.levels.ERROR)
|
vim.notify(table.concat(vim.iter({ ... }):flatten():totable()), vim.log.levels.ERROR)
|
||||||
api.nvim_command('redraw')
|
api.nvim_command('redraw')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -544,6 +544,7 @@ function vim.list_extend(dst, src, start, finish)
|
|||||||
return dst
|
return dst
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--- @deprecated
|
||||||
--- Creates a copy of a list-like table such that any nested tables are
|
--- Creates a copy of a list-like table such that any nested tables are
|
||||||
--- "unrolled" and appended to the result.
|
--- "unrolled" and appended to the result.
|
||||||
---
|
---
|
||||||
|
@ -259,10 +259,13 @@ function M.gen(opt)
|
|||||||
if prefix then
|
if prefix then
|
||||||
anonymous_classname = anonymous_classname .. '.' .. prefix
|
anonymous_classname = anonymous_classname .. '.' .. prefix
|
||||||
end
|
end
|
||||||
local anonym = vim.tbl_flatten { -- remove nil
|
local anonym = vim
|
||||||
anonymous_num > 1 and '' or nil,
|
.iter({
|
||||||
'---@class ' .. anonymous_classname,
|
(anonymous_num > 1 and { '' } or {}),
|
||||||
}
|
{ '---@class ' .. anonymous_classname },
|
||||||
|
})
|
||||||
|
:flatten()
|
||||||
|
:totable()
|
||||||
|
|
||||||
--- @class vim._gen_lsp.StructureLiteral translated to anonymous @class.
|
--- @class vim._gen_lsp.StructureLiteral translated to anonymous @class.
|
||||||
--- @field deprecated? string
|
--- @field deprecated? string
|
||||||
|
@ -54,7 +54,7 @@ describe('fileio', function()
|
|||||||
--- Starts a new nvim session and returns an attached screen.
|
--- Starts a new nvim session and returns an attached screen.
|
||||||
local function startup(extra_args)
|
local function startup(extra_args)
|
||||||
extra_args = extra_args or {}
|
extra_args = extra_args or {}
|
||||||
local argv = vim.tbl_flatten({ args, '--embed', extra_args })
|
local argv = vim.iter({ args, '--embed', extra_args }):flatten():totable()
|
||||||
local screen_nvim = spawn(argv)
|
local screen_nvim = spawn(argv)
|
||||||
set_session(screen_nvim)
|
set_session(screen_nvim)
|
||||||
local screen = Screen.new(70, 10)
|
local screen = Screen.new(70, 10)
|
||||||
@ -100,7 +100,7 @@ describe('fileio', function()
|
|||||||
eq('foozubbaz', trim(read_file('Xtest_startup_file1')))
|
eq('foozubbaz', trim(read_file('Xtest_startup_file1')))
|
||||||
|
|
||||||
-- 4. Exit caused by deadly signal (+ 'swapfile').
|
-- 4. Exit caused by deadly signal (+ 'swapfile').
|
||||||
local j = fn.jobstart(vim.tbl_flatten({ args, '--embed' }), { rpc = true })
|
local j = fn.jobstart(vim.iter({ args, '--embed' }):flatten():totable(), { rpc = true })
|
||||||
fn.rpcrequest(
|
fn.rpcrequest(
|
||||||
j,
|
j,
|
||||||
'nvim_exec2',
|
'nvim_exec2',
|
||||||
|
Loading…
Reference in New Issue
Block a user