address maintainer feedback: use glidesort and virtual text for definitions

Author: yashksaini-coder

crates/fff-core/src/grep.rs

@@ -1153,7 +1153,7 @@ fn collect_grep_results<'a>(
     // Prioritize definition matches by sorting them to the top.
     // Use a stable sort to maintain relative order within each category.
     if options.classify_definitions {
-        all_matches.sort_by_key(|m| !m.is_definition);
+        crate::sort_buffer::sort_by_key_with_buffer(&mut all_matches, |m| !m.is_definition);
     }
 
     // If no file had any match, we searched the entire slice.

lua/fff/grep/grep_renderer.lua

@@ -48,12 +48,6 @@ local function render_match_line(item, ctx)
   local location = string.format(':%d:%d', item.line_number or 0, (item.col or 0) + 1)
   local separator = '  '
 
-  -- Add definition indicator if this is a definition
-  local def_indicator = ''
-  if item.is_definition then
-    def_indicator = ' [def]'
-  end
-  
   -- vim.json.decode may return Blobs for strings with NUL bytes; coerce to string.
   local raw_content = item.line_content
   if type(raw_content) ~= 'string' then raw_content = raw_content and tostring(raw_content) or '' end
@@ -81,13 +75,12 @@ local function render_match_line(item, ctx)
     content = vim.fn.strcharpart(content, 0, lo) .. '…'
   end
 
-  local line = indent .. location .. separator .. content .. def_indicator
+  local line = indent .. location .. separator .. content
   local padding = math.max(0, ctx.win_width - vim.fn.strdisplaywidth(line) + 5)
 
   item._match_indent = #indent
   item._content_offset = prefix_display_w -- byte offset where content starts in the line
   item._trimmed_content = content -- trimmed content string for treesitter parsing
-  item._def_indicator = def_indicator
 
   return line .. string.rep(' ', padding)
 end
@@ -202,18 +195,13 @@ local function apply_match_highlights(item, ctx, item_idx, buf, ns_id, row, line
     end
   end
 
-  -- 7. Definition indicator highlight
-  if item.is_definition and item._def_indicator and #item._def_indicator > 0 then
-    local def_start = #line_content - #item._def_indicator - (math.max(0, ctx.win_width - vim.fn.strdisplaywidth(line_content) + 5))
-    -- Actually, it's easier to find it in the string
-    local s, e = line_content:find(' %[def%]$')
-    if s then
-      pcall(vim.api.nvim_buf_set_extmark, buf, ns_id, row, s - 1, {
-        end_col = e,
-        hl_group = config.hl.combo_header or 'Number',
-        priority = 250,
-      })
-    end
+  -- 7. Definition indicator as virtual text
+  if item.is_definition then
+    pcall(vim.api.nvim_buf_set_extmark, buf, ns_id, row, 0, {
+      virt_text = { { ' [def]', config.hl.combo_header or 'Number' } },
+      virt_text_pos = 'eol',
+      priority = 250,
+    })
   end
 end