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

15
lua/oil/util.lua
View file

@ -8,7 +8,7 @@ local FIELD_NAME = constants.FIELD_NAME
local FIELD_TYPE = constants.FIELD_TYPE
local FIELD_META = constants.FIELD_META
---@alias oil.IconProvider fun(type: string, name: string, conf: table?): (icon: string, hl: string)
---@alias oil.IconProvider fun(type: string, name: string, conf: table?, ft: string?): (icon: string, hl: string)
---@param url string
---@return nil|string
@ -934,7 +934,10 @@ M.get_icon_provider = function()
local _, mini_icons = pcall(require, "mini.icons")
---@diagnostic disable-next-line: undefined-field
if _G.MiniIcons then -- `_G.MiniIcons` is a better check to see if the module is setup
return function(type, name)
return function(type, name, conf, ft)
if ft then
return mini_icons.get("filetype", ft)
end
return mini_icons.get(type == "directory" and "directory" or "file", name)
end
end
@ -942,10 +945,16 @@ M.get_icon_provider = function()
-- fallback to `nvim-web-devicons`
local has_devicons, devicons = pcall(require, "nvim-web-devicons")
if has_devicons then
return function(type, name, conf)
return function(type, name, conf, ft)
if type == "directory" then
return conf and conf.directory or "", "OilDirIcon"
else
if ft then
local ft_icon, ft_hl = devicons.get_icon_by_filetype(ft)
if ft_icon and ft_icon ~= "" then
return ft_icon, ft_hl
end
end
local icon, hl = devicons.get_icon(name)
icon = icon or (conf and conf.default_file or "")
return icon, hl