Skip to content

Commit

Permalink
refactor(lua): rename tbl_isarray => isarray
Browse files Browse the repository at this point in the history
tbl_isarray was not released yet, so it will not go through
a deprecation cycle.

ref #24572
  • Loading branch information
justinmk committed Apr 21, 2024
1 parent d9d8905 commit 5c8dfb0
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 41 deletions.
2 changes: 1 addition & 1 deletion runtime/doc/deprecated.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ LUA
- vim.register_keystroke_callback() Use |vim.on_key()| instead.
- *vim.pretty_print()* Use |vim.print()| instead.
- *vim.loop* Use |vim.uv| instead.
- *vim.tbl_islist()* Use |vim.islist()| instead.
- *vim.tbl_add_reverse_lookup()*
- *vim.tbl_islist()* Use |vim.islist()| instead.

NORMAL COMMANDS
- *]f* *[f* Same as "gf".
Expand Down
42 changes: 21 additions & 21 deletions runtime/doc/lua.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2029,6 +2029,26 @@ vim.is_callable({f}) *vim.is_callable()*
Return: ~
(`boolean`) `true` if `f` is callable, else `false`

vim.isarray({t}) *vim.isarray()*
Tests if `t` is an "array": a table indexed only by integers (potentially
non-contiguous).

If the indexes start from 1 and are contiguous then the array is also a
list. |vim.islist()|

Empty table `{}` is an array, unless it was created by |vim.empty_dict()|
or returned as a dict-like |API| or Vimscript result, for example from
|rpcrequest()| or |vim.fn|.

Parameters: ~
{t} (`table?`)

Return: ~
(`boolean`) `true` if array-like table, else `false`.

See also: ~
https://github.com/openresty/luajit2#tableisarray

vim.islist({t}) *vim.islist()*
Tests if `t` is a "list": a table indexed only by contiguous integers
starting from 1 (what |lua-length| calls a "regular array").
Expand All @@ -2044,7 +2064,7 @@ vim.islist({t}) *vim.islist()*
(`boolean`) `true` if list-like table, else `false`.

See also: ~
|vim.tbl_isarray()|
|vim.isarray()|

vim.list_contains({t}, {value}) *vim.list_contains()*
Checks if a list-like table (integer keys without gaps) contains `value`.
Expand Down Expand Up @@ -2296,26 +2316,6 @@ vim.tbl_get({o}, {...}) *vim.tbl_get()*
Return: ~
(`any`) Nested value indexed by key (if it exists), else nil

vim.tbl_isarray({t}) *vim.tbl_isarray()*
Tests if `t` is an "array": a table indexed only by integers (potentially
non-contiguous).

If the indexes start from 1 and are contiguous then the array is also a
list. |vim.islist()|

Empty table `{}` is an array, unless it was created by |vim.empty_dict()|
or returned as a dict-like |API| or Vimscript result, for example from
|rpcrequest()| or |vim.fn|.

Parameters: ~
{t} (`table`)

Return: ~
(`boolean`) `true` if array-like table, else `false`.

See also: ~
https://github.com/openresty/luajit2#tableisarray

vim.tbl_isempty({t}) *vim.tbl_isempty()*
Checks if a table is empty.

Expand Down
6 changes: 3 additions & 3 deletions runtime/doc/news.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The following changes may require adaptations in user config or plugins.
|vim.islist()| now checks whether a table is actually list-like (i.e.,
has integer keys without gaps and starting from 1). For the previous
behavior (only check for integer keys, allow gaps or not starting with 1),
use |vim.tbl_isarray()|.
use |vim.isarray()|.

• "#" followed by a digit no longer stands for a function key at the start of
the lhs of a mapping.
Expand Down Expand Up @@ -155,7 +155,7 @@ unreleased features on Nvim HEAD.

• Removed vim.iter.map(), vim.iter.filter(), vim.iter.totable().

• Renamed vim.tbl_islist() to vim.islist().
• Renamed vim.tbl_isarray() to vim.isarray().

==============================================================================
NEW FEATURES *news-features*
Expand Down Expand Up @@ -563,7 +563,7 @@ release.
populated. Background color detection is now performed in Lua by the Nvim
core, not the TUI.

vim.shared functions:
Lua stdlib:
- |vim.tbl_add_reverse_lookup()|
- |vim.tbl_islist()|

Expand Down
16 changes: 11 additions & 5 deletions runtime/lua/vim/shared.lua
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ end

--- We only merge empty tables or tables that are not an array (indexed by integers)
local function can_merge(v)
return type(v) == 'table' and (vim.tbl_isempty(v) or not vim.tbl_isarray(v))
return type(v) == 'table' and (vim.tbl_isempty(v) or not vim.isarray(v))
end

local function tbl_extend(behavior, deep_extend, ...)
Expand Down Expand Up @@ -502,7 +502,7 @@ end
---
---@param o table Table to index
---@param ... any Optional keys (0 or more, variadic) via which to index the table
---@return any : Nested value indexed by key (if it exists), else nil
---@return any # Nested value indexed by key (if it exists), else nil
function vim.tbl_get(o, ...)
local keys = { ... }
if #keys == 0 then
Expand Down Expand Up @@ -599,6 +599,12 @@ function vim.spairs(t)
t
end

--- @deprecated
function vim.tbl_isarray()
vim.deprecate('vim.tbl_isarray', 'vim.isarray', '0.10-dev')
error('vim.tbl_isarray was renamed to vim.isarray')
end

--- Tests if `t` is an "array": a table indexed _only_ by integers (potentially non-contiguous).
---
--- If the indexes start from 1 and are contiguous then the array is also a list. |vim.islist()|
Expand All @@ -608,9 +614,9 @@ end
---
---@see https://github.com/openresty/luajit2#tableisarray
---
---@param t table
---@param t? table
---@return boolean `true` if array-like table, else `false`.
function vim.tbl_isarray(t)
function vim.isarray(t)
if type(t) ~= 'table' then
return false
end
Expand Down Expand Up @@ -652,7 +658,7 @@ end
--- Empty table `{}` is a list, unless it was created by |vim.empty_dict()| or returned as
--- a dict-like |API| or Vimscript result, for example from |rpcrequest()| or |vim.fn|.
---
---@see |vim.tbl_isarray()|
---@see |vim.isarray()|
---
---@param t? table
---@return boolean `true` if list-like table, else `false`.
Expand Down
22 changes: 11 additions & 11 deletions test/functional/lua/vim_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -825,17 +825,17 @@ describe('lua stdlib', function()
)
end)

it('vim.tbl_isarray', function()
eq(true, exec_lua('return vim.tbl_isarray({})'))
eq(false, exec_lua('return vim.tbl_isarray(vim.empty_dict())'))
eq(true, exec_lua("return vim.tbl_isarray({'a', 'b', 'c'})"))
eq(false, exec_lua("return vim.tbl_isarray({'a', '32', a='hello', b='baz'})"))
eq(false, exec_lua("return vim.tbl_isarray({1, a='hello', b='baz'})"))
eq(false, exec_lua("return vim.tbl_isarray({a='hello', b='baz', 1})"))
eq(false, exec_lua("return vim.tbl_isarray({1, 2, nil, a='hello'})"))
eq(true, exec_lua('return vim.tbl_isarray({1, 2, nil, 4})'))
eq(true, exec_lua('return vim.tbl_isarray({nil, 2, 3, 4})'))
eq(false, exec_lua('return vim.tbl_isarray({1, [1.5]=2, [3]=3})'))
it('vim.isarray', function()
eq(true, exec_lua('return vim.isarray({})'))
eq(false, exec_lua('return vim.isarray(vim.empty_dict())'))
eq(true, exec_lua("return vim.isarray({'a', 'b', 'c'})"))
eq(false, exec_lua("return vim.isarray({'a', '32', a='hello', b='baz'})"))
eq(false, exec_lua("return vim.isarray({1, a='hello', b='baz'})"))
eq(false, exec_lua("return vim.isarray({a='hello', b='baz', 1})"))
eq(false, exec_lua("return vim.isarray({1, 2, nil, a='hello'})"))
eq(true, exec_lua('return vim.isarray({1, 2, nil, 4})'))
eq(true, exec_lua('return vim.isarray({nil, 2, 3, 4})'))
eq(false, exec_lua('return vim.isarray({1, [1.5]=2, [3]=3})'))
end)

it('vim.islist', function()
Expand Down

0 comments on commit 5c8dfb0

Please sign in to comment.