fix(vim.ui)!: change open() to return result|nil, errmsg|nil #28612

reverts e0d92b9cc2 #28502

Problem:
`vim.ui.open()` has a `pcall()` like signature, under the assumption
that this is the Lua idiom for returning result-or-error. However, the
`result|nil, errmsg|nil` pattern:
- has precedent in:
  - `io.open`
  - `vim.uv` (`:help luv-error-handling`)
- has these advantages:
  - Can be used with `assert()`:
    ```
    local result, err = assert(foobar())
    ```
  - Allows LuaLS to infer the type of `result`:
    ```
    local result, err = foobar()
    if err then
      ...
    elseif result then
      ...
    end
    ```

Solution:
- Revert to the `result|nil, errmsg|nil` pattern.
- Document the pattern in our guidelines.
This commit is contained in:
Justin M. Keyes
2024-05-03 03:20:03 -07:00
committed by GitHub
parent d44ed3a885
commit 40ce857797
7 changed files with 28 additions and 24 deletions

View File

@ -309,6 +309,11 @@ See also |dev-naming|.
- return iterable instead of table - return iterable instead of table
- mimic the pairs() or ipairs() interface if the function is intended to be - mimic the pairs() or ipairs() interface if the function is intended to be
used in a "for" loop. used in a "for" loop.
- when a result-or-error interface is needed, return `result|nil, errmsg|nil`: >
---@return Foo|nil # Result object, or nil if not found.
---@return nil|string # Error message on failure, or nil on success.
<
- Examples: |vim.ui.open()| |io.open()| |luv-error-handling|
Interface conventions ~ Interface conventions ~

View File

@ -2551,8 +2551,8 @@ vim.ui.open({path}) *vim.ui.open()*
vim.ui.open("https://neovim.io/") vim.ui.open("https://neovim.io/")
vim.ui.open("~/path/to/file") vim.ui.open("~/path/to/file")
-- Synchronous (wait until the process exits). -- Synchronous (wait until the process exits).
local ok, cmd = vim.ui.open("$VIMRUNTIME") local cmd, err = vim.ui.open("$VIMRUNTIME")
if ok then if cmd then
cmd:wait() cmd:wait()
end end
< <
@ -2561,8 +2561,8 @@ vim.ui.open({path}) *vim.ui.open()*
• {path} (`string`) Path or URL to open • {path} (`string`) Path or URL to open
Return (multiple): ~ Return (multiple): ~
(`boolean`) false if command not found, else true. (`vim.SystemObj?`) Command object, or nil if not found.
(`vim.SystemObj|string`) Command object, or error message on failure (`string?`) Error message on failure, or nil on success.
See also: ~ See also: ~
• |vim.system()| • |vim.system()|

View File

@ -163,7 +163,7 @@ cycle (Nvim HEAD, the "master" branch).
• Renamed vim.tbl_isarray() to vim.isarray(). • Renamed vim.tbl_isarray() to vim.isarray().
• Changed |vim.ui.open()| return-signature to match pcall() convention. • Changed |vim.ui.open()| return-signature to match `result|nil, errormsg|nil` convention.
• Renamed Iter:nextback() to Iter:pop() • Renamed Iter:nextback() to Iter:pop()

View File

@ -98,19 +98,18 @@ do
--- Map |gx| to call |vim.ui.open| on the <cfile> at cursor. --- Map |gx| to call |vim.ui.open| on the <cfile> at cursor.
do do
local function do_open(uri) local function do_open(uri)
local ok, cmd_or_err = vim.ui.open(uri) local cmd, err = vim.ui.open(uri)
local rv = ok and (cmd_or_err --[[@as vim.SystemObj]]):wait(1000) or nil local rv = cmd and cmd:wait(1000) or nil
if rv and rv.code ~= 0 then if cmd and rv and rv.code ~= 0 then
ok = false err = ('vim.ui.open: command %s (%d): %s'):format(
cmd_or_err = ('vim.ui.open: command %s (%d): %s'):format(
(rv.code == 124 and 'timeout' or 'failed'), (rv.code == 124 and 'timeout' or 'failed'),
rv.code, rv.code,
vim.inspect(cmd_or_err.cmd) vim.inspect(cmd.cmd)
) )
end end
if not ok then if err then
vim.notify(cmd_or_err --[[@as string]], vim.log.levels.ERROR) vim.notify(err, vim.log.levels.ERROR)
end end
end end

View File

@ -654,15 +654,15 @@ M[ms.window_showDocument] = function(_, result, ctx, _)
if result.external then if result.external then
-- TODO(lvimuser): ask the user for confirmation -- TODO(lvimuser): ask the user for confirmation
local ok, cmd_or_err = vim.ui.open(uri) local cmd, err = vim.ui.open(uri)
local ret = ok and (cmd_or_err --[[@as vim.SystemObj]]):wait(2000) or nil local ret = cmd and cmd:wait(2000) or nil
if ret == nil or ret.code ~= 0 then if ret == nil or ret.code ~= 0 then
return { return {
success = false, success = false,
error = { error = {
code = protocol.ErrorCodes.UnknownErrorCode, code = protocol.ErrorCodes.UnknownErrorCode,
message = ret and ret.stderr or cmd_or_err, message = ret and ret.stderr or err,
}, },
} }
end end

View File

@ -118,16 +118,16 @@ end
--- vim.ui.open("https://neovim.io/") --- vim.ui.open("https://neovim.io/")
--- vim.ui.open("~/path/to/file") --- vim.ui.open("~/path/to/file")
--- -- Synchronous (wait until the process exits). --- -- Synchronous (wait until the process exits).
--- local ok, cmd = vim.ui.open("$VIMRUNTIME") --- local cmd, err = vim.ui.open("$VIMRUNTIME")
--- if ok then --- if cmd then
--- cmd:wait() --- cmd:wait()
--- end --- end
--- ``` --- ```
--- ---
---@param path string Path or URL to open ---@param path string Path or URL to open
--- ---
---@return boolean # false if command not found, else true. ---@return vim.SystemObj|nil # Command object, or nil if not found.
---@return vim.SystemObj|string # Command object, or error message on failure ---@return nil|string # Error message on failure, or nil on success.
--- ---
---@see |vim.system()| ---@see |vim.system()|
function M.open(path) function M.open(path)
@ -147,7 +147,7 @@ function M.open(path)
if vim.fn.executable('rundll32') == 1 then if vim.fn.executable('rundll32') == 1 then
cmd = { 'rundll32', 'url.dll,FileProtocolHandler', path } cmd = { 'rundll32', 'url.dll,FileProtocolHandler', path }
else else
return false, 'vim.ui.open: rundll32 not found' return nil, 'vim.ui.open: rundll32 not found'
end end
elseif vim.fn.executable('wslview') == 1 then elseif vim.fn.executable('wslview') == 1 then
cmd = { 'wslview', path } cmd = { 'wslview', path }
@ -156,10 +156,10 @@ function M.open(path)
elseif vim.fn.executable('xdg-open') == 1 then elseif vim.fn.executable('xdg-open') == 1 then
cmd = { 'xdg-open', path } cmd = { 'xdg-open', path }
else else
return false, 'vim.ui.open: no handler found (tried: wslview, explorer.exe, xdg-open)' return nil, 'vim.ui.open: no handler found (tried: wslview, explorer.exe, xdg-open)'
end end
return true, vim.system(cmd, { text = true, detach = true }) return vim.system(cmd, { text = true, detach = true }), nil
end end
return M return M

View File

@ -144,7 +144,7 @@ describe('vim.ui', function()
end end
if not is_os('bsd') then if not is_os('bsd') then
local rv = local rv =
exec_lua [[local _, cmd = vim.ui.open('non-existent-file'); return cmd:wait(100).code]] exec_lua [[local cmd = vim.ui.open('non-existent-file'); return cmd:wait(100).code]]
ok(type(rv) == 'number' and rv ~= 0, 'nonzero exit code', rv) ok(type(rv) == 'number' and rv ~= 0, 'nonzero exit code', rv)
end end