fix(lsp_symbols): format entry earlier (#934)

lua/fzf-lua/defaults.lua

@@ -624,17 +624,22 @@ M.defaults.lsp.symbols = {
   fzf_opts         = {
     ["--delimiter"] = string.format("'[:%s]'", utils.nbsp),
     ["--tiebreak"]  = "begin",
+    ["--info"]      = "default",
   },
   line_field_index = "{-2}", -- line field index
   field_index_expr = "{}",   -- entry field index
   _fmt             = {
-    to = function(s, _)
-      local file, text = s:match("^(.+:.+:.+:)%s(.*)")
-      -- fzf has alignment issues with ansi colorings of differnt escape length
-      local align = 56 + #utils.has_ansi_coloring(text)
-      return string.format("%-" .. align .. "s%s%s", text, utils.nbsp, file)
-    end,
+    -- NOT NEEDED: we format at the source in `lsp.symbol_handler`
+    -- to = function(s, _)
+    --   local file, text = s:match("^(.+:.+:.+:)%s(.*)")
+    --   -- fzf has alignment issues with ansi colorings of differnt escape length
+    --   local align = 56 + utils.ansi_col_len(text)
+    --   return string.format("%-" .. align .. "s%s%s", text, utils.nbsp, file)
+    -- end,
     from = function(s, _)
+      -- restore the format to something that `path.entry_to_file` can
+      -- handle more robustly, while this can stil work due to the `utils.nbsp`
+      -- it will fail when the symbol contains "[%d]" (which we use as bufnr)
       local text, file = s:match(string.format("^(.-)%s(.*)", utils.nbsp))
       return string.format("%s %s", file, text)
     end

lua/fzf-lua/providers/lsp.lua

@@ -181,8 +181,14 @@ local function symbol_handler(opts, cb, _, result, _, _)
           entry.text = entry.text:gsub("%[.-%]", M._sym2style[kind], 1)
         end
       end
+      -- move symbol `entry.text` to the start of the line
+      -- will be restored in preview/actions by `opts._fmt.from`
+      local symbol = entry.text
+      local align = 56 + utils.ansi_col_len(symbol)
+      entry.text = nil
       entry = make_entry.lcol(entry, opts)
       entry = make_entry.file(entry, opts)
+      entry = string.format("%-" .. align .. "s%s%s", symbol, utils.nbsp, entry)
       if entry then
         cb(opts._fmt and opts._fmt.to and opts._fmt.to(entry, opts) or entry)
       end

lua/fzf-lua/utils.lua

@@ -490,6 +490,11 @@ function M.has_ansi_coloring(str)
   return str:match("%[[%d;]-m")
 end
 
+function M.ansi_col_len(str)
+  local match = M.has_ansi_coloring(str)
+  return match and #match or 0
+end
+
 function M.strip_ansi_coloring(str)
   if not str then return str end
   -- remove escape sequences of the following formats: