aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim/ui.lua
diff options
context:
space:
mode:
authorJongwook Choi <wookayin@gmail.com>2022-11-07 19:15:15 -0500
committerGitHub <noreply@github.com>2022-11-08 08:15:15 +0800
commit59ff4691f67fc1ddd3d1b7240a2f2eb095e58281 (patch)
tree09f43712485108b3770891986a1c1ffc015c85a0 /runtime/lua/vim/ui.lua
parent8147d3df284a075f89746f9d5e948b5220c45f0b (diff)
downloadrneovim-59ff4691f67fc1ddd3d1b7240a2f2eb095e58281.tar.gz
rneovim-59ff4691f67fc1ddd3d1b7240a2f2eb095e58281.tar.bz2
rneovim-59ff4691f67fc1ddd3d1b7240a2f2eb095e58281.zip
fix(vim.ui.input): return empty string when inputs nothing (#20883)
fix(vim.ui.input): return empty string when inputs nothing The previous behavior of `vim.ui.input()` when typing <CR> with no text input (with an intention of having the empty string as input) was to execute `on_confirm(nil)`, conflicting with its documentation. Inputting an empty string should now correctly execute `on_confirm('')`. This should be clearly distinguished from cancelling or aborting the input UI, in which case `on_confirm(nil)` is executed as before.
Diffstat (limited to 'runtime/lua/vim/ui.lua')
-rw-r--r--runtime/lua/vim/ui.lua15
1 files changed, 11 insertions, 4 deletions
diff --git a/runtime/lua/vim/ui.lua b/runtime/lua/vim/ui.lua
index 6f1ce3089d..d9a3963afc 100644
--- a/runtime/lua/vim/ui.lua
+++ b/runtime/lua/vim/ui.lua
@@ -73,7 +73,8 @@ end
--- user inputs.
---@param on_confirm function ((input|nil) -> ())
--- Called once the user confirms or abort the input.
---- `input` is what the user typed.
+--- `input` is what the user typed (it might be
+--- an empty string if nothing was entered), or
--- `nil` if the user aborted the dialog.
---
--- Example:
@@ -88,11 +89,17 @@ function M.input(opts, on_confirm)
})
opts = (opts and not vim.tbl_isempty(opts)) and opts or vim.empty_dict()
+
+ -- Note that vim.fn.input({}) returns an empty string when cancelled.
+ -- vim.ui.input() should distinguish aborting from entering an empty string.
+ local _canceled = vim.NIL
+ opts = vim.tbl_extend('keep', opts, { cancelreturn = _canceled })
+
local input = vim.fn.input(opts)
- if #input > 0 then
- on_confirm(input)
- else
+ if input == _canceled then
on_confirm(nil)
+ else
+ on_confirm(input)
end
end