leigh/telescope.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(previewer): ft detect for filetypes defined as functions (#2557)

Browse Source
This commit is contained in:
Simon Hauser
2023-06-09 12:42:21 +02:00
committed by GitHub
parent 66b03e7740
commit 8c998877f1
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lua/telescope/previewers/buffer_previewer.lua
View File

@@ -218,6 +218,7 @@ previewers.file_maker = function(filepath, bufnr, opts)
else else
vim.schedule(function() vim.schedule(function()
opts.ft = opts.use_ft_detect and putils.filetype_detect(filepath) opts.ft = opts.use_ft_detect and putils.filetype_detect(filepath)
local possible_binary = false
if opts.preview.check_mime_type == true and has_file and (opts.ft == nil or opts.ft == "") then if opts.preview.check_mime_type == true and has_file and (opts.ft == nil or opts.ft == "") then
-- avoid SIGABRT in buffer previewer happening with utils.get_os_command_output -- avoid SIGABRT in buffer previewer happening with utils.get_os_command_output
local output = capture(string.format([[file --mime-type -b "%s"]], filepath)) local output = capture(string.format([[file --mime-type -b "%s"]], filepath))
@@ -225,15 +226,10 @@ previewers.file_maker = function(filepath, bufnr, opts)
if mime_type[1] ~= "text" and mime_type[1] ~= "inode" and mime_type[2] ~= "json" then if mime_type[1] ~= "text" and mime_type[1] ~= "inode" and mime_type[2] ~= "json" then
if type(opts.preview.mime_hook) == "function" then if type(opts.preview.mime_hook) == "function" then
opts.preview.mime_hook(filepath, bufnr, opts) opts.preview.mime_hook(filepath, bufnr, opts)
else
putils.set_preview_message(
bufnr,
opts.winid,
"Binary cannot be previewed",
opts.preview.msg_bg_fillchar
)
end
return return
else
possible_binary = true
end
end end
if mime_type[2] == "json" then if mime_type[2] == "json" then
opts.ft = "json" opts.ft = "json"
@@ -269,6 +265,21 @@ previewers.file_maker = function(filepath, bufnr, opts)
if not ok then if not ok then
return return
end end
-- last resort, if ft is still empty at this point in time,
-- we need to determine the filetype using the buffer contents
if opts.ft == nil or opts.ft == "" then
opts.ft = vim.filetype.match { filename = filepath, buf = bufnr }
end
-- if we still dont have a ft we need to display the binary message
if opts.ft == nil or opts.ft == "" and possible_binary then
putils.set_preview_message(
bufnr,
opts.winid,
"Binary cannot be previewed",
opts.preview.msg_bg_fillchar
)
return
end
if opts.callback then if opts.callback then
opts.callback(bufnr) opts.callback(bufnr)