Skip to content

fix(icons): pattern match should take precedence over plugin #935

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
minusfive wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −6
Open

fix(icons): pattern match should take precedence over plugin #935

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76b1cef
fix(icons): pattern match should take precedence over plugin
minusfive Jan 23, 2025
cb85ecf
Merge branch 'main' into fix-pattern-priority
minusfive Feb 26, 2025
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: 6 additions & 6 deletions lua/which-key/icons.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ function M._get(rules, opts, check_ft)
end
end

-- plugin icons
if plugin then
-- pattern icons
if opts.desc then
for _, icon in ipairs(rules) do
if icon.plugin == plugin then
if icon.pattern and opts.desc:lower():find(icon.pattern) then
local ico, hl = M.get_icon(icon)
if ico then
return ico, hl
Expand All @@ -173,10 +173,10 @@ function M._get(rules, opts, check_ft)
end
end

-- pattern icons
if opts.desc then
-- plugin icons
if plugin then
for _, icon in ipairs(rules) do
if icon.pattern and opts.desc:lower():find(icon.pattern) then
if icon.plugin == plugin then
local ico, hl = M.get_icon(icon)
if ico then
return ico, hl
Expand Down