From 5eee0fc275d1ae776b0a1342a93b08aa25e657f6 Mon Sep 17 00:00:00 2001 From: Zdzislaw Sliwinski Date: Thu, 6 Aug 2020 12:52:10 +1000 Subject: [PATCH 01/28] Changes for better colorization of C++ code --- colors/codedark.vim | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index 4fa811a..37d438d 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -66,7 +66,7 @@ endif " (some of them may be unused) let s:cdNone = {'gui': 'NONE', 'cterm': 'NONE', 'cterm256': 'NONE'} -let s:cdFront = {'gui': '#D4D4D4', 'cterm': s:cterm05, 'cterm256': '188'} +let s:cdFront = {'gui': '#D4D4D4', 'cterm': s:cterm05, 'cterm256': '109'} let s:cdBack = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'} let s:cdTabCurrent = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'} @@ -90,6 +90,7 @@ let s:cdCursorDarkDark = {'gui': '#222222', 'cterm': s:cterm01, 'cterm256': '235 let s:cdCursorDark = {'gui': '#51504F', 'cterm': s:cterm03, 'cterm256': '239'} let s:cdCursorLight = {'gui': '#AEAFAD', 'cterm': s:cterm04, 'cterm256': '145'} let s:cdSelection = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'} +let s:cdNonText = {'gui': '#5A5A5A', 'cterm': s:cterm04, 'cterm256': '71'} let s:cdLineNumber = {'gui': '#5A5A5A', 'cterm': s:cterm04, 'cterm256': '240'} let s:cdDiffRedDark = {'gui': '#4B1818', 'cterm': s:cterm08, 'cterm256': '52'} @@ -114,7 +115,7 @@ let s:cdDarkBlue = {'gui': '#223E55', 'cterm': s:cterm0D, 'cterm256': '73'} let s:cdLightBlue = {'gui': '#9CDCFE', 'cterm': s:cterm0C, 'cterm256': '117'} if g:codedark_conservative | let s:cdLightBlue = s:cdFront | endif let s:cdGreen = {'gui': '#608B4E', 'cterm': s:cterm0B, 'cterm256': '65'} -let s:cdBlueGreen = {'gui': '#4EC9B0', 'cterm': s:cterm0F, 'cterm256': '43'} +let s:cdBlueGreen = {'gui': '#4EC9B0', 'cterm': s:cterm0F, 'cterm256': '36'} let s:cdLightGreen = {'gui': '#B5CEA8', 'cterm': s:cterm09, 'cterm256': '151'} let s:cdRed = {'gui': '#F44747', 'cterm': s:cterm08, 'cterm256': '203'} let s:cdOrange = {'gui': '#CE9178', 'cterm': s:cterm0F, 'cterm256': '173'} @@ -150,7 +151,7 @@ call hi('CursorLineNr', s:cdPopupFront, s:cdBack, 'none', {}) call hi('MatchParen', s:cdNone, s:cdCursorDark, 'none', {}) call hi('ModeMsg', s:cdFront, s:cdLeftDark, 'none', {}) call hi('MoreMsg', s:cdFront, s:cdLeftDark, 'none', {}) -call hi('NonText', s:cdLineNumber, s:cdBack, 'none', {}) +call hi('NonText', s:cdNonText, s:cdBack, 'none', {}) call hi('Pmenu', s:cdPopupFront, s:cdPopupBack, 'none', {}) call hi('PmenuSel', s:cdPopupFront, s:cdPopupHighlightBlue, 'none', {}) call hi('PmenuSbar', {}, s:cdPopupHighlightGray, 'none', {}) @@ -430,6 +431,16 @@ call hi('luaFuncArgName', s:cdLightBlue, {}, 'none', {}) call hi('luaFuncKeyword', s:cdPink, {}, 'none', {}) call hi('luaLocal', s:cdPink, {}, 'none', {}) call hi('luaBuiltIn', s:cdBlue, {}, 'none', {}) + " YAML: call hi('yamlKey', s:cdBlue, {}, 'none', {}) call hi('yamlConstant', s:cdBlue, {}, 'none', {}) + +" C++: +call hi('CTagsClass', s:cdBlueGreen, {}, 'none', {}) +call hi('CTagsStructure', s:cdBlueGreen, {}, 'none', {}) +call hi('CTagsNamespace', s:cdBlueGreen, {}, 'none', {}) +call hi('CTagsGlobalVariable', s:cdBlueGreen, {}, 'none', {}) +call hi('CTagsDefinedName ', s:cdBlue, {}, 'none', {}) +highlight def link CTagsFunction Function +highlight def link CTagsMember Identifier From 2412a396c19be341942bbdd7566390d075aae80b Mon Sep 17 00:00:00 2001 From: Zdzislaw Sliwinski Date: Tue, 18 Aug 2020 17:53:34 +1000 Subject: [PATCH 02/28] Merged in 'color_coded' highlight groups --- colors/codedark.vim | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/colors/codedark.vim b/colors/codedark.vim index 37d438d..fdb6691 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -126,6 +126,7 @@ let s:cdYellow = {'gui': '#DCDCAA', 'cterm': s:cterm0A, 'cterm256': '187'} if g:codedark_conservative | let s:cdYellow = s:cdFront | endif let s:cdPink = {'gui': '#C586C0', 'cterm': s:cterm0E, 'cterm256': '176'} if g:codedark_conservative | let s:cdPink = s:cdBlue | endif +let s:cdSilver = {'gui': '#C0C0C0', 'cterm': s:cterm05, 'cterm256': '7'} " Vim editor colors " hi(GROUP, FOREGROUND, BACKGROUND, ATTRIBUTE, SPECIAL) @@ -444,3 +445,36 @@ call hi('CTagsGlobalVariable', s:cdBlueGreen, {}, 'none', {}) call hi('CTagsDefinedName ', s:cdBlue, {}, 'none', {}) highlight def link CTagsFunction Function highlight def link CTagsMember Identifier + +" C++ color_coded +call hi('StructDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('UnionDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('ClassDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('TypeRef', s:cdBlueGreen, {}, 'none', {}) +call hi('TypedefDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('TypeAliasDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('EnumDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('TemplateTypeParameter', s:cdBlueGreen, {}, 'none', {}) +call hi('TypeAliasTemplateDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('ClassTemplate', s:cdBlueGreen, {}, 'none', {}) +call hi('ClassTemplatePartialSpecialization', s:cdBlueGreen, {}, 'none', {}) +call hi('FunctionTemplate', s:cdBlueGreen, {}, 'none', {}) +call hi('TemplateRef', s:cdBlueGreen, {}, 'none', {}) +call hi('TemplateTemplateParameter', s:cdBlueGreen, {}, 'none', {}) +call hi('UsingDeclaration', s:cdBlueGreen, {}, 'none', {}) +call hi('MemberRef', s:cdLightBlue, {}, 'italic', {}) +call hi('MemberRefExpr', s:cdYellow, {}, 'italic', {}) +call hi('Namespace', s:cdSilver, {}, 'none', {}) +call hi('NamespaceRef', s:cdSilver, {}, 'none', {}) +call hi('NamespaceAlias', s:cdSilver, {}, 'none', {}) + +" C++ lsp-cxx-highlight +call hi('LspCxxHlSymClass', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymStruct', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymEnum', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymTypeAlias', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymTypeParameter', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymConcept', s:cdBlueGreen, {}, 'italic', {}) +call hi('LspCxxHlSymNamespace', s:cdSilver, {}, 'none', {}) + +call hi('CocHighlightText', {}, s:cdSelection, 'none', {}) From 1f202c6f5f47fc11ec4584aaee09ffd2f88ce744 Mon Sep 17 00:00:00 2001 From: Zdzislaw Sliwinski Date: Fri, 28 Aug 2020 20:20:55 +1000 Subject: [PATCH 03/28] Revoked changes on lines: 69, 93, 118, 155 --- colors/codedark.vim | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index fdb6691..343eab5 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -66,7 +66,7 @@ endif " (some of them may be unused) let s:cdNone = {'gui': 'NONE', 'cterm': 'NONE', 'cterm256': 'NONE'} -let s:cdFront = {'gui': '#D4D4D4', 'cterm': s:cterm05, 'cterm256': '109'} +let s:cdFront = {'gui': '#D4D4D4', 'cterm': s:cterm05, 'cterm256': '188'} let s:cdBack = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'} let s:cdTabCurrent = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'} @@ -90,7 +90,6 @@ let s:cdCursorDarkDark = {'gui': '#222222', 'cterm': s:cterm01, 'cterm256': '235 let s:cdCursorDark = {'gui': '#51504F', 'cterm': s:cterm03, 'cterm256': '239'} let s:cdCursorLight = {'gui': '#AEAFAD', 'cterm': s:cterm04, 'cterm256': '145'} let s:cdSelection = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'} -let s:cdNonText = {'gui': '#5A5A5A', 'cterm': s:cterm04, 'cterm256': '71'} let s:cdLineNumber = {'gui': '#5A5A5A', 'cterm': s:cterm04, 'cterm256': '240'} let s:cdDiffRedDark = {'gui': '#4B1818', 'cterm': s:cterm08, 'cterm256': '52'} @@ -115,7 +114,7 @@ let s:cdDarkBlue = {'gui': '#223E55', 'cterm': s:cterm0D, 'cterm256': '73'} let s:cdLightBlue = {'gui': '#9CDCFE', 'cterm': s:cterm0C, 'cterm256': '117'} if g:codedark_conservative | let s:cdLightBlue = s:cdFront | endif let s:cdGreen = {'gui': '#608B4E', 'cterm': s:cterm0B, 'cterm256': '65'} -let s:cdBlueGreen = {'gui': '#4EC9B0', 'cterm': s:cterm0F, 'cterm256': '36'} +let s:cdBlueGreen = {'gui': '#4EC9B0', 'cterm': s:cterm0F, 'cterm256': '43'} let s:cdLightGreen = {'gui': '#B5CEA8', 'cterm': s:cterm09, 'cterm256': '151'} let s:cdRed = {'gui': '#F44747', 'cterm': s:cterm08, 'cterm256': '203'} let s:cdOrange = {'gui': '#CE9178', 'cterm': s:cterm0F, 'cterm256': '173'} @@ -152,7 +151,7 @@ call hi('CursorLineNr', s:cdPopupFront, s:cdBack, 'none', {}) call hi('MatchParen', s:cdNone, s:cdCursorDark, 'none', {}) call hi('ModeMsg', s:cdFront, s:cdLeftDark, 'none', {}) call hi('MoreMsg', s:cdFront, s:cdLeftDark, 'none', {}) -call hi('NonText', s:cdNonText, s:cdBack, 'none', {}) +call hi('NonText', s:cdLineNumber, s:cdBack, 'none', {}) call hi('Pmenu', s:cdPopupFront, s:cdPopupBack, 'none', {}) call hi('PmenuSel', s:cdPopupFront, s:cdPopupHighlightBlue, 'none', {}) call hi('PmenuSbar', {}, s:cdPopupHighlightGray, 'none', {}) From 0872dc8a8b1732dd151ccbd070a6853de1d1aec8 Mon Sep 17 00:00:00 2001 From: Carlos Carral C Date: Tue, 14 Sep 2021 10:29:08 -0500 Subject: [PATCH 04/28] Add italics support for Comment and SpecialComment highlight groups and update README.md --- README.md | 4 ++++ colors/codedark.vim | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f49533d..d8b89f3 100644 --- a/README.md +++ b/README.md @@ -140,3 +140,7 @@ set guifont=Powerline_Consolas:h11 set renderoptions=type:directx,gamma:1.5,contrast:0.5,geom:1,renmode:5,taamode:1,level:0.5 ``` +### Are italics supported? +Italics in comments can be enabled by setting `g:codedark_italics = 1` before +setting the colorscheme. Please note that your terminal must support rendering italic fonts. + diff --git a/colors/codedark.vim b/colors/codedark.vim index ca848ce..504abfa 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -107,6 +107,11 @@ if !exists("g:codedark_conservative") let g:codedark_conservative=0 endif +" Italicized comments +if !exists("g:codedark_italics") + let g:codedark_italics=0 +endif + let s:cdGray = {'gui': '#808080', 'cterm': s:cterm04, 'cterm256': '08'} let s:cdViolet = {'gui': '#646695', 'cterm': s:cterm04, 'cterm256': '60'} let s:cdBlue = {'gui': '#569CD6', 'cterm': s:cterm0D, 'cterm256': '75'} @@ -174,7 +179,7 @@ hi! link diffAdded DiffAdd hi! link diffChanged DiffChange hi! link diffRemoved DiffDelete -call hi('Comment', s:cdGreen, {}, 'none', {}) +if g:codedark_italics | call hi('Comment', s:cdGreen, {}, 'italic', {}) | else | call hi('Comment', s:cdGreen, {}, 'none', {}) | endif call hi('Constant', s:cdBlue, {}, 'none', {}) call hi('String', s:cdOrange, {}, 'none', {}) @@ -209,7 +214,7 @@ call hi('Special', s:cdYellowOrange, {}, 'none', {}) call hi('SpecialChar', s:cdFront, {}, 'none', {}) call hi('Tag', s:cdFront, {}, 'none', {}) call hi('Delimiter', s:cdFront, {}, 'none', {}) -call hi('SpecialComment', s:cdGreen, {}, 'none', {}) +if g:codedark_italics | call hi('SpecialComment', s:cdGreen, {}, 'italic', {}) | else | call hi('SpecialComment', s:cdGreen, {}, 'none', {}) | endif call hi('Debug', s:cdFront, {}, 'none', {}) call hi('Underlined', s:cdNone, {}, 'underline', {}) From 57cc0096a9e77b6193e295ab62dbdfd9f2b5f65d Mon Sep 17 00:00:00 2001 From: Carlos Carral C Date: Tue, 14 Sep 2021 10:33:21 -0500 Subject: [PATCH 05/28] Extended README.md instructions for setting italics. --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d8b89f3..3d84542 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,11 @@ set renderoptions=type:directx,gamma:1.5,contrast:0.5,geom:1,renmode:5,taamode:1 ``` ### Are italics supported? -Italics in comments can be enabled by setting `g:codedark_italics = 1` before -setting the colorscheme. Please note that your terminal must support rendering italic fonts. +Italics in comments can be enabled by setting `g:codedark_italics = 1` _before_ +setting the colorscheme in your `.vimrc` like so: +``` +let g:codedark_italics = 1 +colorscheme codedark +``` +Please note that your terminal must support rendering italic fonts. From cbc95ca4b32bd2afec53f6239f0f464dd0b02200 Mon Sep 17 00:00:00 2001 From: Sammy Heasley Date: Fri, 22 Oct 2021 15:04:53 -0500 Subject: [PATCH 06/28] Use color code 231 for the airline term256 white 15 is the system's base0F color, which may not be white if the user has installed a color theme for their terminal. 231 is the xterm-256color code for #ffffff and is more portable than 15. --- autoload/airline/themes/codedark.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/airline/themes/codedark.vim b/autoload/airline/themes/codedark.vim index ec393d8..ef8e7b5 100644 --- a/autoload/airline/themes/codedark.vim +++ b/autoload/airline/themes/codedark.vim @@ -38,7 +38,7 @@ elseif !exists("g:codedark_term256") let g:codedark_term256=0 endif -let s:cdFront = {'gui': '#FFFFFF', 'cterm': (g:codedark_term256 ? '15' : s:cterm07)} +let s:cdFront = {'gui': '#FFFFFF', 'cterm': (g:codedark_term256 ? '231' : s:cterm07)} let s:cdFrontGray = {'gui': '#D4D4D4', 'cterm': (g:codedark_term256 ? '188' : s:cterm05)} let s:cdBack = {'gui': '#1E1E1E', 'cterm': (g:codedark_term256 ? '234' : s:cterm00)} let s:cdSelection = {'gui': '#264F78', 'cterm': (g:codedark_term256 ? '24' : s:cterm01)} From 22349c7ea00713adff28aa0fce5d5ca3089037be Mon Sep 17 00:00:00 2001 From: David <12832280+David-Else@users.noreply.github.com> Date: Sun, 28 Nov 2021 22:05:28 +0000 Subject: [PATCH 07/28] Fix treesitter function color and add nvim-cmp highlights --- colors/codedark.vim | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index ca848ce..fad7ef0 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -261,7 +261,7 @@ call hi('TSConditional', s:cdPink, {}, 'none', {}) call hi('TSRepeat', s:cdPink, {}, 'none', {}) call hi('TSLabel', s:cdLightBlue, {}, 'none', {}) call hi('TSKeyword', s:cdBlue, {}, 'none', {}) -call hi('TSKeywordFunction', s:cdPink, {}, 'none', {}) +call hi('TSKeywordFunction', s:cdBlue, {}, 'none', {}) call hi('TSKeywordOperator', s:cdBlue, {}, 'none', {}) call hi('TSOperator', s:cdFront, {}, 'none', {}) call hi('TSException', s:cdPink, {}, 'none', {}) @@ -551,3 +551,15 @@ call hi('yamlConstant', s:cdBlue, {}, 'none', {}) " Coc Explorer: call hi('CocExplorerIndentLine', s:cdCursorDark, {}, 'none', {}) + +" nvim-cmp +call hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {}) +call hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {}) +call hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {}) +call hi('CmpItemKindInterface', s:cdLightBlue, {}, 'none', {}) +call hi('CmpItemKindText', s:cdLightBlue, {}, 'none', {}) +call hi('CmpItemKindFunction', s:cdPink, {}, 'none', {}) +call hi('CmpItemKindMethod ', s:cdPink, {}, 'none', {}) +call hi('CmpItemKindKeyword', s:cdFront, {}, 'none', {}) +call hi('CmpItemKindProperty', s:cdFront, {}, 'none', {}) +call hi('CmpItemKindUnit', s:cdFront, {}, 'none', {}) From b2299663fb1d606f9b09c493cc4896ce2930aac9 Mon Sep 17 00:00:00 2001 From: David <12832280+David-Else@users.noreply.github.com> Date: Sun, 28 Nov 2021 22:50:59 +0000 Subject: [PATCH 08/28] Add CmpItemAbbrDeprecated --- colors/codedark.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/colors/codedark.vim b/colors/codedark.vim index fad7ef0..a479938 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -553,6 +553,7 @@ call hi('yamlConstant', s:cdBlue, {}, 'none', {}) call hi('CocExplorerIndentLine', s:cdCursorDark, {}, 'none', {}) " nvim-cmp +call hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'none', {}) call hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {}) call hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {}) call hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {}) From 1da95477514d89b4ab1a54072a778ae98cf182d0 Mon Sep 17 00:00:00 2001 From: David <12832280+David-Else@users.noreply.github.com> Date: Sun, 28 Nov 2021 23:02:19 +0000 Subject: [PATCH 09/28] Add strikethrough --- colors/codedark.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index a479938..4f0b072 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -553,7 +553,7 @@ call hi('yamlConstant', s:cdBlue, {}, 'none', {}) call hi('CocExplorerIndentLine', s:cdCursorDark, {}, 'none', {}) " nvim-cmp -call hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'none', {}) +call hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'strikethrough', {}) call hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {}) call hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {}) call hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {}) From 902132139f37f5c02b19d9edc760e7dccb94d4c6 Mon Sep 17 00:00:00 2001 From: teddy Date: Tue, 8 Feb 2022 00:21:53 +0100 Subject: [PATCH 10/28] improve : DiffText readability --- colors/codedark.vim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index e67827b..eb270c8 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -97,6 +97,8 @@ let s:cdDiffRedLight = {'gui': '#6F1313', 'cterm': s:cterm08, 'cterm256': '52'} let s:cdDiffRedLightLight = {'gui': '#FB0101', 'cterm': s:cterm08, 'cterm256': '09'} let s:cdDiffGreenDark = {'gui': '#373D29', 'cterm': s:cterm0B, 'cterm256': '237'} let s:cdDiffGreenLight = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} +let s:cdDiffBlueLight = {'gui': '#8fbfdc', 'cterm': s:cterm0C, 'cterm256': '117'} +let s:cdDiffBlue = {'gui': '#2B5B77', 'cterm': s:cterm0D, 'cterm256': '75'} let s:cdSearchCurrent = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} let s:cdSearch = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'} @@ -141,9 +143,9 @@ call hi('CursorLine', {}, s:cdCursorDarkDark, 'none', {}) call hi('CursorColumn', {}, s:cdCursorDarkDark, 'none', {}) call hi('Directory', s:cdBlue, s:cdBack, 'none', {}) call hi('DiffAdd', {}, s:cdDiffGreenLight, 'none', {}) -call hi('DiffChange', {}, s:cdDiffRedDark, 'none', {}) +call hi('DiffChange', {}, s:cdDiffBlue, 'none', {}) call hi('DiffDelete', {}, s:cdDiffRedLight, 'none', {}) -call hi('DiffText', {}, s:cdDiffRedLight, 'none', {}) +call hi('DiffText', {}, s:cdDiffBlueLight, 'none', {}) call hi('EndOfBuffer', s:cdLineNumber, s:cdBack, 'none', {}) call hi('ErrorMsg', s:cdRed, s:cdBack, 'none', {}) call hi('VertSplit', s:cdSplitDark, s:cdBack, 'none', {}) From 11d955b2ce36dbf40eabf61f1489b3402b475d34 Mon Sep 17 00:00:00 2001 From: teddy Date: Tue, 8 Feb 2022 20:37:46 +0100 Subject: [PATCH 11/28] fix : a better nuance of blue for more readability --- colors/codedark.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index eb270c8..2975709 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -97,8 +97,8 @@ let s:cdDiffRedLight = {'gui': '#6F1313', 'cterm': s:cterm08, 'cterm256': '52'} let s:cdDiffRedLightLight = {'gui': '#FB0101', 'cterm': s:cterm08, 'cterm256': '09'} let s:cdDiffGreenDark = {'gui': '#373D29', 'cterm': s:cterm0B, 'cterm256': '237'} let s:cdDiffGreenLight = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} -let s:cdDiffBlueLight = {'gui': '#8fbfdc', 'cterm': s:cterm0C, 'cterm256': '117'} -let s:cdDiffBlue = {'gui': '#2B5B77', 'cterm': s:cterm0D, 'cterm256': '75'} +let s:cdDiffBlueLight = {'gui': '#00afff', 'cterm': s:cterm0C, 'cterm256': '39'} +let s:cdDiffBlue = {'gui': '#0087af', 'cterm': s:cterm0D, 'cterm256': '31'} let s:cdSearchCurrent = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} let s:cdSearch = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'} @@ -145,7 +145,7 @@ call hi('Directory', s:cdBlue, s:cdBack, 'none', {}) call hi('DiffAdd', {}, s:cdDiffGreenLight, 'none', {}) call hi('DiffChange', {}, s:cdDiffBlue, 'none', {}) call hi('DiffDelete', {}, s:cdDiffRedLight, 'none', {}) -call hi('DiffText', {}, s:cdDiffBlueLight, 'none', {}) +call hi('DiffText', s:cdBack, s:cdDiffBlueLight, 'none', {}) call hi('EndOfBuffer', s:cdLineNumber, s:cdBack, 'none', {}) call hi('ErrorMsg', s:cdRed, s:cdBack, 'none', {}) call hi('VertSplit', s:cdSplitDark, s:cdBack, 'none', {}) From d1aaa7ebcc5a5411be281701a942f72a370f7ff7 Mon Sep 17 00:00:00 2001 From: teddy Date: Tue, 8 Feb 2022 23:20:12 +0100 Subject: [PATCH 12/28] fix : foreground of DiffText --- colors/codedark.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index 2975709..8a198de 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -145,7 +145,7 @@ call hi('Directory', s:cdBlue, s:cdBack, 'none', {}) call hi('DiffAdd', {}, s:cdDiffGreenLight, 'none', {}) call hi('DiffChange', {}, s:cdDiffBlue, 'none', {}) call hi('DiffDelete', {}, s:cdDiffRedLight, 'none', {}) -call hi('DiffText', s:cdBack, s:cdDiffBlueLight, 'none', {}) +call hi('DiffText', {}, s:cdDiffBlueLight, 'none', {}) call hi('EndOfBuffer', s:cdLineNumber, s:cdBack, 'none', {}) call hi('ErrorMsg', s:cdRed, s:cdBack, 'none', {}) call hi('VertSplit', s:cdSplitDark, s:cdBack, 'none', {}) From f780f59300fcce6d1f3e350baab9bb7ae6151f11 Mon Sep 17 00:00:00 2001 From: teddy Date: Wed, 9 Feb 2022 20:39:03 +0100 Subject: [PATCH 13/28] fix : a better nuance of blue for more readability (again) --- colors/codedark.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index 8a198de..cd29d09 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -97,8 +97,8 @@ let s:cdDiffRedLight = {'gui': '#6F1313', 'cterm': s:cterm08, 'cterm256': '52'} let s:cdDiffRedLightLight = {'gui': '#FB0101', 'cterm': s:cterm08, 'cterm256': '09'} let s:cdDiffGreenDark = {'gui': '#373D29', 'cterm': s:cterm0B, 'cterm256': '237'} let s:cdDiffGreenLight = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} -let s:cdDiffBlueLight = {'gui': '#00afff', 'cterm': s:cterm0C, 'cterm256': '39'} -let s:cdDiffBlue = {'gui': '#0087af', 'cterm': s:cterm0D, 'cterm256': '31'} +let s:cdDiffBlueLight = {'gui': '#00afff', 'cterm': s:cterm0C, 'cterm256': '117'} +let s:cdDiffBlue = {'gui': '#0087af', 'cterm': s:cterm0D, 'cterm256': '24'} let s:cdSearchCurrent = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} let s:cdSearch = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'} @@ -145,7 +145,7 @@ call hi('Directory', s:cdBlue, s:cdBack, 'none', {}) call hi('DiffAdd', {}, s:cdDiffGreenLight, 'none', {}) call hi('DiffChange', {}, s:cdDiffBlue, 'none', {}) call hi('DiffDelete', {}, s:cdDiffRedLight, 'none', {}) -call hi('DiffText', {}, s:cdDiffBlueLight, 'none', {}) +call hi('DiffText', s:cdBack, s:cdDiffBlueLight, 'none', {}) call hi('EndOfBuffer', s:cdLineNumber, s:cdBack, 'none', {}) call hi('ErrorMsg', s:cdRed, s:cdBack, 'none', {}) call hi('VertSplit', s:cdSplitDark, s:cdBack, 'none', {}) From 2ebcc4243dcbd4273d0e1d3b99c2d4cff738afdd Mon Sep 17 00:00:00 2001 From: teddy Date: Wed, 9 Feb 2022 23:50:08 +0100 Subject: [PATCH 14/28] fix : hex color code --- colors/codedark.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index cd29d09..8b6a785 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -97,8 +97,8 @@ let s:cdDiffRedLight = {'gui': '#6F1313', 'cterm': s:cterm08, 'cterm256': '52'} let s:cdDiffRedLightLight = {'gui': '#FB0101', 'cterm': s:cterm08, 'cterm256': '09'} let s:cdDiffGreenDark = {'gui': '#373D29', 'cterm': s:cterm0B, 'cterm256': '237'} let s:cdDiffGreenLight = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} -let s:cdDiffBlueLight = {'gui': '#00afff', 'cterm': s:cterm0C, 'cterm256': '117'} -let s:cdDiffBlue = {'gui': '#0087af', 'cterm': s:cterm0D, 'cterm256': '24'} +let s:cdDiffBlueLight = {'gui': '#87d7ff', 'cterm': s:cterm0C, 'cterm256': '117'} +let s:cdDiffBlue = {'gui': '#005f87', 'cterm': s:cterm0D, 'cterm256': '24'} let s:cdSearchCurrent = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} let s:cdSearch = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'} From 1c12cca9b6dd318fa11df75b88a71e42910ba71b Mon Sep 17 00:00:00 2001 From: Izhak Jakov Date: Sun, 10 Apr 2022 07:09:34 -0400 Subject: [PATCH 15/28] Fix for customized ":listchars" ignored by visual selection --- colors/codedark.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index e67827b..53a8df4 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -156,7 +156,7 @@ call hi('CursorLineNr', s:cdPopupFront, s:cdBack, 'none', {}) call hi('MatchParen', s:cdNone, s:cdCursorDark, 'none', {}) call hi('ModeMsg', s:cdFront, s:cdLeftDark, 'none', {}) call hi('MoreMsg', s:cdFront, s:cdLeftDark, 'none', {}) -call hi('NonText', s:cdLineNumber, s:cdBack, 'none', {}) +call hi('NonText', s:cdLineNumber, s:cdNone, 'none', {}) call hi('Pmenu', s:cdPopupFront, s:cdPopupBack, 'none', {}) call hi('PmenuSel', s:cdPopupFront, s:cdPopupHighlightBlue, 'none', {}) call hi('PmenuSbar', {}, s:cdPopupHighlightGray, 'none', {}) From caa5d32238f8d1280ddcf35fc83c7039eb086e2f Mon Sep 17 00:00:00 2001 From: Luca Saccarola <96259932+saccarosium@users.noreply.github.com> Date: Sat, 21 May 2022 19:43:49 +0200 Subject: [PATCH 16/28] fix: Fixing TSType colour --- colors/codedark.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index e67827b..c359db7 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -271,7 +271,7 @@ call hi('TSKeywordFunction', s:cdBlue, {}, 'none', {}) call hi('TSKeywordOperator', s:cdBlue, {}, 'none', {}) call hi('TSOperator', s:cdFront, {}, 'none', {}) call hi('TSException', s:cdPink, {}, 'none', {}) -call hi('TSType', s:cdBlueGreen, {}, 'none', {}) +call hi('TSType', s:cdBlue, {}, 'none', {}) call hi('TSTypeBuiltin', s:cdBlue, {}, 'none', {}) call hi('TSStructure', s:cdLightBlue, {}, 'none', {}) call hi('TSInclude', s:cdPink, {}, 'none', {}) From ff83ea7d75c4fdc97199d37e191ce667a250a87c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Iser?= Date: Wed, 15 Jun 2022 16:08:44 +0200 Subject: [PATCH 17/28] Revert "fix: Fixing TSType colour" --- colors/codedark.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index d75cf99..8a341c3 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -273,7 +273,7 @@ call hi('TSKeywordFunction', s:cdBlue, {}, 'none', {}) call hi('TSKeywordOperator', s:cdBlue, {}, 'none', {}) call hi('TSOperator', s:cdFront, {}, 'none', {}) call hi('TSException', s:cdPink, {}, 'none', {}) -call hi('TSType', s:cdBlue, {}, 'none', {}) +call hi('TSType', s:cdBlueGreen, {}, 'none', {}) call hi('TSTypeBuiltin', s:cdBlue, {}, 'none', {}) call hi('TSStructure', s:cdLightBlue, {}, 'none', {}) call hi('TSInclude', s:cdPink, {}, 'none', {}) From 433acbe56dda97d944f9bea7ba8af128f1a2dee9 Mon Sep 17 00:00:00 2001 From: saccarosium Date: Fri, 1 Jul 2022 16:20:57 +0200 Subject: [PATCH 18/28] fix: make the Ignore hi group not visible --- colors/codedark.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index 8a341c3..a1d52dd 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -223,7 +223,7 @@ call hi('Debug', s:cdFront, {}, 'none', {}) call hi('Underlined', s:cdNone, {}, 'underline', {}) call hi("Conceal", s:cdFront, s:cdBack, 'none', {}) -call hi('Ignore', s:cdFront, {}, 'none', {}) +call hi('Ignore', s:cdBack, {}, 'none', {}) call hi('Error', s:cdRed, s:cdBack, 'undercurl', s:cdRed) From 1c173d94530ee3421e6713f3b4cc8a122439abd4 Mon Sep 17 00:00:00 2001 From: saccarosium Date: Fri, 1 Jul 2022 16:21:53 +0200 Subject: [PATCH 19/28] fix: make markdown headings same color as vscode --- colors/codedark.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/colors/codedark.vim b/colors/codedark.vim index a1d52dd..9cf3bff 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -293,6 +293,12 @@ call hi('TSTag', s:cdBlue, {}, 'none', {}) call hi('TSTagDelimiter', s:cdGray, {}, 'none', {}) " Markdown: +call hi('markdownH1', s:cdBlue, {}, 'bold', {}) +call hi('markdownH2', s:cdBlue, {}, 'bold', {}) +call hi('markdownH3', s:cdBlue, {}, 'bold', {}) +call hi('markdownH4', s:cdBlue, {}, 'bold', {}) +call hi('markdownH5', s:cdBlue, {}, 'bold', {}) +call hi('markdownH6', s:cdBlue, {}, 'bold', {}) call hi('markdownBold', s:cdBlue, {}, 'bold', {}) call hi('markdownCode', s:cdOrange, {}, 'none', {}) call hi('markdownRule', s:cdBlue, {}, 'bold', {}) From 5483bdf530305ce3a6bf2adb94bc764cf3c037b1 Mon Sep 17 00:00:00 2001 From: saccarosium Date: Wed, 6 Jul 2022 15:41:58 +0200 Subject: [PATCH 20/28] Feat: adding variable codedark_transparent #78 --- colors/codedark.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/colors/codedark.vim b/colors/codedark.vim index 8a341c3..5805bda 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -65,9 +65,15 @@ endif " General appearance colors: " (some of them may be unused) +" Transparent background +if !exists("g:codedark_transparent") + let g:codedark_transparent=0 +endif + let s:cdNone = {'gui': 'NONE', 'cterm': 'NONE', 'cterm256': 'NONE'} let s:cdFront = {'gui': '#D4D4D4', 'cterm': s:cterm05, 'cterm256': '188'} let s:cdBack = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'} +if g:codedark_transparent | let s:cdBack = {'gui': 'NONE', 'cterm': 'NONE', 'cterm256': 'NONE'} | endif let s:cdTabCurrent = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'} let s:cdTabOther = {'gui': '#2D2D2D', 'cterm': s:cterm01, 'cterm256': '236'} From 2f4b64b355f028fe9c5d23f2b428fe3b536387fa Mon Sep 17 00:00:00 2001 From: saccarosium Date: Fri, 8 Jul 2022 08:10:38 +0200 Subject: [PATCH 21/28] Fix: changing `diff` fg color for better readability (#85) --- colors/codedark.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index 8a341c3..962bf5c 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -142,9 +142,9 @@ call hi('Cursor', s:cdCursorDark, s:cdCursorLight, 'none', {}) call hi('CursorLine', {}, s:cdCursorDarkDark, 'none', {}) call hi('CursorColumn', {}, s:cdCursorDarkDark, 'none', {}) call hi('Directory', s:cdBlue, s:cdBack, 'none', {}) -call hi('DiffAdd', {}, s:cdDiffGreenLight, 'none', {}) -call hi('DiffChange', {}, s:cdDiffBlue, 'none', {}) -call hi('DiffDelete', {}, s:cdDiffRedLight, 'none', {}) +call hi('DiffAdd', s:cdFront, s:cdDiffGreenLight, 'none', {}) +call hi('DiffChange', s:cdFront, s:cdDiffBlue, 'none', {}) +call hi('DiffDelete', s:cdFront, s:cdDiffRedLight, 'none', {}) call hi('DiffText', s:cdBack, s:cdDiffBlueLight, 'none', {}) call hi('EndOfBuffer', s:cdLineNumber, s:cdBack, 'none', {}) call hi('ErrorMsg', s:cdRed, s:cdBack, 'none', {}) From 697c6f87fedf564a24caa0bd525bdc473d22a07f Mon Sep 17 00:00:00 2001 From: saccarosium Date: Sun, 31 Jul 2022 18:53:47 +0200 Subject: [PATCH 22/28] updating README --- README.md | 83 +++++++++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 3d84542..aa9ac08 100644 --- a/README.md +++ b/README.md @@ -21,41 +21,40 @@ #### Fixed 8/16 colors ![Terminal on Debian with 16 colors](https://cloud.githubusercontent.com/assets/10374559/23341713/0e8dd778-fc4d-11e6-8430-b11f161305d7.png) -## Color Palette - -![Color Palette](https://cloud.githubusercontent.com/assets/10374559/23341312/1961f416-fc45-11e6-83ba-d7180c5fdd6d.png) - ## Installation ### 1) Download Simply as any other Vim plugins: download manually or follow the standard procedure of your plugin manager: -* [Vundle](https://github.com/gmarik/vundle) - ``` +* [Vundle](https://github.com/gmarik/vundle) + ```vim Plugin 'tomasiser/vim-code-dark' ``` -* [vim-plug](https://github.com/junegunn/vim-plug) -``` +* [vim-plug](https://github.com/junegunn/vim-plug) +```vim Plug 'tomasiser/vim-code-dark' ``` -* manual +* [builtin package manager](https://vimhelp.org/repeat.txt.html#packages) +```bash +# Regular Vim +mkdir -p ~/.vim/pack/themes/start +cd ~/.vim/pack/themes/start +git clone https://github.com/tomasiser/vim-code-dark - copy all of the files to `~/.vim` (or `$HOME\vimfiles` on Windows) directory +# Neovim +mkdir -p ~/.local/share/nvim/site/pack/themes/start +cd ~/.local/share/nvim/site/pack/themes/start +git clone https://github.com/tomasiser/vim-code-dark +``` ### 2) Enable in `.vimrc` Add the following line to your `.vimrc`: -``` +```vim colorscheme codedark ``` -If you have [`vim-airline`](https://github.com/vim-airline/vim-airline), you can also enable the provided theme: - -``` -let g:airline_theme = 'codedark' -``` - ### 3) Terminal support #### 3.1) If you use gVim / a modern terminal @@ -63,8 +62,7 @@ let g:airline_theme = 'codedark' #### 3.2) If the colors seem to be wrong If your terminal supports 256 colors (see [this script](http://www.robmeerman.co.uk/unix/256colours) if you want to test your terminal), you **may need to set `t_Co` to 256** and [possibly also reset the `t_ut` value](http://vi.stackexchange.com/questions/238/tmux-is-changing-part-of-the-background-in-vim) in your `.vimrc` before setting the colorscheme: - -``` +```vim set t_Co=256 set t_ut= colorscheme codedark @@ -81,7 +79,7 @@ If your terminal does not support 256 colors, you may want to change your termin ##### 3.3.1) Some Unix terminals Clone [`base16-shell`](https://github.com/chriskempson/base16-shell/) into `~/.config/base16-shell`: -``` +```bash git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell ``` @@ -89,7 +87,7 @@ Then copy a script from this (`vim-code-dark`) repository (`base16/templates/she Following the instructions from [`base16-shell`](https://github.com/chriskempson/base16-shell/), you should now modify your `~/.bashrc` or `~/.zshrc` (depending on your shell) and insert the following lines: -``` +```bash BASE16_SHELL=$HOME/.config/base16-shell/ [ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)" ``` @@ -98,30 +96,35 @@ Now start a new shell and type the following command: `base16_codedark`. You should now be able to use Vim with your new colorscheme. -##### 3.3.2) iTerm2 -iTerm2 should actually support 256 colors, try setting `Report Terminal Type` to `xterm-256color` and follow step 3.2). If it does not work, you can manually modify your terminal colors in settings (`CMD+i`, Colors tab) following the [color palette picture](#color-palette). You will have to choose which color to use as red, blue etc. according to your personal preferences. - -##### 3.3.3) PuTTY +##### 3.3.2) PuTTY PuTTY should actually support 256 colors, try following [steps on StackOverflow](http://superuser.com/questions/436910/emulate-256-colors-in-putty-terminal). If it does not work, run `base16/templates/putty/putty/base16-codedark.reg` to modify your registry, then run PuTTY and load `codedark` in the session list. This will modify your PuTTY terminal colors. +## CUSTOMIZATION + +**:exclamation: To enable any of the following customizations, put the specific lines before setting the colorscheme** +```vim +" If you don't like many colors and prefer the conservative style of the standard Visual Studio +let g:codedark_conservative=1 +" Activates italicized comments +let g:codedark_italics=1 +" Make the background transparent (make sure your terminal supports italics) +let g:codedark_transparent=1 +" If you have vim-airline, you can also enable the provided theme +let g:airline_theme = 'codedark' + +colorscheme codedark +``` + ## FAQ ### The background color in my terminal is wrong when there is no text! Try resetting the `t_ut` value in your `.vimrc` as [described here](http://vi.stackexchange.com/questions/238/tmux-is-changing-part-of-the-background-in-vim): -``` +```vim set t_Co=256 set t_ut= colorscheme codedark ``` -### What is and how to enable the conservative mode? -If you don't like many colors and prefer the **conservative style of the standard Visual Studio**, you can try the conservative mode with reduced number of colors. To enable it, put the following line to your `.vimrc` *before* setting the scheme, like so: - -``` -let g:codedark_conservative = 1 -colorscheme codedark -``` - ### Something is broken but I know how to fix it! Pull requests are welcome! Feel free to send one with an explanation! @@ -134,18 +137,12 @@ There are a lot of syntax definitions with different highlight groups. Feel free ### What setup can I see on the first screenshots? Screenshots come from gVim on Windows with the following font options and [`vim-airline`](https://github.com/vim-airline/vim-airline) enabled. -``` +```vim set enc=utf-8 set guifont=Powerline_Consolas:h11 set renderoptions=type:directx,gamma:1.5,contrast:0.5,geom:1,renmode:5,taamode:1,level:0.5 ``` -### Are italics supported? -Italics in comments can be enabled by setting `g:codedark_italics = 1` _before_ -setting the colorscheme in your `.vimrc` like so: -``` -let g:codedark_italics = 1 -colorscheme codedark -``` -Please note that your terminal must support rendering italic fonts. +## Color Palette +![Color Palette](https://cloud.githubusercontent.com/assets/10374559/23341312/1961f416-fc45-11e6-83ba-d7180c5fdd6d.png) From e56e5285ecaf5d0df1a383c432bccdbc0d464b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Iser?= Date: Fri, 5 Aug 2022 13:28:50 +0200 Subject: [PATCH 23/28] Fix typo in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aa9ac08..5378fea 100644 --- a/README.md +++ b/README.md @@ -105,9 +105,9 @@ PuTTY should actually support 256 colors, try following [steps on StackOverflow] ```vim " If you don't like many colors and prefer the conservative style of the standard Visual Studio let g:codedark_conservative=1 -" Activates italicized comments +" Activates italicized comments (make sure your terminal supports italics) let g:codedark_italics=1 -" Make the background transparent (make sure your terminal supports italics) +" Make the background transparent let g:codedark_transparent=1 " If you have vim-airline, you can also enable the provided theme let g:airline_theme = 'codedark' From 4f7d10897001b0b5fd4b438cdbd4043e02c898c1 Mon Sep 17 00:00:00 2001 From: teddy Date: Thu, 13 Oct 2022 00:01:29 +0200 Subject: [PATCH 24/28] [feat] add highlighting for netrwMarkFile --- colors/codedark.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/colors/codedark.vim b/colors/codedark.vim index be280e8..e788493 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -182,6 +182,7 @@ call hi('Visual', s:cdNone, s:cdSelection, 'none', {}) call hi('VisualNOS', s:cdNone, s:cdSelection, 'none', {}) call hi('WarningMsg', s:cdOrange, s:cdBack, 'none', {}) call hi('WildMenu', s:cdNone, s:cdSelection, 'none', {}) +call hi('netrwMarkFile', s:cdFront, s:cdSelection, 'none', {}) " Legacy groups for official git.vim and diff.vim syntax hi! link diffAdded DiffAdd From 79e97ddd710815c6f59474d025c2b24e53e7f1b6 Mon Sep 17 00:00:00 2001 From: teddy Date: Thu, 13 Oct 2022 00:38:40 +0200 Subject: [PATCH 25/28] [fix] remove background of Directory --- colors/codedark.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index e788493..1adb360 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -147,7 +147,7 @@ call hi('ColorColumn', {}, s:cdCursorDarkDark, 'none', {}) call hi('Cursor', s:cdCursorDark, s:cdCursorLight, 'none', {}) call hi('CursorLine', {}, s:cdCursorDarkDark, 'none', {}) call hi('CursorColumn', {}, s:cdCursorDarkDark, 'none', {}) -call hi('Directory', s:cdBlue, s:cdBack, 'none', {}) +call hi('Directory', s:cdBlue, s:cdNone, 'none', {}) call hi('DiffAdd', s:cdFront, s:cdDiffGreenLight, 'none', {}) call hi('DiffChange', s:cdFront, s:cdDiffBlue, 'none', {}) call hi('DiffDelete', s:cdFront, s:cdDiffRedLight, 'none', {}) From 14b3e6ac4294c2af34d03af2623dca58c45ee3fa Mon Sep 17 00:00:00 2001 From: capybarapantsu-xe Date: Thu, 10 Nov 2022 23:50:35 -0800 Subject: [PATCH 26/28] Rename all Treesitter highlight groups See: https://github.com/nvim-treesitter/nvim-treesitter/pull/3656 Treesitter highlight groups now all have new names that start with @. This causes vim-code-dark to be nonfunctional on many Treesitter syntaxes, notably HTML. Kept the old names around in case someone needs comptibility with older version of Neovim and Treesitter. Also, the new @names cause errors on Vim. --- colors/codedark.vim | 100 +++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index 1adb360..28523d7 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -30,6 +30,10 @@ fun! hi(group, fg, bg, attr, sp) exec "hi " . a:group . " guisp=" . a:sp.gui endif endfun +" Choose old or new name for Treesitter groups depending on Neovim version +fun! hiTS(g_new, g_old, fg, bg, attr, sp) + call hi(has("nvim-0.8.0")? a:g_new : a:g_old, a:fg, a:bg, a:attr, a:sp) +endfun " ------------------ " Color definitions: @@ -243,61 +247,61 @@ call hi('SpellLocal', s:cdRed, s:cdBack, 'undercurl', s:cdRed) " Neovim Treesitter: -call hi('TSError', s:cdRed, {}, 'none', {}) -call hi('TSPunctDelimiter', s:cdFront, {}, 'none', {}) -call hi('TSPunctBracket', s:cdFront, {}, 'none', {}) -call hi('TSPunctSpecial', s:cdFront, {}, 'none', {}) +call hiTS('@error', 'TSError', s:cdRed, {}, 'none', {}) +call hiTS('@punctuation.delimiter', 'TSPunctDelimiter', s:cdFront, {}, 'none', {}) +call hiTS('@punctuation.bracket', 'TSPunctBracket', s:cdFront, {}, 'none', {}) +call hiTS('@punctuation.special', 'TSPunctSpecial', s:cdFront, {}, 'none', {}) " Constant -call hi('TSConstant', s:cdYellow, {}, 'none', {}) -call hi('TSConstBuiltin', s:cdBlue, {}, 'none', {}) -call hi('TSConstMacro', s:cdBlueGreen, {}, 'none', {}) -call hi('TSStringRegex', s:cdOrange, {}, 'none', {}) -call hi('TSString', s:cdOrange, {}, 'none', {}) -call hi('TSStringEscape', s:cdYellowOrange, {}, 'none', {}) -call hi('TSCharacter', s:cdOrange, {}, 'none', {}) -call hi('TSNumber', s:cdLightGreen, {}, 'none', {}) -call hi('TSBoolean', s:cdBlue, {}, 'none', {}) -call hi('TSFloat', s:cdLightGreen, {}, 'none', {}) -call hi('TSAnnotation', s:cdYellow, {}, 'none', {}) -call hi('TSAttribute', s:cdBlueGreen, {}, 'none', {}) -call hi('TSNamespace', s:cdBlueGreen, {}, 'none', {}) +call hiTS('@constant', 'TSConstant', s:cdYellow, {}, 'none', {}) +call hiTS('@constant.builtin', 'TSConstBuiltin', s:cdBlue, {}, 'none', {}) +call hiTS('@constant.macro', 'TSConstMacro', s:cdBlueGreen, {}, 'none', {}) +call hiTS('@string.regex', 'TSStringRegex', s:cdOrange, {}, 'none', {}) +call hiTS('@string', 'TSString', s:cdOrange, {}, 'none', {}) +call hiTS('@string.escape', 'TSStringEscape', s:cdYellowOrange, {}, 'none', {}) +call hiTS('@character', 'TSCharacter', s:cdOrange, {}, 'none', {}) +call hiTS('@number', 'TSNumber', s:cdLightGreen, {}, 'none', {}) +call hiTS('@boolean', 'TSBoolean', s:cdBlue, {}, 'none', {}) +call hiTS('@float', 'TSFloat', s:cdLightGreen, {}, 'none', {}) +call hiTS('@annotation', 'TSAnnotation', s:cdYellow, {}, 'none', {}) +call hiTS('@attribute', 'TSAttribute', s:cdBlueGreen, {}, 'none', {}) +call hiTS('@namespace', 'TSNamespace', s:cdBlueGreen, {}, 'none', {}) " Functions -call hi('TSFuncBuiltin', s:cdYellow, {}, 'none', {}) -call hi('TSFunction', s:cdYellow, {}, 'none', {}) -call hi('TSFuncMacro', s:cdYellow, {}, 'none', {}) -call hi('TSParameter', s:cdLightBlue, {}, 'none', {}) -call hi('TSParameterReference', s:cdLightBlue, {}, 'none', {}) -call hi('TSMethod', s:cdYellow, {}, 'none', {}) -call hi('TSField', s:cdLightBlue, {}, 'none', {}) -call hi('TSProperty', s:cdLightBlue, {}, 'none', {}) -call hi('TSConstructor', s:cdBlueGreen, {}, 'none', {}) +call hiTS('@function.builtin', 'TSFuncBuiltin', s:cdYellow, {}, 'none', {}) +call hiTS('@function', 'TSFunction', s:cdYellow, {}, 'none', {}) +call hiTS('@function.macro', 'TSFuncMacro', s:cdYellow, {}, 'none', {}) +call hiTS('@parameter', 'TSParameter', s:cdLightBlue, {}, 'none', {}) +call hiTS('@parameter.reference', 'TSParameterReference', s:cdLightBlue, {}, 'none', {}) +call hiTS('@method', 'TSMethod', s:cdYellow, {}, 'none', {}) +call hiTS('@field', 'TSField', s:cdLightBlue, {}, 'none', {}) +call hiTS('@property', 'TSProperty', s:cdLightBlue, {}, 'none', {}) +call hiTS('@constructor', 'TSConstructor', s:cdBlueGreen, {}, 'none', {}) " Keywords -call hi('TSConditional', s:cdPink, {}, 'none', {}) -call hi('TSRepeat', s:cdPink, {}, 'none', {}) -call hi('TSLabel', s:cdLightBlue, {}, 'none', {}) -call hi('TSKeyword', s:cdBlue, {}, 'none', {}) -call hi('TSKeywordFunction', s:cdBlue, {}, 'none', {}) -call hi('TSKeywordOperator', s:cdBlue, {}, 'none', {}) -call hi('TSOperator', s:cdFront, {}, 'none', {}) -call hi('TSException', s:cdPink, {}, 'none', {}) -call hi('TSType', s:cdBlueGreen, {}, 'none', {}) -call hi('TSTypeBuiltin', s:cdBlue, {}, 'none', {}) +call hiTS('@conditional', 'TSConditional', s:cdPink, {}, 'none', {}) +call hiTS('@repeat', 'TSRepeat', s:cdPink, {}, 'none', {}) +call hiTS('@label', 'TSLabel', s:cdLightBlue, {}, 'none', {}) +call hiTS('@keyword', 'TSKeyword', s:cdBlue, {}, 'none', {}) +call hiTS('@keyword.function', 'TSKeywordFunction', s:cdBlue, {}, 'none', {}) +call hiTS('@keyword.operator', 'TSKeywordOperator', s:cdBlue, {}, 'none', {}) +call hiTS('@operator', 'TSOperator', s:cdFront, {}, 'none', {}) +call hiTS('@exception', 'TSException', s:cdPink, {}, 'none', {}) +call hiTS('@type', 'TSType', s:cdBlueGreen, {}, 'none', {}) +call hiTS('@type.builtin', 'TSTypeBuiltin', s:cdBlue, {}, 'none', {}) call hi('TSStructure', s:cdLightBlue, {}, 'none', {}) -call hi('TSInclude', s:cdPink, {}, 'none', {}) +call hiTS('@include', 'TSInclude', s:cdPink, {}, 'none', {}) " Variable -call hi('TSVariable', s:cdLightBlue, {}, 'none', {}) -call hi('TSVariableBuiltin', s:cdLightBlue, {}, 'none', {}) +call hiTS('@variable', 'TSVariable', s:cdLightBlue, {}, 'none', {}) +call hiTS('@variable.builtin', 'TSVariableBuiltin', s:cdLightBlue, {}, 'none', {}) " Text -call hi('TSText', s:cdYellowOrange, {}, 'none', {}) -call hi('TSStrong', s:cdYellowOrange, {}, 'none', {}) -call hi('TSEmphasis', s:cdYellowOrange, {}, 'none', {}) -call hi('TSUnderline', s:cdYellowOrange, {}, 'none', {}) -call hi('TSTitle', s:cdYellowOrange, {}, 'none', {}) -call hi('TSLiteral', s:cdYellowOrange, {}, 'none', {}) -call hi('TSURI', s:cdYellowOrange, {}, 'none', {}) +call hiTS('@text', 'TSText', s:cdYellowOrange, {}, 'none', {}) +call hiTS('@text.strong', 'TSStrong', s:cdYellowOrange, {}, 'none', {}) +call hiTS('@text.emphasis', 'TSEmphasis', s:cdYellowOrange, {}, 'none', {}) +call hiTS('@text.underline', 'TSUnderline', s:cdYellowOrange, {}, 'none', {}) +call hiTS('@text.title', 'TSTitle', s:cdYellowOrange, {}, 'none', {}) +call hiTS('@text.literal', 'TSLiteral', s:cdYellowOrange, {}, 'none', {}) +call hiTS('@text.uri', 'TSURI', s:cdYellowOrange, {}, 'none', {}) " Tags -call hi('TSTag', s:cdBlue, {}, 'none', {}) -call hi('TSTagDelimiter', s:cdGray, {}, 'none', {}) +call hiTS('@tag', 'TSTag', s:cdBlue, {}, 'none', {}) +call hiTS('@tag.delimiter', 'TSTagDelimiter', s:cdGray, {}, 'none', {}) " Markdown: call hi('markdownH1', s:cdBlue, {}, 'bold', {}) From 6ba98ecdb392d855ca5ec4093f73d1f516926249 Mon Sep 17 00:00:00 2001 From: saccarosium Date: Tue, 1 Nov 2022 12:11:00 +0100 Subject: [PATCH 27/28] Fix remove strikethough for retro compatability (#104) --- colors/codedark.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index 1adb360..4b1b5e3 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -106,7 +106,7 @@ let s:cdDiffGreenLight = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58' let s:cdDiffBlueLight = {'gui': '#87d7ff', 'cterm': s:cterm0C, 'cterm256': '117'} let s:cdDiffBlue = {'gui': '#005f87', 'cterm': s:cterm0D, 'cterm256': '24'} -let s:cdSearchCurrent = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} +let s:cdSearchCurrent = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} let s:cdSearch = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'} " Syntax colors: @@ -616,7 +616,7 @@ call hi('CocHighlightText', {}, s:cdSelection, 'none', {}) call hi('CocExplorerIndentLine', s:cdCursorDark, {}, 'none', {}) " nvim-cmp -call hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'strikethrough', {}) +call hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'none', {}) call hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {}) call hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {}) call hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {}) From 126c3f47c4dca7abc0c83d39dd2c8cf0aaeeed88 Mon Sep 17 00:00:00 2001 From: saccarosium Date: Sat, 28 Jan 2023 17:16:53 +0100 Subject: [PATCH 28/28] Fix load neovim highlights only on neovim --- colors/codedark.vim | 140 ++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 69 deletions(-) diff --git a/colors/codedark.vim b/colors/codedark.vim index d2291e7..322d869 100644 --- a/colors/codedark.vim +++ b/colors/codedark.vim @@ -245,63 +245,78 @@ call hi('SpellCap', s:cdRed, s:cdBack, 'undercurl', s:cdRed) call hi('SpellRare', s:cdRed, s:cdBack, 'undercurl', s:cdRed) call hi('SpellLocal', s:cdRed, s:cdBack, 'undercurl', s:cdRed) +" Make neovim specific groups load only on Neovim +if has("nvim") + " Neovim Treesitter: + call hiTS('@error', 'TSError', s:cdRed, {}, 'none', {}) + call hiTS('@punctuation.delimiter', 'TSPunctDelimiter', s:cdFront, {}, 'none', {}) + call hiTS('@punctuation.bracket', 'TSPunctBracket', s:cdFront, {}, 'none', {}) + call hiTS('@punctuation.special', 'TSPunctSpecial', s:cdFront, {}, 'none', {}) + " Constant + call hiTS('@constant', 'TSConstant', s:cdYellow, {}, 'none', {}) + call hiTS('@constant.builtin', 'TSConstBuiltin', s:cdBlue, {}, 'none', {}) + call hiTS('@constant.macro', 'TSConstMacro', s:cdBlueGreen, {}, 'none', {}) + call hiTS('@string.regex', 'TSStringRegex', s:cdOrange, {}, 'none', {}) + call hiTS('@string', 'TSString', s:cdOrange, {}, 'none', {}) + call hiTS('@string.escape', 'TSStringEscape', s:cdYellowOrange, {}, 'none', {}) + call hiTS('@character', 'TSCharacter', s:cdOrange, {}, 'none', {}) + call hiTS('@number', 'TSNumber', s:cdLightGreen, {}, 'none', {}) + call hiTS('@boolean', 'TSBoolean', s:cdBlue, {}, 'none', {}) + call hiTS('@float', 'TSFloat', s:cdLightGreen, {}, 'none', {}) + call hiTS('@annotation', 'TSAnnotation', s:cdYellow, {}, 'none', {}) + call hiTS('@attribute', 'TSAttribute', s:cdBlueGreen, {}, 'none', {}) + call hiTS('@namespace', 'TSNamespace', s:cdBlueGreen, {}, 'none', {}) + " Functions + call hiTS('@function.builtin', 'TSFuncBuiltin', s:cdYellow, {}, 'none', {}) + call hiTS('@function', 'TSFunction', s:cdYellow, {}, 'none', {}) + call hiTS('@function.macro', 'TSFuncMacro', s:cdYellow, {}, 'none', {}) + call hiTS('@parameter', 'TSParameter', s:cdLightBlue, {}, 'none', {}) + call hiTS('@parameter.reference', 'TSParameterReference', s:cdLightBlue, {}, 'none', {}) + call hiTS('@method', 'TSMethod', s:cdYellow, {}, 'none', {}) + call hiTS('@field', 'TSField', s:cdLightBlue, {}, 'none', {}) + call hiTS('@property', 'TSProperty', s:cdLightBlue, {}, 'none', {}) + call hiTS('@constructor', 'TSConstructor', s:cdBlueGreen, {}, 'none', {}) + " Keywords + call hiTS('@conditional', 'TSConditional', s:cdPink, {}, 'none', {}) + call hiTS('@repeat', 'TSRepeat', s:cdPink, {}, 'none', {}) + call hiTS('@label', 'TSLabel', s:cdLightBlue, {}, 'none', {}) + call hiTS('@keyword', 'TSKeyword', s:cdBlue, {}, 'none', {}) + call hiTS('@keyword.function', 'TSKeywordFunction', s:cdBlue, {}, 'none', {}) + call hiTS('@keyword.operator', 'TSKeywordOperator', s:cdBlue, {}, 'none', {}) + call hiTS('@operator', 'TSOperator', s:cdFront, {}, 'none', {}) + call hiTS('@exception', 'TSException', s:cdPink, {}, 'none', {}) + call hiTS('@type', 'TSType', s:cdBlueGreen, {}, 'none', {}) + call hiTS('@type.builtin', 'TSTypeBuiltin', s:cdBlue, {}, 'none', {}) + call hi('TSStructure', s:cdLightBlue, {}, 'none', {}) + call hiTS('@include', 'TSInclude', s:cdPink, {}, 'none', {}) + " Variable + call hiTS('@variable', 'TSVariable', s:cdLightBlue, {}, 'none', {}) + call hiTS('@variable.builtin', 'TSVariableBuiltin', s:cdLightBlue, {}, 'none', {}) + " Text + call hiTS('@text', 'TSText', s:cdYellowOrange, {}, 'none', {}) + call hiTS('@text.strong', 'TSStrong', s:cdYellowOrange, {}, 'none', {}) + call hiTS('@text.emphasis', 'TSEmphasis', s:cdYellowOrange, {}, 'none', {}) + call hiTS('@text.underline', 'TSUnderline', s:cdYellowOrange, {}, 'none', {}) + call hiTS('@text.title', 'TSTitle', s:cdYellowOrange, {}, 'none', {}) + call hiTS('@text.literal', 'TSLiteral', s:cdYellowOrange, {}, 'none', {}) + call hiTS('@text.uri', 'TSURI', s:cdYellowOrange, {}, 'none', {}) + " Tags + call hiTS('@tag', 'TSTag', s:cdBlue, {}, 'none', {}) + call hiTS('@tag.delimiter', 'TSTagDelimiter', s:cdGray, {}, 'none', {}) -" Neovim Treesitter: -call hiTS('@error', 'TSError', s:cdRed, {}, 'none', {}) -call hiTS('@punctuation.delimiter', 'TSPunctDelimiter', s:cdFront, {}, 'none', {}) -call hiTS('@punctuation.bracket', 'TSPunctBracket', s:cdFront, {}, 'none', {}) -call hiTS('@punctuation.special', 'TSPunctSpecial', s:cdFront, {}, 'none', {}) -" Constant -call hiTS('@constant', 'TSConstant', s:cdYellow, {}, 'none', {}) -call hiTS('@constant.builtin', 'TSConstBuiltin', s:cdBlue, {}, 'none', {}) -call hiTS('@constant.macro', 'TSConstMacro', s:cdBlueGreen, {}, 'none', {}) -call hiTS('@string.regex', 'TSStringRegex', s:cdOrange, {}, 'none', {}) -call hiTS('@string', 'TSString', s:cdOrange, {}, 'none', {}) -call hiTS('@string.escape', 'TSStringEscape', s:cdYellowOrange, {}, 'none', {}) -call hiTS('@character', 'TSCharacter', s:cdOrange, {}, 'none', {}) -call hiTS('@number', 'TSNumber', s:cdLightGreen, {}, 'none', {}) -call hiTS('@boolean', 'TSBoolean', s:cdBlue, {}, 'none', {}) -call hiTS('@float', 'TSFloat', s:cdLightGreen, {}, 'none', {}) -call hiTS('@annotation', 'TSAnnotation', s:cdYellow, {}, 'none', {}) -call hiTS('@attribute', 'TSAttribute', s:cdBlueGreen, {}, 'none', {}) -call hiTS('@namespace', 'TSNamespace', s:cdBlueGreen, {}, 'none', {}) -" Functions -call hiTS('@function.builtin', 'TSFuncBuiltin', s:cdYellow, {}, 'none', {}) -call hiTS('@function', 'TSFunction', s:cdYellow, {}, 'none', {}) -call hiTS('@function.macro', 'TSFuncMacro', s:cdYellow, {}, 'none', {}) -call hiTS('@parameter', 'TSParameter', s:cdLightBlue, {}, 'none', {}) -call hiTS('@parameter.reference', 'TSParameterReference', s:cdLightBlue, {}, 'none', {}) -call hiTS('@method', 'TSMethod', s:cdYellow, {}, 'none', {}) -call hiTS('@field', 'TSField', s:cdLightBlue, {}, 'none', {}) -call hiTS('@property', 'TSProperty', s:cdLightBlue, {}, 'none', {}) -call hiTS('@constructor', 'TSConstructor', s:cdBlueGreen, {}, 'none', {}) -" Keywords -call hiTS('@conditional', 'TSConditional', s:cdPink, {}, 'none', {}) -call hiTS('@repeat', 'TSRepeat', s:cdPink, {}, 'none', {}) -call hiTS('@label', 'TSLabel', s:cdLightBlue, {}, 'none', {}) -call hiTS('@keyword', 'TSKeyword', s:cdBlue, {}, 'none', {}) -call hiTS('@keyword.function', 'TSKeywordFunction', s:cdBlue, {}, 'none', {}) -call hiTS('@keyword.operator', 'TSKeywordOperator', s:cdBlue, {}, 'none', {}) -call hiTS('@operator', 'TSOperator', s:cdFront, {}, 'none', {}) -call hiTS('@exception', 'TSException', s:cdPink, {}, 'none', {}) -call hiTS('@type', 'TSType', s:cdBlueGreen, {}, 'none', {}) -call hiTS('@type.builtin', 'TSTypeBuiltin', s:cdBlue, {}, 'none', {}) -call hi('TSStructure', s:cdLightBlue, {}, 'none', {}) -call hiTS('@include', 'TSInclude', s:cdPink, {}, 'none', {}) -" Variable -call hiTS('@variable', 'TSVariable', s:cdLightBlue, {}, 'none', {}) -call hiTS('@variable.builtin', 'TSVariableBuiltin', s:cdLightBlue, {}, 'none', {}) -" Text -call hiTS('@text', 'TSText', s:cdYellowOrange, {}, 'none', {}) -call hiTS('@text.strong', 'TSStrong', s:cdYellowOrange, {}, 'none', {}) -call hiTS('@text.emphasis', 'TSEmphasis', s:cdYellowOrange, {}, 'none', {}) -call hiTS('@text.underline', 'TSUnderline', s:cdYellowOrange, {}, 'none', {}) -call hiTS('@text.title', 'TSTitle', s:cdYellowOrange, {}, 'none', {}) -call hiTS('@text.literal', 'TSLiteral', s:cdYellowOrange, {}, 'none', {}) -call hiTS('@text.uri', 'TSURI', s:cdYellowOrange, {}, 'none', {}) -" Tags -call hiTS('@tag', 'TSTag', s:cdBlue, {}, 'none', {}) -call hiTS('@tag.delimiter', 'TSTagDelimiter', s:cdGray, {}, 'none', {}) + " nvim-cmp + call hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'none', {}) + call hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {}) + call hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {}) + call hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {}) + call hi('CmpItemKindInterface', s:cdLightBlue, {}, 'none', {}) + call hi('CmpItemKindText', s:cdLightBlue, {}, 'none', {}) + call hi('CmpItemKindFunction', s:cdPink, {}, 'none', {}) + call hi('CmpItemKindMethod ', s:cdPink, {}, 'none', {}) + call hi('CmpItemKindKeyword', s:cdFront, {}, 'none', {}) + call hi('CmpItemKindProperty', s:cdFront, {}, 'none', {}) + call hi('CmpItemKindUnit', s:cdFront, {}, 'none', {}) +endif " Markdown: call hi('markdownH1', s:cdBlue, {}, 'bold', {}) @@ -618,16 +633,3 @@ call hi('LspCxxHlSymNamespace', s:cdSilver, {}, 'none', {}) " Coc Explorer: call hi('CocHighlightText', {}, s:cdSelection, 'none', {}) call hi('CocExplorerIndentLine', s:cdCursorDark, {}, 'none', {}) - -" nvim-cmp -call hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'none', {}) -call hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {}) -call hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {}) -call hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {}) -call hi('CmpItemKindInterface', s:cdLightBlue, {}, 'none', {}) -call hi('CmpItemKindText', s:cdLightBlue, {}, 'none', {}) -call hi('CmpItemKindFunction', s:cdPink, {}, 'none', {}) -call hi('CmpItemKindMethod ', s:cdPink, {}, 'none', {}) -call hi('CmpItemKindKeyword', s:cdFront, {}, 'none', {}) -call hi('CmpItemKindProperty', s:cdFront, {}, 'none', {}) -call hi('CmpItemKindUnit', s:cdFront, {}, 'none', {})