diff options
| -rw-r--r-- | runtime/lua/man.lua | 9 | ||||
| -rw-r--r-- | test/functional/plugin/man_spec.lua | 10 | ||||
| -rw-r--r-- | test/testutil.lua | 11 |
3 files changed, 27 insertions, 3 deletions
diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua index 114c94f9e5..bf2cc477fd 100644 --- a/runtime/lua/man.lua +++ b/runtime/lua/man.lua @@ -21,9 +21,12 @@ end local function system(cmd, silent, env) local r = vim.system(cmd, { env = env, timeout = 10000 }):wait() - if r.code ~= 0 and not silent then - local cmd_str = table.concat(cmd, ' ') - man_error(string.format("command error '%s': %s", cmd_str, r.stderr)) + if not silent then + if r.code ~= 0 then + local cmd_str = table.concat(cmd, ' ') + man_error(string.format("command error '%s': %s", cmd_str, r.stderr)) + end + assert(r.stdout ~= '') end return assert(r.stdout) diff --git a/test/functional/plugin/man_spec.lua b/test/functional/plugin/man_spec.lua index 8906e60dce..e3f3de6252 100644 --- a/test/functional/plugin/man_spec.lua +++ b/test/functional/plugin/man_spec.lua @@ -263,4 +263,14 @@ describe(':Man', function() { '1', 'other_man' }, }, get_search_history('other_man(1)')) end) + + it('can complete', function() + t.skip(t.is_os('mac') and t.is_arch('x86_64'), 'not supported on intel mac') + eq( + true, + exec_lua(function() + return #require('man').man_complete('f', 'Man g') > 0 + end) + ) + end) end) diff --git a/test/testutil.lua b/test/testutil.lua index 00b30d74d5..007e017ac6 100644 --- a/test/testutil.lua +++ b/test/testutil.lua @@ -409,6 +409,17 @@ function M.is_os(s) ) end +local architecture = uv.os_uname().machine + +--- @param s 'x86_64'|'arm64' +--- @return boolean +function M.is_arch(s) + if not (s == 'x86_64' or s == 'arm64') then + error('unknown architecture: ' .. tostring(s)) + end + return s == architecture +end + local tmpname_id = 0 local tmpdir = os.getenv('TMPDIR') or os.getenv('TEMP') local tmpdir_is_local = not not (tmpdir and tmpdir:find('Xtest')) |