mirrors/snacks.nvim
1
0
Fork 0
mirror of https://github.com/folke/snacks.nvim synced 2025-12-23 08:47:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

perf(grep): move match parsing to resolve and fix an issue with .* results. Closes #2308

Browse source
This commit is contained in:
Folke Lemaitre 2025-10-21 22:32:44 +02:00
parent 80286bfcc3
commit 1417701af6
No known key found for this signature in database
GPG key ID: 9B52594D560070AB
1 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

45
lua/snacks/picker/source/grep.lua
View file

@ -2,7 +2,7 @@ local M = {}
local uv = vim.uv or vim.loop
local MATCH_SEP = "__snacks__"
local MATCH_SEP = "󰄊󱥳󱥰"
---@param opts snacks.picker.grep.Config
---@param filter snacks.picker.Filter
@ -131,7 +131,6 @@ function M.grep(opts, ctx)
end
local file = item.text:sub(1, file_sep - 1)
local rest = item.text:sub(file_sep + 1)
item.text = file .. ":" .. rest
---@type string?, string?, string?
local line, col, text = rest:match("^(%d+):(%d+):(.*)$")
if not (line and col and text) then
@ -140,38 +139,36 @@ function M.grep(opts, ctx)
end
return false
end
item.text = file .. ":" .. rest:gsub(MATCH_SEP, "")
-- indices of matches
local positions = {} ---@type number[]
local from = tonumber(col)
item.pos = { tonumber(line), from - 1 }
local offset = 0
local in_match = false
while from < #text do
local idx = text:find(MATCH_SEP, from, true)
if not idx then
break
end
if in_match then
for i = from, idx - 1 do
positions[#positions + 1] = i - offset
item.resolve = function()
local positions = {} ---@type number[]
local offset = 0
local in_match = false
while from < #text do
local idx = text:find(MATCH_SEP, from, true)
if not idx then
break
end
item.end_pos = item.end_pos or { item.pos[1], idx - offset - 1 }
if in_match then
for i = from, idx - 1 do
positions[#positions + 1] = i - offset
end
item.end_pos = item.end_pos or { item.pos[1], idx - offset - 1 }
end
in_match = not in_match
offset = offset + #MATCH_SEP
from = idx + #MATCH_SEP
end
in_match = not in_match
offset = offset + #MATCH_SEP
from = idx + #MATCH_SEP
item.positions = #positions > 0 and positions or nil
item.line = text:gsub(MATCH_SEP, "")
end
item.file = file
if #positions > 0 then
text = text:gsub(MATCH_SEP, "")
item.positions = positions
end
item.line = text
end,
},
}, ctx)