barrett/canola.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

feat(icon): add opt-in filetype detection via file contents

Browse source 
Problem: files without standard extensions (e.g. scripts with
shebangs, Makefile, Dockerfile) got incorrect or default icons since
icon providers match by filename or extension only.

Solution: add use_slow_filetype_detection option to the icon column
config. When enabled, reads the first 16 lines of each file and
passes them to vim.filetype.match for content-based detection. The
detected filetype is forwarded to mini.icons or nvim-web-devicons as
a trailing parameter, preserving backwards compatibility with
existing icon provider implementations.

Based on: stevearc/oil.nvim#618
This commit is contained in:
Barrett Ruth 2026-02-20 16:56:17 -05:00
parent 41556ec87f
commit ded17258cd
Signed by: barrett
GPG key ID: A6C96C9349D2FC81
4 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lua/oil/columns.lua
View file

@ -153,7 +153,7 @@ end
local icon_provider = util.get_icon_provider()
if icon_provider then
M.register("icon", {
render = function(entry, conf)
render = function(entry, conf, bufnr)
local field_type = entry[FIELD_TYPE]
local name = entry[FIELD_NAME]
local meta = entry[FIELD_META]
@ -168,7 +168,20 @@ if icon_provider then
if meta and meta.display_name then
name = meta.display_name
end
local icon, hl = icon_provider(field_type, name, conf)
local ft = nil
if conf and conf.use_slow_filetype_detection and field_type == "file" then
local bufname = vim.api.nvim_buf_get_name(bufnr)
local _, path = util.parse_url(bufname)
if path then
local lines = vim.fn.readfile(path .. name, "", 16)
if lines and #lines > 0 then
ft = vim.filetype.match({ filename = name, contents = lines })
end
end
end
local icon, hl = icon_provider(field_type, name, conf, ft)
if not conf or conf.add_padding ~= false then
icon = icon .. " "
end