Skip to content

Commit fa2242a

Browse files
roostaroosta
committed
fix: fix conditional loading of plugin colors
These variables doesn't exist when the colorscheme is loaded, config have to be re-sourced to get the correct colors. Holdover from refactor.
1 parent 8fc46b6 commit fa2242a

File tree

1 file changed

+126
-151
lines changed

1 file changed

+126
-151
lines changed

‎colors/srcery.vim

Lines changed: 126 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,11 +1158,9 @@ hi! link xmlEntityPunct SrceryYellow
11581158

11591159
" Sneak: {{{
11601160

1161-
if exists('g:loaded_sneak_plugin')
1162-
hi! link Sneak Search
1163-
call s:HL('SneakScope', s:none, s:hard_black)
1164-
hi! link SneakLabel Search
1165-
endif
1161+
hi! link Sneak Search
1162+
call s:HL('SneakScope', s:none, s:hard_black)
1163+
hi! link SneakLabel Search
11661164

11671165
" }}}
11681166
" Rainbow Parentheses: {{{
@@ -1194,57 +1192,47 @@ let g:niji_light_colours = g:rbpt_colorpairs
11941192
"}}}
11951193
" GitGutter: {{{
11961194

1197-
if exists('g:loaded_gitgutter')
1198-
hi! link GitGutterAdd SrceryGreen
1199-
hi! link GitGutterChange SrceryYellow
1200-
hi! link GitGutterDelete SrceryRed
1201-
hi! link GitGutterChangeDelete SrceryYellow
1202-
endif
1195+
hi! link GitGutterAdd SrceryGreen
1196+
hi! link GitGutterChange SrceryYellow
1197+
hi! link GitGutterDelete SrceryRed
1198+
hi! link GitGutterChangeDelete SrceryYellow
12031199

12041200
" }}}
12051201
" Asynchronous Lint Engine: {{{
12061202

1207-
if exists('g:ale_enabled')
1208-
call s:HL('ALEError', s:none, s:none, s:undercurl, s:red)
1209-
call s:HL('ALEWarning', s:none, s:none, s:undercurl, s:yellow)
1210-
call s:HL('ALEInfo', s:none, s:none, s:undercurl, s:blue)
1203+
call s:HL('ALEError', s:none, s:none, s:undercurl, s:red)
1204+
call s:HL('ALEWarning', s:none, s:none, s:undercurl, s:yellow)
1205+
call s:HL('ALEInfo', s:none, s:none, s:undercurl, s:blue)
12111206

1212-
hi! link ALEErrorSign SrceryRed
1213-
hi! link ALEWarningSign SrceryYellow
1214-
hi! link ALEInfoSign SrceryBlue
1215-
endif
1207+
hi! link ALEErrorSign SrceryRed
1208+
hi! link ALEWarningSign SrceryYellow
1209+
hi! link ALEInfoSign SrceryBlue
12161210

12171211
" }}}
12181212

12191213
" vim-indent-guides: {{{
1220-
if exists('g:loaded_indent_guides')
1221-
call s:HL('IndentGuidesEven', s:none, s:xgray3)
1222-
call s:HL('IndentGuidesOdd', s:none, s:xgray4)
1223-
endif
1214+
call s:HL('IndentGuidesEven', s:none, s:xgray3)
1215+
call s:HL('IndentGuidesOdd', s:none, s:xgray4)
12241216

12251217
" }}}
12261218
" vim-startify: {{{
12271219

1228-
if exists('g:loaded_startify')
1229-
hi! link StartifyNumber Statement
1230-
hi! link StartifyFile Normal
1231-
hi! link StartifyPath String
1232-
hi! link StartifySlash Normal
1233-
hi! link StartifyBracket Comment
1234-
hi! link StartifyHeader Type
1235-
hi! link StartifyFooter Normal
1236-
hi! link StartifySpecial Comment
1237-
hi! link StartifySection Identifier
1238-
endif
1220+
hi! link StartifyNumber Statement
1221+
hi! link StartifyFile Normal
1222+
hi! link StartifyPath String
1223+
hi! link StartifySlash Normal
1224+
hi! link StartifyBracket Comment
1225+
hi! link StartifyHeader Type
1226+
hi! link StartifyFooter Normal
1227+
hi! link StartifySpecial Comment
1228+
hi! link StartifySection Identifier
12391229

12401230
" }}}
12411231
" fzf: {{{
12421232

1243-
if exists('g:loaded_fzf')
1244-
call s:HL('fzf1', s:magenta, s:xgray2)
1245-
call s:HL('fzf2', s:bright_green, s:xgray2)
1246-
call s:HL('fzf3', s:bright_white, s:xgray2)
1247-
endif
1233+
call s:HL('fzf1', s:magenta, s:xgray2)
1234+
call s:HL('fzf2', s:bright_green, s:xgray2)
1235+
call s:HL('fzf3', s:bright_white, s:xgray2)
12481236

12491237
"}}}
12501238

@@ -1265,142 +1253,129 @@ hi! link netrwCmdSep SrceryBrightBlack
12651253
"}}}
12661254
" coc.nvim: {{{
12671255

1268-
if exists('g:did_coc_loaded')
1269-
hi! link CocErrorSign SrceryRed
1270-
hi! link CocWarningSign SrceryBrightOrange
1271-
hi! link CocInfoSign SrceryYellow
1272-
hi! link CocHintSign SrceryBlue
1273-
hi! link CocErrorFloat SrceryRed
1274-
hi! link CocWarningFloat SrceryOrange
1275-
hi! link CocInfoFloat SrceryYellow
1276-
hi! link CocHintFloat SrceryBlue
1277-
hi! link CocDiagnosticsError SrceryRed
1278-
hi! link CocDiagnosticsWarning SrceryOrange
1279-
hi! link CocDiagnosticsInfo SrceryYellow
1280-
hi! link CocDiagnosticsHint SrceryBlue
1281-
1282-
hi! link CocSelectedText SrceryRed
1283-
hi! link CocCodeLens SrceryWhite
1284-
1285-
call s:HL('CocErrorHighlight', s:none, s:none, s:undercurl, s:red)
1286-
call s:HL('CocWarningHighlight', s:none, s:none, s:undercurl, s:bright_orange)
1287-
call s:HL('CocInfoHighlight', s:none, s:none, s:undercurl, s:yellow)
1288-
call s:HL('CocHintHighlight', s:none, s:none, s:undercurl, s:blue)
1289-
endif
1256+
hi! link CocErrorSign SrceryRed
1257+
hi! link CocWarningSign SrceryBrightOrange
1258+
hi! link CocInfoSign SrceryYellow
1259+
hi! link CocHintSign SrceryBlue
1260+
hi! link CocErrorFloat SrceryRed
1261+
hi! link CocWarningFloat SrceryOrange
1262+
hi! link CocInfoFloat SrceryYellow
1263+
hi! link CocHintFloat SrceryBlue
1264+
hi! link CocDiagnosticsError SrceryRed
1265+
hi! link CocDiagnosticsWarning SrceryOrange
1266+
hi! link CocDiagnosticsInfo SrceryYellow
1267+
hi! link CocDiagnosticsHint SrceryBlue
1268+
1269+
hi! link CocSelectedText SrceryRed
1270+
hi! link CocCodeLens SrceryWhite
1271+
1272+
call s:HL('CocErrorHighlight', s:none, s:none, s:undercurl, s:red)
1273+
call s:HL('CocWarningHighlight', s:none, s:none, s:undercurl, s:bright_orange)
1274+
call s:HL('CocInfoHighlight', s:none, s:none, s:undercurl, s:yellow)
1275+
call s:HL('CocHintHighlight', s:none, s:none, s:undercurl, s:blue)
12901276

12911277
" }}}
12921278
" CtrlP: "{{{
12931279

1294-
if exists('g:loaded_ctrlp')
1295-
hi! link CtrlPMatch SrceryMagenta
1296-
hi! link CtrlPLinePre SrceryBrightGreen
1297-
call s:HL('CtrlPMode1', s:bright_white, s:xgray3)
1298-
call s:HL('CtrlPMode2', s:bright_white, s:xgray5)
1299-
call s:HL('CtrlPStats', s:yellow, s:xgray2)
1300-
endif
1280+
hi! link CtrlPMatch SrceryMagenta
1281+
hi! link CtrlPLinePre SrceryBrightGreen
1282+
call s:HL('CtrlPMode1', s:bright_white, s:xgray3)
1283+
call s:HL('CtrlPMode2', s:bright_white, s:xgray5)
1284+
call s:HL('CtrlPStats', s:yellow, s:xgray2)
13011285

13021286
" }}}
13031287
" NERDTree: "{{{
13041288

1305-
if exists('g:loaded_nerd_tree')
1306-
hi! link NERDTreeDir SrceryBlue
1307-
hi! link NERDTreeDirSlash SrceryCyan
1308-
hi! link NERDTreeOpenable SrceryBlue
1309-
hi! link NERDTreeClosable SrceryBlue
1310-
hi! link NERDTreeFile SrceryWhite
1311-
hi! link NERDTreeExecFile SrceryYellow
1312-
hi! link NERDTreeUp SrceryOrange
1313-
hi! link NERDTreeCWD SrceryGreen
1314-
hi! link NERDTreeHelp SrceryCyan
1315-
hi! link NERDTreeFlags SrceryCyan
1316-
hi! link NERDTreeLinkFile SrceryBrightBlack
1317-
hi! link NERDTreeLinkTarget SrceryBrightBlack
1318-
endif
1289+
hi! link NERDTreeDir SrceryBlue
1290+
hi! link NERDTreeDirSlash SrceryCyan
1291+
hi! link NERDTreeOpenable SrceryBlue
1292+
hi! link NERDTreeClosable SrceryBlue
1293+
hi! link NERDTreeFile SrceryWhite
1294+
hi! link NERDTreeExecFile SrceryYellow
1295+
hi! link NERDTreeUp SrceryOrange
1296+
hi! link NERDTreeCWD SrceryGreen
1297+
hi! link NERDTreeHelp SrceryCyan
1298+
hi! link NERDTreeFlags SrceryCyan
1299+
hi! link NERDTreeLinkFile SrceryBrightBlack
1300+
hi! link NERDTreeLinkTarget SrceryBrightBlack
13191301

13201302
" }}}
13211303
" Telescope: "{{{
13221304

1323-
if exists('g:loaded_telescope')
1324-
call s:HL('TelescopeNormal', s:white, s:none)
1325-
call s:HL('TelescopeSelection', s:green, s:none, s:bold)
1326-
call s:HL('TelescopeMatching', s:magenta)
1327-
call s:HL('TelescopeSelectionCaret', s:magenta)
1328-
call s:HL('TelescopePromptPrefix', s:bright_yellow)
1329-
endif
1305+
call s:HL('TelescopeNormal', s:white, s:none)
1306+
call s:HL('TelescopeSelection', s:green, s:none, s:bold)
1307+
call s:HL('TelescopeMatching', s:magenta)
1308+
call s:HL('TelescopeSelectionCaret', s:magenta)
1309+
call s:HL('TelescopePromptPrefix', s:bright_yellow)
13301310

13311311
" }}}
13321312
" nvim-cmp: "{{{
13331313

1334-
if exists('g:loaded_cmp')
1335-
hi! link CmpItemAbbr Pmenu
1336-
hi! link CmpItemAbbrDeprecated Comment
1337-
hi! link CmpItemAbbrMatch Pmenu
1338-
hi! link CmpItemAbbrMatchFuzzy Pmenu
1339-
hi! link CmpItemKind Special
1340-
hi! link CmpItemMenu Pmenu
1341-
endif
1314+
hi! link CmpItemAbbr Pmenu
1315+
hi! link CmpItemAbbrDeprecated Comment
1316+
hi! link CmpItemAbbrMatch Pmenu
1317+
hi! link CmpItemAbbrMatchFuzzy Pmenu
1318+
hi! link CmpItemKind Special
1319+
hi! link CmpItemMenu Pmenu
13421320

13431321
" }}}
13441322
" nvim: {{{
13451323

13461324
if has('nvim')
1347-
13481325
" nvim-treesitter: {{{
13491326

1350-
if exists('g:loaded_nvim_treesitter')
1351-
" This is deprecated in new nvim releases
1352-
call s:HL('TSStrong', s:none, s:none, s:bold)
1353-
call s:HL('TSEmphasis', s:none, s:none, s:bold)
1354-
call s:HL('TSUnderline', s:none, s:none, s:underline)
1355-
1356-
highlight! link TSWarning SrceryOrangeBold
1357-
highlight! link TSDanger SrceryRedBold
1358-
highlight! link TSConstBuiltin SrceryCyan
1359-
highlight! link TSField SrceryGreen
1360-
highlight! link TSFuncBuiltin SrceryYellow
1361-
highlight! link TSFuncMacro SrceryOrange
1362-
highlight! link TSFunction SrceryYellow
1363-
call s:HL('TSNamespace', s:white, s:none, s:italic)
1364-
call s:HL('TSParameter', s:cyan, s:none, s:italic)
1365-
highlight! link TSProperty SrceryBrightBlue
1366-
highlight! link TSSymbol SrceryBlue
1367-
highlight! link TSTag SrceryBlue
1368-
highlight! link TSTagAttribute SrceryYellow
1369-
highlight! link TSVariableBuiltin SrceryCyan
1370-
highlight! link TSType SrceryWhite
1371-
highlight! link TSDelimiter SrceryWhite
1372-
highlight! link TSURI SrceryGreen
1373-
highlight! link TSVariable SrceryBrightWhite
1374-
1375-
if has('nvim-0.8')
1376-
highlight! link @text.strong TSStrong
1377-
highlight! link @text.emphasis TSEmphasis
1378-
highlight! link @text.underline TSUnderline
1379-
highlight! link @text.warning TSWarning
1380-
highlight! link @text.danger TSDanger
1381-
highlight! link @constant.builtin TSConstBuiltin
1382-
highlight! link @field TSField
1383-
highlight! link @function.builtin TSFuncBuiltin
1384-
highlight! link @function.macro TSFuncMacro
1385-
highlight! link @function TSFunction
1386-
highlight! link @namespace TSNamespace
1387-
highlight! link @parameter TSParameter
1388-
highlight! link @property TSProperty
1389-
highlight! link @symbol TSSymbol
1390-
highlight! link @tag TSTag
1391-
highlight! link @tag.attribute TSTagAttribute
1392-
highlight! link @variable.builtin TSVariableBuiltin
1393-
highlight! link @type TSType
1394-
highlight! link @delimiter TSDelimiter
1395-
highlight! link @text.uri TSURI
1396-
highlight! link @variable TSVariable
1397-
1398-
call s:HL('@markup.strong', s:none, s:none, s:bold)
1399-
call s:HL('@markup.italic', s:none, s:none, s:italic)
1400-
call s:HL('@markup.underline', s:none, s:none, s:underline)
1401-
call s:HL('@markup.strikethrough', s:none, s:none, s:strikethrough)
1327+
" This is deprecated in new nvim releases
1328+
call s:HL('TSStrong', s:none, s:none, s:bold)
1329+
call s:HL('TSEmphasis', s:none, s:none, s:bold)
1330+
call s:HL('TSUnderline', s:none, s:none, s:underline)
1331+
1332+
highlight! link TSWarning SrceryOrangeBold
1333+
highlight! link TSDanger SrceryRedBold
1334+
highlight! link TSConstBuiltin SrceryCyan
1335+
highlight! link TSField SrceryGreen
1336+
highlight! link TSFuncBuiltin SrceryYellow
1337+
highlight! link TSFuncMacro SrceryOrange
1338+
highlight! link TSFunction SrceryYellow
1339+
call s:HL('TSNamespace', s:white, s:none, s:italic)
1340+
call s:HL('TSParameter', s:cyan, s:none, s:italic)
1341+
highlight! link TSProperty SrceryBrightBlue
1342+
highlight! link TSSymbol SrceryBlue
1343+
highlight! link TSTag SrceryBlue
1344+
highlight! link TSTagAttribute SrceryYellow
1345+
highlight! link TSVariableBuiltin SrceryCyan
1346+
highlight! link TSType SrceryWhite
1347+
highlight! link TSDelimiter SrceryWhite
1348+
highlight! link TSURI SrceryGreen
1349+
highlight! link TSVariable SrceryBrightWhite
1350+
1351+
if has('nvim-0.8')
1352+
highlight! link @text.strong TSStrong
1353+
highlight! link @text.emphasis TSEmphasis
1354+
highlight! link @text.underline TSUnderline
1355+
highlight! link @text.warning TSWarning
1356+
highlight! link @text.danger TSDanger
1357+
highlight! link @constant.builtin TSConstBuiltin
1358+
highlight! link @field TSField
1359+
highlight! link @function.builtin TSFuncBuiltin
1360+
highlight! link @function.macro TSFuncMacro
1361+
highlight! link @function TSFunction
1362+
highlight! link @namespace TSNamespace
1363+
highlight! link @parameter TSParameter
1364+
highlight! link @property TSProperty
1365+
highlight! link @symbol TSSymbol
1366+
highlight! link @tag TSTag
1367+
highlight! link @tag.attribute TSTagAttribute
1368+
highlight! link @variable.builtin TSVariableBuiltin
1369+
highlight! link @type TSType
1370+
highlight! link @delimiter TSDelimiter
1371+
highlight! link @text.uri TSURI
1372+
highlight! link @variable TSVariable
1373+
1374+
call s:HL('@markup.strong', s:none, s:none, s:bold)
1375+
call s:HL('@markup.italic', s:none, s:none, s:italic)
1376+
call s:HL('@markup.underline', s:none, s:none, s:underline)
1377+
call s:HL('@markup.strikethrough', s:none, s:none, s:strikethrough)
14021378

1403-
endif
14041379
endif
14051380

14061381
" }}}

0 commit comments

Comments
 (0)