Skip to content

fix: use vim.fn.type() to detect Blobs in grep renderer #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gtr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use vim.fn.type() to detect Blobs in grep renderer #386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lua/fff/grep/grep_renderer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,18 @@ 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 = ' '
-- vim.json.decode may return Blobs for strings with NUL bytes; coerce to string.
-- NOTE: Lua type() returns "string" for Vim Blobs, so we must use vim.fn.type() to detect them.
local raw_content = item.line_content
if type(raw_content) ~= 'string' then raw_content = raw_content and tostring(raw_content) or '' end
if vim.fn.type(raw_content) == vim.v.t_blob then
local bytes = vim.fn.blob2list(raw_content)
local chars = {}
for _, b in ipairs(bytes) do
if b ~= 0 then chars[#chars + 1] = string.char(b) end
end
raw_content = table.concat(chars)
elseif type(raw_content) ~= 'string' then
raw_content = raw_content and tostring(raw_content) or ''
end
local content = raw_content

-- Indent + location + separator + content
Expand Down
Loading