Merge remote-tracking branch 'upstream/master' into fix_repeatcmdline

1 files changed, 140 insertions, 112 deletions

diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index 732a4ab92e..dcdfc2b87f 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -2,6 +2,8 @@ local api, fn = vim.api, vim.fn
 
 local FIND_ARG = '-w'
 local localfile_arg = true -- Always use -l if possible. #6683
+
+---@type table[]
 local buf_hls = {}
 
 local M = {}
@@ -12,83 +14,32 @@ local function man_error(msg)
 end
 
 -- Run a system command and timeout after 30 seconds.
-local function system(cmd_, silent, env)
-  local stdout_data = {}
-  local stderr_data = {}
-  local stdout = vim.loop.new_pipe(false)
-  local stderr = vim.loop.new_pipe(false)
-
-  local done = false
-  local exit_code
-
-  -- We use the `env` command here rather than the env option to vim.loop.spawn since spawn will
-  -- completely overwrite the environment when we just want to modify the existing one.
-  --
-  -- Overwriting mainly causes problems NixOS which relies heavily on a non-standard environment.
-  local cmd
-  if env then
-    cmd = { 'env' }
-    vim.list_extend(cmd, env)
-    vim.list_extend(cmd, cmd_)
-  else
-    cmd = cmd_
-  end
-
-  local handle
-  handle = vim.loop.spawn(cmd[1], {
-    args = vim.list_slice(cmd, 2),
-    stdio = { nil, stdout, stderr },
-  }, function(code)
-    exit_code = code
-    stdout:close()
-    stderr:close()
-    handle:close()
-    done = true
-  end)
-
-  if handle then
-    stdout:read_start(function(_, data)
-      stdout_data[#stdout_data + 1] = data
-    end)
-    stderr:read_start(function(_, data)
-      stderr_data[#stderr_data + 1] = data
-    end)
-  else
-    stdout:close()
-    stderr:close()
-    if not silent then
-      local cmd_str = table.concat(cmd, ' ')
-      man_error(string.format('command error: %s', cmd_str))
-    end
-  end
-
-  vim.wait(30000, function()
-    return done
-  end)
-
-  if not done then
-    if handle then
-      handle:close()
-      stdout:close()
-      stderr:close()
-    end
-    local cmd_str = table.concat(cmd, ' ')
-    man_error(string.format('command timed out: %s', cmd_str))
-  end
-
-  if exit_code ~= 0 and not silent then
+---@param cmd string[]
+---@param silent boolean?
+---@param env? table<string,string|number>
+---@return string
+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, table.concat(stderr_data)))
+    man_error(string.format("command error '%s': %s", cmd_str, r.stderr))
   end
 
-  return table.concat(stdout_data)
+  return assert(r.stdout)
 end
 
+---@param line string
+---@param linenr integer
 local function highlight_line(line, linenr)
+  ---@type string[]
   local chars = {}
   local prev_char = ''
   local overstrike, escape = false, false
+
+  ---@type table<integer,{attr:integer,start:integer,final:integer}>
   local hls = {} -- Store highlight groups as { attr, start, final }
+
   local NONE, BOLD, UNDERLINE, ITALIC = 0, 1, 2, 3
   local hl_groups = { [BOLD] = 'manBold', [UNDERLINE] = 'manUnderline', [ITALIC] = 'manItalic' }
   local attr = NONE
@@ -149,15 +100,21 @@ local function highlight_line(line, linenr)
     if overstrike then
       local last_hl = hls[#hls]
       if char == prev_char then
-        if char == '_' and attr == UNDERLINE and last_hl and last_hl.final == byte then
-          -- This underscore is in the middle of an underlined word
-          attr = UNDERLINE
+        if char == '_' and attr == ITALIC and last_hl and last_hl.final == byte then
+          -- This underscore is in the middle of an italic word
+          attr = ITALIC
         else
           attr = BOLD
         end
       elseif prev_char == '_' then
-        -- char is underlined
-        attr = UNDERLINE
+        -- Even though underline is strictly what this should be. <bs>_ was used by nroff to
+        -- indicate italics which wasn't possible on old typewriters so underline was used. Modern
+        -- terminals now support italics so lets use that now.
+        -- See:
+        -- - https://unix.stackexchange.com/questions/274658/purpose-of-ascii-text-with-overstriking-file-format/274795#274795
+        -- - https://cmd.inp.nsk.su/old/cmd2/manuals/unix/UNIX_Unleashed/ch08.htm
+        -- attr = UNDERLINE
+        attr = ITALIC
       elseif prev_char == '+' and char == 'o' then
         -- bullet (overstrike text '+^Ho')
         attr = BOLD
@@ -188,11 +145,12 @@ local function highlight_line(line, linenr)
       -- We only want to match against SGR sequences, which consist of ESC
       -- followed by '[', then a series of parameter and intermediate bytes in
       -- the range 0x20 - 0x3f, then 'm'. (See ECMA-48, sections 5.4 & 8.3.117)
+      ---@type string?
       local sgr = prev_char:match('^%[([\032-\063]*)m$')
       -- Ignore escape sequences with : characters, as specified by ITU's T.416
       -- Open Document Architecture and interchange format.
       if sgr and not string.find(sgr, ':') then
-        local match
+        local match ---@type string?
         while sgr and #sgr > 0 do
           -- Match against SGR parameters, which may be separated by ';'
           match, sgr = sgr:match('^(%d*);?(.*)')
@@ -255,11 +213,16 @@ end
 -- intended for PostgreSQL, which has man pages like 'CREATE_TABLE(7)';
 -- while editing SQL source code, it's nice to visually select 'CREATE TABLE'
 -- and hit 'K', which requires this transformation
+---@param str string
+---@return string
 local function spaces_to_underscores(str)
   local res = str:gsub('%s', '_')
   return res
 end
 
+---@param sect string|nil
+---@param name string|nil
+---@param silent boolean
 local function get_path(sect, name, silent)
   name = name or ''
   sect = sect or ''
@@ -281,7 +244,7 @@ local function get_path(sect, name, silent)
   --
   -- Finally, we can avoid relying on -S or -s here since they are very
   -- inconsistently supported. Instead, call -w with a section and a name.
-  local cmd
+  local cmd ---@type string[]
   if sect == '' then
     cmd = { 'man', FIND_ARG, name }
   else
@@ -289,7 +252,7 @@ local function get_path(sect, name, silent)
   end
 
   local lines = system(cmd, silent)
-  local results = vim.split(lines or {}, '\n', { trimempty = true })
+  local results = vim.split(lines, '\n', { trimempty = true })
 
   if #results == 0 then
     return
@@ -304,12 +267,15 @@ local function get_path(sect, name, silent)
   end
 
   -- find any that match the specified name
+  ---@param v string
   local namematches = vim.tbl_filter(function(v)
-    return fn.fnamemodify(v, ':t'):match(name)
+    local tail = fn.fnamemodify(v, ':t')
+    return string.find(tail, name, 1, true)
   end, results) or {}
   local sectmatches = {}
 
   if #namematches > 0 and sect ~= '' then
+    ---@param v string
     sectmatches = vim.tbl_filter(function(v)
       return fn.fnamemodify(v, ':e') == sect
     end, namematches)
@@ -318,9 +284,12 @@ local function get_path(sect, name, silent)
   return fn.substitute(sectmatches[1] or namematches[1] or results[1], [[\n\+$]], '', '')
 end
 
+---@param text string
+---@param pat_or_re string
 local function matchstr(text, pat_or_re)
   local re = type(pat_or_re) == 'string' and vim.regex(pat_or_re) or pat_or_re
 
+  ---@type integer, integer
   local s, e = re:match_str(text)
 
   if s == nil then
@@ -332,6 +301,8 @@ end
 
 -- attempt to extract the name and sect out of 'name(sect)'
 -- otherwise just return the largest string of valid characters in ref
+---@param ref string
+---@return string, string
 local function extract_sect_and_name_ref(ref)
   ref = ref or ''
   if ref:sub(1, 1) == '-' then -- try ':Man -pandoc' with this disabled.
@@ -343,18 +314,18 @@ local function extract_sect_and_name_ref(ref)
     if not name then
       man_error('manpage reference cannot contain only parentheses: ' .. ref)
     end
-    return '', spaces_to_underscores(name)
+    return '', name
   end
   local parts = vim.split(ref1, '(', { plain = true })
   -- see ':Man 3X curses' on why tolower.
   -- TODO(nhooyr) Not sure if this is portable across OSs
   -- but I have not seen a single uppercase section.
   local sect = vim.split(parts[2] or '', ')', { plain = true })[1]:lower()
-  local name = spaces_to_underscores(parts[1])
+  local name = parts[1]
   return sect, name
 end
 
--- verify_exists attempts to find the path to a manpage
+-- find_path attempts to find the path to a manpage
 -- based on the passed section and name.
 --
 -- 1. If manpage could not be found with the given sect and name,
@@ -362,7 +333,10 @@ end
 -- 2. If it still could not be found, then we try again without a section.
 -- 3. If still not found but $MANSECT is set, then we try again with $MANSECT
 --    unset.
-local function verify_exists(sect, name, silent)
+-- 4. If a path still wasn't found, return nil.
+---@param sect string?
+---@param name string
+function M.find_path(sect, name)
   if sect and sect ~= '' then
     local ret = get_path(sect, name, true)
     if ret then
@@ -398,10 +372,8 @@ local function verify_exists(sect, name, silent)
     end
   end
 
-  if not silent then
-    -- finally, if that didn't work, there is no hope
-    man_error('no manual entry for ' .. name)
-  end
+  -- finally, if that didn't work, there is no hope
+  return nil
 end
 
 local EXT_RE = vim.regex([[\.\%([glx]z\|bz2\|lzma\|Z\)$]])
@@ -410,6 +382,8 @@ local EXT_RE = vim.regex([[\.\%([glx]z\|bz2\|lzma\|Z\)$]])
 -- more specific than what we provided to `man` (try `:Man 3 App::CLI`).
 -- Also on linux, name seems to be case-insensitive. So for `:Man PRIntf`, we
 -- still want the name of the buffer to be 'printf'.
+---@param path string
+---@return string, string
 local function extract_sect_and_name_path(path)
   local tail = fn.fnamemodify(path, ':t')
   if EXT_RE:match_str(path) then -- valid extensions
@@ -419,6 +393,7 @@ local function extract_sect_and_name_path(path)
   return sect, name
 end
 
+---@return boolean
 local function find_man()
   if vim.bo.filetype == 'man' then
     return true
@@ -436,10 +411,11 @@ local function find_man()
   return false
 end
 
+---@param pager boolean
 local function set_options(pager)
   vim.bo.swapfile = false
   vim.bo.buftype = 'nofile'
-  vim.bo.bufhidden = 'hide'
+  vim.bo.bufhidden = 'unload'
   vim.bo.modified = false
   vim.bo.readonly = true
   vim.bo.modifiable = false
@@ -447,17 +423,20 @@ local function set_options(pager)
   vim.bo.filetype = 'man'
 end
 
+---@param path string
+---@param silent boolean?
+---@return string
 local function get_page(path, silent)
   -- Disable hard-wrap by using a big $MANWIDTH (max 1000 on some systems #9065).
   -- Soft-wrap: ftplugin/man.lua sets wrap/breakindent/….
   -- Hard-wrap: driven by `man`.
-  local manwidth
+  local manwidth ---@type integer|string
   if (vim.g.man_hardwrap or 1) ~= 1 then
     manwidth = 999
   elseif vim.env.MANWIDTH then
     manwidth = vim.env.MANWIDTH
   else
-    manwidth = api.nvim_win_get_width(0)
+    manwidth = api.nvim_win_get_width(0) - vim.o.wrapmargin
   end
 
   local cmd = localfile_arg and { 'man', '-l', path } or { 'man', path }
@@ -466,12 +445,20 @@ local function get_page(path, silent)
   -- http://comments.gmane.org/gmane.editors.vim.devel/29085
   -- Set MAN_KEEP_FORMATTING so Debian man doesn't discard backspaces.
   return system(cmd, silent, {
-    'MANPAGER=cat',
-    'MANWIDTH=' .. manwidth,
-    'MAN_KEEP_FORMATTING=1',
+    MANPAGER = 'cat',
+    MANWIDTH = manwidth,
+    MAN_KEEP_FORMATTING = 1,
   })
 end
 
+---@param lnum integer
+---@return string
+local function getline(lnum)
+  ---@diagnostic disable-next-line
+  return fn.getline(lnum)
+end
+
+---@param page string
 local function put_page(page)
   vim.bo.modifiable = true
   vim.bo.readonly = false
@@ -479,7 +466,7 @@ local function put_page(page)
 
   api.nvim_buf_set_lines(0, 0, -1, false, vim.split(page, '\n'))
 
-  while fn.getline(1):match('^%s*$') do
+  while getline(1):match('^%s*$') do
     api.nvim_buf_set_lines(0, 0, 1, false, {})
   end
   -- XXX: nroff justifies text by filling it with whitespace.  That interacts
@@ -506,13 +493,21 @@ local function format_candidate(path, psect)
   return ''
 end
 
+---@generic T
+---@param list T[]
+---@param elem T
+---@return T[]
 local function move_elem_to_head(list, elem)
+  ---@diagnostic disable-next-line:no-unknown
   local list1 = vim.tbl_filter(function(v)
     return v ~= elem
   end, list)
   return { elem, unpack(list1) }
 end
 
+---@param sect string
+---@param name string
+---@return string[]
 local function get_paths(sect, name)
   -- Try several sources for getting the list man directories:
   --   1. `man -w` (works on most systems)
@@ -527,10 +522,11 @@ local function get_paths(sect, name)
   end
 
   local mandirs = table.concat(vim.split(mandirs_raw, '[:\n]', { trimempty = true }), ',')
-  local paths = fn.globpath(mandirs, 'man?/' .. name .. '*.' .. sect .. '*', false, true)
+  ---@type string[]
+  local paths = fn.globpath(mandirs, 'man[^\\/]*/' .. name .. '*.' .. sect .. '*', false, true)
 
-  -- Prioritize the result from verify_exists as it obeys b:man_default_sects.
-  local first = verify_exists(sect, name, true)
+  -- Prioritize the result from find_path as it obeys b:man_default_sects.
+  local first = M.find_path(sect, name)
   if first then
     paths = move_elem_to_head(paths, first)
   end
@@ -538,6 +534,10 @@ local function get_paths(sect, name)
   return paths
 end
 
+---@param sect string
+---@param psect string
+---@param name string
+---@return string[]
 local function complete(sect, psect, name)
   local pages = get_paths(sect, name)
   -- We remove duplicates in case the same manpage in different languages was found.
@@ -547,6 +547,8 @@ local function complete(sect, psect, name)
 end
 
 -- see extract_sect_and_name_ref on why tolower(sect)
+---@param arg_lead string
+---@param cmd_line string
 function M.man_complete(arg_lead, cmd_line, _)
   local args = vim.split(cmd_line, '%s+', { trimempty = true })
   local cmd_offset = fn.index(args, 'Man')
@@ -583,6 +585,7 @@ function M.man_complete(arg_lead, cmd_line, _)
   end
 
   if #args == 2 then
+    ---@type string, string
     local name, sect
     if arg_lead == '' then
       -- cursor (|) is at ':Man 1 |'
@@ -612,10 +615,13 @@ function M.man_complete(arg_lead, cmd_line, _)
   return complete(sect, sect, name)
 end
 
+---@param pattern string
+---@return {name:string,filename:string,cmd:string}[]
 function M.goto_tag(pattern, _, _)
   local sect, name = extract_sect_and_name_ref(pattern)
 
   local paths = get_paths(sect, name)
+  ---@type {name:string,title:string}[]
   local structured = {}
 
   for _, path in ipairs(paths) do
@@ -628,6 +634,7 @@ function M.goto_tag(pattern, _, _)
     end
   end
 
+  ---@param entry {name:string,title:string}
   return vim.tbl_map(function(entry)
     return {
       name = entry.name,
@@ -639,7 +646,7 @@ end
 
 -- Called when Nvim is invoked as $MANPAGER.
 function M.init_pager()
-  if fn.getline(1):match('^%s*$') then
+  if getline(1):match('^%s*$') then
     api.nvim_buf_set_lines(0, 0, 1, false, {})
   else
     vim.cmd('keepjumps 1')
@@ -647,7 +654,7 @@ function M.init_pager()
   highlight_man_page()
   -- Guess the ref from the heading (which is usually uppercase, so we cannot
   -- know the correct casing, cf. `man glDrawArraysInstanced`).
-  local ref = fn.substitute(matchstr(fn.getline(1), [[^[^)]\+)]]) or '', ' ', '_', 'g')
+  local ref = fn.substitute(matchstr(getline(1), [[^[^)]\+)]]) or '', ' ', '_', 'g')
   local ok, res = pcall(extract_sect_and_name_ref, ref)
   vim.b.man_sect = ok and res or ''
 
@@ -658,12 +665,10 @@ function M.init_pager()
   set_options(true)
 end
 
+---@param count integer
+---@param args string[]
 function M.open_page(count, smods, args)
-  if #args > 2 then
-    man_error('too many arguments')
-  end
-
-  local ref
+  local ref ---@type string
   if #args == 0 then
     ref = vim.bo.filetype == 'man' and fn.expand('<cWORD>') or fn.expand('<cword>')
     if ref == '' then
@@ -674,9 +679,19 @@ function M.open_page(count, smods, args)
   else
     -- Combine the name and sect into a manpage reference so that all
     -- verification/extraction can be kept in a single function.
-    -- If args[2] is a reference as well, that is fine because it is the only
-    -- reference that will match.
-    ref = ('%s(%s)'):format(args[2], args[1])
+    if args[1]:match('^%d$') or args[1]:match('^%d%a') or args[1]:match('^%a$') then
+      -- NB: Valid sections are not only digits, but also:
+      --  - <digit><word> (see POSIX mans),
+      --  - and even <letter> and <word> (see, for example, by tcl/tk)
+      -- NB2: don't optimize to :match("^%d"), as it will match manpages like
+      --    441toppm and others whose name starts with digit
+      local sect = args[1]
+      table.remove(args, 1)
+      local name = table.concat(args, ' ')
+      ref = ('%s(%s)'):format(name, sect)
+    else
+      ref = table.concat(args, ' ')
+    end
   end
 
   local sect, name = extract_sect_and_name_ref(ref)
@@ -684,9 +699,16 @@ function M.open_page(count, smods, args)
     sect = tostring(count)
   end
 
-  local path = verify_exists(sect, name)
-  sect, name = extract_sect_and_name_path(path)
+  -- Try both spaces and underscores, use the first that exists.
+  local path = M.find_path(sect, name)
+  if path == nil then
+    path = M.find_path(sect, spaces_to_underscores(name))
+    if path == nil then
+      man_error('no manual entry for ' .. name)
+    end
+  end
 
+  sect, name = extract_sect_and_name_path(path)
   local buf = fn.bufnr()
   local save_tfu = vim.bo[buf].tagfunc
   vim.bo[buf].tagfunc = "v:lua.require'man'.goto_tag"
@@ -717,7 +739,10 @@ end
 -- Called when a man:// buffer is opened.
 function M.read_page(ref)
   local sect, name = extract_sect_and_name_ref(ref)
-  local path = verify_exists(sect, name)
+  local path = M.find_path(sect, name)
+  if path == nil then
+    man_error('no manual entry for ' .. name)
+  end
   sect = extract_sect_and_name_path(path)
   local page = get_page(path)
   vim.b.man_sect = sect
@@ -725,24 +750,27 @@ function M.read_page(ref)
 end
 
 function M.show_toc()
-  local bufname = fn.bufname('%')
+  local bufnr = api.nvim_get_current_buf()
+  local bufname = api.nvim_buf_get_name(bufnr)
   local info = fn.getloclist(0, { winid = 1 })
   if info ~= '' and vim.w[info.winid].qf_toc == bufname then
     vim.cmd.lopen()
     return
   end
 
+  ---@type {bufnr:integer, lnum:integer, text:string}[]
   local toc = {}
+
   local lnum = 2
   local last_line = fn.line('$') - 1
   local section_title_re = vim.regex([[^\%( \{3\}\)\=\S.*$]])
   local flag_title_re = vim.regex([[^\s\+\%(+\|-\)\S\+]])
   while lnum and lnum < last_line do
-    local text = fn.getline(lnum)
+    local text = getline(lnum)
     if section_title_re:match_str(text) then
       -- if text is a section title
       toc[#toc + 1] = {
-        bufnr = fn.bufnr('%'),
+        bufnr = bufnr,
         lnum = lnum,
         text = text,
       }
@@ -750,7 +778,7 @@ function M.show_toc()
       -- if text is a flag title. we strip whitespaces and prepend two
       -- spaces to have a consistent format in the loclist.
       toc[#toc + 1] = {
-        bufnr = fn.bufnr('%'),
+        bufnr = bufnr,
         lnum = lnum,
         text = '  ' .. fn.substitute(text, [[^\s*\(.\{-}\)\s*$]], [[\1]], ''),
       }
@@ -766,7 +794,7 @@ end
 
 local function init()
   local path = get_path('', 'man', true)
-  local page
+  local page ---@type string?
   if path ~= nil then
     -- Check for -l support.
     page = get_page(path, true)