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

fix: default highlights overriding existing highlights (#591)

Browse Source 
`highlight! default` overrides the existing highlight in order to set a
default link. So any highlight group that exists before will be wiped
over.
This commit is contained in:
Iron-E
2021-11-29 23:29:02 -05:00
committed by GitHub
parent 092fb66b6d
commit ed000eb3d4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lua/cmp/utils/highlight.lua
View File

@@ -10,7 +10,7 @@ highlight.keys = {
} }
highlight.inherit = function(name, source, override) highlight.inherit = function(name, source, override)
local cmd = ('highlight! default %s'):format(name) local cmd = ('highlight default %s'):format(name)
for _, key in ipairs(highlight.keys) do for _, key in ipairs(highlight.keys) do
if override[key] then if override[key] then
cmd = cmd .. (' %s=%s'):format(key, override[key]) cmd = cmd .. (' %s=%s'):format(key, override[key])

16
plugin/cmp.lua
View File

@@ -81,7 +81,7 @@ misc.set(_G, { 'cmp', 'plugin', 'colorscheme' }, function()
}) })
for name in pairs(types.lsp.CompletionItemKind) do for name in pairs(types.lsp.CompletionItemKind) do
if type(name) == 'string' then if type(name) == 'string' then
vim.cmd(([[highlight! default link CmpItemKind%sDefault CmpItemKindDefault]]):format(name)) vim.cmd(([[highlight default link CmpItemKind%sDefault CmpItemKindDefault]]):format(name))
end end
end end
highlight.inherit('CmpItemMenuDefault', 'Pmenu', { highlight.inherit('CmpItemMenuDefault', 'Pmenu', {
@@ -92,35 +92,35 @@ end)
_G.cmp.plugin.colorscheme() _G.cmp.plugin.colorscheme()
if vim.fn.hlexists('CmpItemAbbr') ~= 1 then if vim.fn.hlexists('CmpItemAbbr') ~= 1 then
vim.cmd [[highlight! default link CmpItemAbbr CmpItemAbbrDefault]] vim.cmd [[highlight default link CmpItemAbbr CmpItemAbbrDefault]]
end end
if vim.fn.hlexists('CmpItemAbbrDeprecated') ~= 1 then if vim.fn.hlexists('CmpItemAbbrDeprecated') ~= 1 then
vim.cmd [[highlight! default link CmpItemAbbrDeprecated CmpItemAbbrDeprecatedDefault]] vim.cmd [[highlight default link CmpItemAbbrDeprecated CmpItemAbbrDeprecatedDefault]]
end end
if vim.fn.hlexists('CmpItemAbbrMatch') ~= 1 then if vim.fn.hlexists('CmpItemAbbrMatch') ~= 1 then
vim.cmd [[highlight! default link CmpItemAbbrMatch CmpItemAbbrMatchDefault]] vim.cmd [[highlight default link CmpItemAbbrMatch CmpItemAbbrMatchDefault]]
end end
if vim.fn.hlexists('CmpItemAbbrMatchFuzzy') ~= 1 then if vim.fn.hlexists('CmpItemAbbrMatchFuzzy') ~= 1 then
vim.cmd [[highlight! default link CmpItemAbbrMatchFuzzy CmpItemAbbrMatchFuzzyDefault]] vim.cmd [[highlight default link CmpItemAbbrMatchFuzzy CmpItemAbbrMatchFuzzyDefault]]
end end
if vim.fn.hlexists('CmpItemKind') ~= 1 then if vim.fn.hlexists('CmpItemKind') ~= 1 then
vim.cmd [[highlight! default link CmpItemKind CmpItemKindDefault]] vim.cmd [[highlight default link CmpItemKind CmpItemKindDefault]]
end end
for name in pairs(types.lsp.CompletionItemKind) do for name in pairs(types.lsp.CompletionItemKind) do
if type(name) == 'string' then if type(name) == 'string' then
local hi = ('CmpItemKind%s'):format(name) local hi = ('CmpItemKind%s'):format(name)
if vim.fn.hlexists(hi) ~= 1 then if vim.fn.hlexists(hi) ~= 1 then
vim.cmd(([[highlight! default link %s %sDefault]]):format(hi, hi)) vim.cmd(([[highlight default link %s %sDefault]]):format(hi, hi))
end end
end end
end end
if vim.fn.hlexists('CmpItemMenu') ~= 1 then if vim.fn.hlexists('CmpItemMenu') ~= 1 then
vim.cmd [[highlight! default link CmpItemMenu CmpItemMenuDefault]] vim.cmd [[highlight default link CmpItemMenu CmpItemMenuDefault]]
end end
vim.cmd [[command! CmpStatus lua require('cmp').status()]] vim.cmd [[command! CmpStatus lua require('cmp').status()]]