aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiley Bruins <ribru17@hotmail.com>2023-12-30 21:08:07 -0800
committerLewis Russell <me@lewisr.dev>2024-03-10 23:20:26 +0000
commit09a919f313ec8ae691798e45ee459a4467ce5d6a (patch)
tree82e7f737ea22b6a570a6efa69185e6e0be809bd1
parent47942db30780b22774e810e1d0ade96bb6ba2da4 (diff)
downloadrneovim-09a919f313ec8ae691798e45ee459a4467ce5d6a.tar.gz
rneovim-09a919f313ec8ae691798e45ee459a4467ce5d6a.tar.bz2
rneovim-09a919f313ec8ae691798e45ee459a4467ce5d6a.zip
docs: more accurate typing for vim.tbl_extend
-rw-r--r--runtime/doc/lua.txt8
-rw-r--r--runtime/lua/vim/shared.lua4
2 files changed, 6 insertions, 6 deletions
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 367b5c36d2..89f62126bb 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2190,8 +2190,8 @@ vim.tbl_deep_extend({behavior}, {...}) *vim.tbl_deep_extend()*
Merges recursively two or more tables.
Parameters: ~
- • {behavior} (`"error"|"keep"|"force"`) (string) Decides what to do if
- a key is found in more than one map:
+ • {behavior} (`'error'|'keep'|'force'`) Decides what to do if a key is
+ found in more than one map:
• "error": raise an error
• "keep": use value from the leftmost map
• "force": use value from the rightmost map
@@ -2207,8 +2207,8 @@ vim.tbl_extend({behavior}, {...}) *vim.tbl_extend()*
Merges two or more tables.
Parameters: ~
- • {behavior} (`string`) Decides what to do if a key is found in more
- than one map:
+ • {behavior} (`'error'|'keep'|'force'`) Decides what to do if a key is
+ found in more than one map:
• "error": raise an error
• "keep": use value from the leftmost map
• "force": use value from the rightmost map
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index bd553598c7..a9eebf36da 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -402,7 +402,7 @@ end
---
---@see |extend()|
---
----@param behavior string Decides what to do if a key is found in more than one map:
+---@param behavior 'error'|'keep'|'force' Decides what to do if a key is found in more than one map:
--- - "error": raise an error
--- - "keep": use value from the leftmost map
--- - "force": use value from the rightmost map
@@ -418,7 +418,7 @@ end
---
---@generic T1: table
---@generic T2: table
----@param behavior "error"|"keep"|"force" (string) Decides what to do if a key is found in more than one map:
+---@param behavior 'error'|'keep'|'force' Decides what to do if a key is found in more than one map:
--- - "error": raise an error
--- - "keep": use value from the leftmost map
--- - "force": use value from the rightmost map