From d916a6438c0616149e8dd34afa3e6767e5a2305f Mon Sep 17 00:00:00 2001 From: boweevil Date: Sun, 8 Dec 2019 20:49:43 -0500 Subject: [PATCH] Add support for ALE syntax checker https://github.com/dense-analysis/ale - General optimization of the tones for ALE highlighting in the sign column and on error and warning markings in file. - If 'g:ale_sign_highlight_linenrs' is enabled this will use Neovim's number line highlighting. --- colors/solarized8.vim | 200 ++++++++++++++++++++++++++++++++- colors/solarized8_flat.vim | 200 ++++++++++++++++++++++++++++++++- colors/solarized8_high.vim | 200 ++++++++++++++++++++++++++++++++- colors/solarized8_low.vim | 200 ++++++++++++++++++++++++++++++++- doc/solarized8.txt | 2 +- templates/_extra.colortemplate | 38 ++++++- 6 files changed, 834 insertions(+), 6 deletions(-) diff --git a/colors/solarized8.vim b/colors/solarized8.vim index 43f7e56..1b308e0 100644 --- a/colors/solarized8.vim +++ b/colors/solarized8.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sun Oct 6 12:55:59 2019 +" Last Updated: Mon 09 Dec 2019 05:36:49 AM EST " Generated by Colortemplate v2.0.0 @@ -403,6 +403,39 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi pandocEmphasisTable gui=NONE cterm=NONE hi pandocEmphasis gui=NONE cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign guifg=#dc322f guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEErrorSignLineNr guifg=#dc322f guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#2aa198 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#b58900 guibg=NONE guisp=NONE gui=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign guifg=#073642 guibg=#dc322f guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#073642 guibg=#2aa198 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#073642 guibg=#b58900 guisp=NONE gui=bold cterm=bold + else + hi ALEErrorSign guifg=#dc322f guibg=#073642 guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=#073642 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=#073642 guisp=NONE gui=bold cterm=bold + endif + hi ALEErrorSignLineNr guifg=#073642 guibg=#dc322f guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#073642 guibg=#2aa198 guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#073642 guibg=#b58900 guisp=NONE gui=NONE cterm=NONE + endif + hi ALEError guifg=#dc322f guibg=NONE guisp=#dc322f gui=undercurl cterm=undercurl + hi ALEErrorLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl cterm=undercurl + hi ALEInfoLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl cterm=undercurl + hi ALEWarningLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -773,6 +806,39 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi pandocEmphasisTable gui=NONE cterm=NONE hi pandocEmphasis gui=NONE cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign guifg=#dc322f guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEErrorSignLineNr guifg=#dc322f guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#2aa198 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#b58900 guibg=NONE guisp=NONE gui=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign guifg=#eee8d5 guibg=#dc322f guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#eee8d5 guibg=#2aa198 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#eee8d5 guibg=#b58900 guisp=NONE gui=bold cterm=bold + else + hi ALEErrorSign guifg=#dc322f guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + endif + hi ALEErrorSignLineNr guifg=#eee8d5 guibg=#dc322f guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#eee8d5 guibg=#2aa198 guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#eee8d5 guibg=#b58900 guisp=NONE gui=NONE cterm=NONE + endif + hi ALEError guifg=#dc322f guibg=NONE guisp=#dc322f gui=undercurl cterm=undercurl + hi ALEErrorLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl cterm=undercurl + hi ALEInfoLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl cterm=undercurl + hi ALEWarningLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1113,6 +1179,39 @@ if s:t_Co >= 256 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=160 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=160 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=37 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=136 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=236 ctermbg=160 cterm=bold + hi ALEInfoSign ctermfg=236 ctermbg=37 cterm=bold + hi ALEWarningSign ctermfg=236 ctermbg=136 cterm=bold + else + hi ALEErrorSign ctermfg=160 ctermbg=236 cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=236 cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=236 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=236 ctermbg=160 cterm=NONE + hi ALEInfoSignLineNr ctermfg=236 ctermbg=37 cterm=NONE + hi ALEWarningSignLineNr ctermfg=236 ctermbg=136 cterm=NONE + endif + hi ALEError ctermfg=160 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1462,6 +1561,39 @@ if s:t_Co >= 256 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=160 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=160 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=37 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=136 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=254 ctermbg=160 cterm=bold + hi ALEInfoSign ctermfg=254 ctermbg=37 cterm=bold + hi ALEWarningSign ctermfg=254 ctermbg=136 cterm=bold + else + hi ALEErrorSign ctermfg=160 ctermbg=254 cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=254 cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=254 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=254 ctermbg=160 cterm=NONE + hi ALEInfoSignLineNr ctermfg=254 ctermbg=37 cterm=NONE + hi ALEWarningSignLineNr ctermfg=254 ctermbg=136 cterm=NONE + endif + hi ALEError ctermfg=160 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1799,6 +1931,39 @@ if s:t_Co >= 16 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=1 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=1 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=6 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=3 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=0 ctermbg=1 cterm=bold + hi ALEInfoSign ctermfg=0 ctermbg=6 cterm=bold + hi ALEWarningSign ctermfg=0 ctermbg=3 cterm=bold + else + hi ALEErrorSign ctermfg=1 ctermbg=0 cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=0 cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=0 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=0 ctermbg=1 cterm=NONE + hi ALEInfoSignLineNr ctermfg=0 ctermbg=6 cterm=NONE + hi ALEWarningSignLineNr ctermfg=0 ctermbg=3 cterm=NONE + endif + hi ALEError ctermfg=1 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -2148,6 +2313,39 @@ if s:t_Co >= 16 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=1 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=1 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=6 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=3 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=7 ctermbg=1 cterm=bold + hi ALEInfoSign ctermfg=7 ctermbg=6 cterm=bold + hi ALEWarningSign ctermfg=7 ctermbg=3 cterm=bold + else + hi ALEErrorSign ctermfg=1 ctermbg=7 cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=7 cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=7 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=7 ctermbg=1 cterm=NONE + hi ALEInfoSignLineNr ctermfg=7 ctermbg=6 cterm=NONE + hi ALEWarningSignLineNr ctermfg=7 ctermbg=3 cterm=NONE + endif + hi ALEError ctermfg=1 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish diff --git a/colors/solarized8_flat.vim b/colors/solarized8_flat.vim index f1492c3..cb14614 100644 --- a/colors/solarized8_flat.vim +++ b/colors/solarized8_flat.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sun Oct 6 12:56:00 2019 +" Last Updated: Mon 09 Dec 2019 05:36:52 AM EST " Generated by Colortemplate v2.0.0 @@ -387,6 +387,39 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi pandocEmphasisTable gui=NONE cterm=NONE hi pandocEmphasis gui=NONE cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign guifg=#dc322f guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEErrorSignLineNr guifg=#dc322f guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#2aa198 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#b58900 guibg=NONE guisp=NONE gui=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign guifg=#073642 guibg=#dc322f guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#073642 guibg=#2aa198 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#073642 guibg=#b58900 guisp=NONE gui=bold cterm=bold + else + hi ALEErrorSign guifg=#dc322f guibg=#073642 guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=#073642 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=#073642 guisp=NONE gui=bold cterm=bold + endif + hi ALEErrorSignLineNr guifg=#073642 guibg=#dc322f guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#073642 guibg=#2aa198 guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#073642 guibg=#b58900 guisp=NONE gui=NONE cterm=NONE + endif + hi ALEError guifg=#dc322f guibg=NONE guisp=#dc322f gui=undercurl cterm=undercurl + hi ALEErrorLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl cterm=undercurl + hi ALEInfoLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl cterm=undercurl + hi ALEWarningLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -739,6 +772,39 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi pandocEmphasisTable gui=NONE cterm=NONE hi pandocEmphasis gui=NONE cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign guifg=#dc322f guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEErrorSignLineNr guifg=#dc322f guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#2aa198 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#b58900 guibg=NONE guisp=NONE gui=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign guifg=#eee8d5 guibg=#dc322f guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#eee8d5 guibg=#2aa198 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#eee8d5 guibg=#b58900 guisp=NONE gui=bold cterm=bold + else + hi ALEErrorSign guifg=#dc322f guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + endif + hi ALEErrorSignLineNr guifg=#eee8d5 guibg=#dc322f guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#eee8d5 guibg=#2aa198 guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#eee8d5 guibg=#b58900 guisp=NONE gui=NONE cterm=NONE + endif + hi ALEError guifg=#dc322f guibg=NONE guisp=#dc322f gui=undercurl cterm=undercurl + hi ALEErrorLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl cterm=undercurl + hi ALEInfoLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl cterm=undercurl + hi ALEWarningLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1063,6 +1129,39 @@ if s:t_Co >= 256 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=160 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=160 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=37 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=136 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=236 ctermbg=160 cterm=bold + hi ALEInfoSign ctermfg=236 ctermbg=37 cterm=bold + hi ALEWarningSign ctermfg=236 ctermbg=136 cterm=bold + else + hi ALEErrorSign ctermfg=160 ctermbg=236 cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=236 cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=236 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=236 ctermbg=160 cterm=NONE + hi ALEInfoSignLineNr ctermfg=236 ctermbg=37 cterm=NONE + hi ALEWarningSignLineNr ctermfg=236 ctermbg=136 cterm=NONE + endif + hi ALEError ctermfg=160 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1394,6 +1493,39 @@ if s:t_Co >= 256 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=160 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=160 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=37 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=136 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=254 ctermbg=160 cterm=bold + hi ALEInfoSign ctermfg=254 ctermbg=37 cterm=bold + hi ALEWarningSign ctermfg=254 ctermbg=136 cterm=bold + else + hi ALEErrorSign ctermfg=160 ctermbg=254 cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=254 cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=254 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=254 ctermbg=160 cterm=NONE + hi ALEInfoSignLineNr ctermfg=254 ctermbg=37 cterm=NONE + hi ALEWarningSignLineNr ctermfg=254 ctermbg=136 cterm=NONE + endif + hi ALEError ctermfg=160 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1715,6 +1847,39 @@ if s:t_Co >= 16 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=1 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=1 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=6 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=3 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=0 ctermbg=1 cterm=bold + hi ALEInfoSign ctermfg=0 ctermbg=6 cterm=bold + hi ALEWarningSign ctermfg=0 ctermbg=3 cterm=bold + else + hi ALEErrorSign ctermfg=1 ctermbg=0 cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=0 cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=0 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=0 ctermbg=1 cterm=NONE + hi ALEInfoSignLineNr ctermfg=0 ctermbg=6 cterm=NONE + hi ALEWarningSignLineNr ctermfg=0 ctermbg=3 cterm=NONE + endif + hi ALEError ctermfg=1 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -2046,6 +2211,39 @@ if s:t_Co >= 16 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=1 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=1 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=6 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=3 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=7 ctermbg=1 cterm=bold + hi ALEInfoSign ctermfg=7 ctermbg=6 cterm=bold + hi ALEWarningSign ctermfg=7 ctermbg=3 cterm=bold + else + hi ALEErrorSign ctermfg=1 ctermbg=7 cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=7 cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=7 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=7 ctermbg=1 cterm=NONE + hi ALEInfoSignLineNr ctermfg=7 ctermbg=6 cterm=NONE + hi ALEWarningSignLineNr ctermfg=7 ctermbg=3 cterm=NONE + endif + hi ALEError ctermfg=1 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish diff --git a/colors/solarized8_high.vim b/colors/solarized8_high.vim index a71eda9..58caae5 100644 --- a/colors/solarized8_high.vim +++ b/colors/solarized8_high.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sun Oct 6 12:56:02 2019 +" Last Updated: Mon 09 Dec 2019 05:36:54 AM EST " Generated by Colortemplate v2.0.0 @@ -399,6 +399,39 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi pandocEmphasisTable gui=NONE cterm=NONE hi pandocEmphasis gui=NONE cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign guifg=#dc322f guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEErrorSignLineNr guifg=#dc322f guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#2aa198 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#b58900 guibg=NONE guisp=NONE gui=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign guifg=#073642 guibg=#dc322f guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#073642 guibg=#2aa198 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#073642 guibg=#b58900 guisp=NONE gui=bold cterm=bold + else + hi ALEErrorSign guifg=#dc322f guibg=#073642 guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=#073642 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=#073642 guisp=NONE gui=bold cterm=bold + endif + hi ALEErrorSignLineNr guifg=#073642 guibg=#dc322f guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#073642 guibg=#2aa198 guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#073642 guibg=#b58900 guisp=NONE gui=NONE cterm=NONE + endif + hi ALEError guifg=#dc322f guibg=NONE guisp=#dc322f gui=undercurl cterm=undercurl + hi ALEErrorLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl cterm=undercurl + hi ALEInfoLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl cterm=undercurl + hi ALEWarningLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -765,6 +798,39 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi pandocEmphasisTable gui=NONE cterm=NONE hi pandocEmphasis gui=NONE cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign guifg=#dc322f guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEErrorSignLineNr guifg=#dc322f guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#2aa198 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#b58900 guibg=NONE guisp=NONE gui=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign guifg=#eee8d5 guibg=#dc322f guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#eee8d5 guibg=#2aa198 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#eee8d5 guibg=#b58900 guisp=NONE gui=bold cterm=bold + else + hi ALEErrorSign guifg=#dc322f guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + endif + hi ALEErrorSignLineNr guifg=#eee8d5 guibg=#dc322f guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#eee8d5 guibg=#2aa198 guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#eee8d5 guibg=#b58900 guisp=NONE gui=NONE cterm=NONE + endif + hi ALEError guifg=#dc322f guibg=NONE guisp=#dc322f gui=undercurl cterm=undercurl + hi ALEErrorLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl cterm=undercurl + hi ALEInfoLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl cterm=undercurl + hi ALEWarningLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1101,6 +1167,39 @@ if s:t_Co >= 256 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=160 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=160 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=37 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=136 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=236 ctermbg=160 cterm=bold + hi ALEInfoSign ctermfg=236 ctermbg=37 cterm=bold + hi ALEWarningSign ctermfg=236 ctermbg=136 cterm=bold + else + hi ALEErrorSign ctermfg=160 ctermbg=236 cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=236 cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=236 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=236 ctermbg=160 cterm=NONE + hi ALEInfoSignLineNr ctermfg=236 ctermbg=37 cterm=NONE + hi ALEWarningSignLineNr ctermfg=236 ctermbg=136 cterm=NONE + endif + hi ALEError ctermfg=160 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1446,6 +1545,39 @@ if s:t_Co >= 256 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=160 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=160 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=37 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=136 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=254 ctermbg=160 cterm=bold + hi ALEInfoSign ctermfg=254 ctermbg=37 cterm=bold + hi ALEWarningSign ctermfg=254 ctermbg=136 cterm=bold + else + hi ALEErrorSign ctermfg=160 ctermbg=254 cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=254 cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=254 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=254 ctermbg=160 cterm=NONE + hi ALEInfoSignLineNr ctermfg=254 ctermbg=37 cterm=NONE + hi ALEWarningSignLineNr ctermfg=254 ctermbg=136 cterm=NONE + endif + hi ALEError ctermfg=160 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1779,6 +1911,39 @@ if s:t_Co >= 16 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=1 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=1 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=6 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=3 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=0 ctermbg=1 cterm=bold + hi ALEInfoSign ctermfg=0 ctermbg=6 cterm=bold + hi ALEWarningSign ctermfg=0 ctermbg=3 cterm=bold + else + hi ALEErrorSign ctermfg=1 ctermbg=0 cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=0 cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=0 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=0 ctermbg=1 cterm=NONE + hi ALEInfoSignLineNr ctermfg=0 ctermbg=6 cterm=NONE + hi ALEWarningSignLineNr ctermfg=0 ctermbg=3 cterm=NONE + endif + hi ALEError ctermfg=1 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -2124,6 +2289,39 @@ if s:t_Co >= 16 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=1 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=1 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=6 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=3 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=7 ctermbg=1 cterm=bold + hi ALEInfoSign ctermfg=7 ctermbg=6 cterm=bold + hi ALEWarningSign ctermfg=7 ctermbg=3 cterm=bold + else + hi ALEErrorSign ctermfg=1 ctermbg=7 cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=7 cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=7 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=7 ctermbg=1 cterm=NONE + hi ALEInfoSignLineNr ctermfg=7 ctermbg=6 cterm=NONE + hi ALEWarningSignLineNr ctermfg=7 ctermbg=3 cterm=NONE + endif + hi ALEError ctermfg=1 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish diff --git a/colors/solarized8_low.vim b/colors/solarized8_low.vim index 0b8f355..42ae3df 100644 --- a/colors/solarized8_low.vim +++ b/colors/solarized8_low.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sun Oct 6 12:56:03 2019 +" Last Updated: Mon 09 Dec 2019 05:36:56 AM EST " Generated by Colortemplate v2.0.0 @@ -397,6 +397,39 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi pandocEmphasisTable gui=NONE cterm=NONE hi pandocEmphasis gui=NONE cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign guifg=#dc322f guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEErrorSignLineNr guifg=#dc322f guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#2aa198 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#b58900 guibg=NONE guisp=NONE gui=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign guifg=#073642 guibg=#dc322f guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#073642 guibg=#2aa198 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#073642 guibg=#b58900 guisp=NONE gui=bold cterm=bold + else + hi ALEErrorSign guifg=#dc322f guibg=#073642 guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=#073642 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=#073642 guisp=NONE gui=bold cterm=bold + endif + hi ALEErrorSignLineNr guifg=#073642 guibg=#dc322f guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#073642 guibg=#2aa198 guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#073642 guibg=#b58900 guisp=NONE gui=NONE cterm=NONE + endif + hi ALEError guifg=#dc322f guibg=NONE guisp=#dc322f gui=undercurl cterm=undercurl + hi ALEErrorLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl cterm=undercurl + hi ALEInfoLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl cterm=undercurl + hi ALEWarningLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -765,6 +798,39 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi pandocEmphasisTable gui=NONE cterm=NONE hi pandocEmphasis gui=NONE cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign guifg=#dc322f guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ALEErrorSignLineNr guifg=#dc322f guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#2aa198 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#b58900 guibg=NONE guisp=NONE gui=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign guifg=#eee8d5 guibg=#dc322f guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#eee8d5 guibg=#2aa198 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#eee8d5 guibg=#b58900 guisp=NONE gui=bold cterm=bold + else + hi ALEErrorSign guifg=#dc322f guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + hi ALEInfoSign guifg=#2aa198 guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + hi ALEWarningSign guifg=#b58900 guibg=#eee8d5 guisp=NONE gui=bold cterm=bold + endif + hi ALEErrorSignLineNr guifg=#eee8d5 guibg=#dc322f guisp=NONE gui=NONE cterm=NONE + hi ALEInfoSignLineNr guifg=#eee8d5 guibg=#2aa198 guisp=NONE gui=NONE cterm=NONE + hi ALEWarningSignLineNr guifg=#eee8d5 guibg=#b58900 guisp=NONE gui=NONE cterm=NONE + endif + hi ALEError guifg=#dc322f guibg=NONE guisp=#dc322f gui=undercurl cterm=undercurl + hi ALEErrorLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl cterm=undercurl + hi ALEInfoLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl cterm=undercurl + hi ALEWarningLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1099,6 +1165,39 @@ if s:t_Co >= 256 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=160 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=160 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=37 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=136 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=239 ctermbg=160 cterm=bold + hi ALEInfoSign ctermfg=239 ctermbg=37 cterm=bold + hi ALEWarningSign ctermfg=239 ctermbg=136 cterm=bold + else + hi ALEErrorSign ctermfg=160 ctermbg=239 cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=239 cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=239 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=239 ctermbg=160 cterm=NONE + hi ALEInfoSignLineNr ctermfg=239 ctermbg=37 cterm=NONE + hi ALEWarningSignLineNr ctermfg=239 ctermbg=136 cterm=NONE + endif + hi ALEError ctermfg=160 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1446,6 +1545,39 @@ if s:t_Co >= 256 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=160 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=160 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=37 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=136 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=254 ctermbg=160 cterm=bold + hi ALEInfoSign ctermfg=254 ctermbg=37 cterm=bold + hi ALEWarningSign ctermfg=254 ctermbg=136 cterm=bold + else + hi ALEErrorSign ctermfg=160 ctermbg=254 cterm=bold + hi ALEInfoSign ctermfg=37 ctermbg=254 cterm=bold + hi ALEWarningSign ctermfg=136 ctermbg=254 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=254 ctermbg=160 cterm=NONE + hi ALEInfoSignLineNr ctermfg=254 ctermbg=37 cterm=NONE + hi ALEWarningSignLineNr ctermfg=254 ctermbg=136 cterm=NONE + endif + hi ALEError ctermfg=160 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -1777,6 +1909,39 @@ if s:t_Co >= 16 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=1 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=1 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=6 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=3 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=0 ctermbg=1 cterm=bold + hi ALEInfoSign ctermfg=0 ctermbg=6 cterm=bold + hi ALEWarningSign ctermfg=0 ctermbg=3 cterm=bold + else + hi ALEErrorSign ctermfg=1 ctermbg=0 cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=0 cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=0 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=0 ctermbg=1 cterm=NONE + hi ALEInfoSignLineNr ctermfg=0 ctermbg=6 cterm=NONE + hi ALEWarningSignLineNr ctermfg=0 ctermbg=3 cterm=NONE + endif + hi ALEError ctermfg=1 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish @@ -2124,6 +2289,39 @@ if s:t_Co >= 16 hi pandocEmphasisTable cterm=NONE hi pandocEmphasis cterm=NONE endif + if get(g:, 'solarized_statusline', '') ==# 'flat' + hi ALEErrorSign ctermfg=1 ctermbg=NONE cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=NONE cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=NONE cterm=bold + hi ALEErrorSignLineNr ctermfg=1 ctermbg=NONE cterm=NONE + hi ALEInfoSignLineNr ctermfg=6 ctermbg=NONE cterm=NONE + hi ALEWarningSignLineNr ctermfg=3 ctermbg=NONE cterm=NONE + else + if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + hi ALEErrorSign ctermfg=7 ctermbg=1 cterm=bold + hi ALEInfoSign ctermfg=7 ctermbg=6 cterm=bold + hi ALEWarningSign ctermfg=7 ctermbg=3 cterm=bold + else + hi ALEErrorSign ctermfg=1 ctermbg=7 cterm=bold + hi ALEInfoSign ctermfg=6 ctermbg=7 cterm=bold + hi ALEWarningSign ctermfg=3 ctermbg=7 cterm=bold + endif + hi ALEErrorSignLineNr ctermfg=7 ctermbg=1 cterm=NONE + hi ALEInfoSignLineNr ctermfg=7 ctermbg=6 cterm=NONE + hi ALEWarningSignLineNr ctermfg=7 ctermbg=3 cterm=NONE + endif + hi ALEError ctermfg=1 ctermbg=NONE cterm=undercurl + hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=undercurl + hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=undercurl + hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi! link ALEStyleError ALEError + hi! link ALEStyleErrorSign ALEErrorSign + hi! link ALEStyleErrorSignLineNr ALEErrorSignLineNr + hi! link ALEStyleWarning ALEWarning + hi! link ALEStyleWarningSign ALEWarningSign + hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr unlet s:termtrans unlet s:t_Co s:italics finish diff --git a/doc/solarized8.txt b/doc/solarized8.txt index 13cacac..833d0c4 100644 --- a/doc/solarized8.txt +++ b/doc/solarized8.txt @@ -1,4 +1,4 @@ -*solarized8.txt* For Vim version 8.1 Last change: 2019 Oct 06 +*solarized8.txt* For Vim version 8.1 Last change: 2019 Dec 09 Solarized 8 color scheme diff --git a/templates/_extra.colortemplate b/templates/_extra.colortemplate index b2c81ba..043885c 100644 --- a/templates/_extra.colortemplate +++ b/templates/_extra.colortemplate @@ -219,5 +219,41 @@ pandocMetadataKey blue none pandocMetadata blue none bold pandocMetadataTitle -> pandocMetadata # }}} -# }}} +# ale {{{ +#if get(g:, '@optionprefix_statusline', '') ==# 'flat' + ALEErrorSign red none bold + ALEInfoSign cyan none bold + ALEWarningSign yellow none bold + ALEErrorSignLineNr red none + ALEInfoSignLineNr cyan none + ALEWarningSignLineNr yellow none +#else + #if get(g:, 'ale_sign_highlight_linenrs', '') ==# 1 + ALEErrorSign base02 red bold + ALEInfoSign base02 cyan bold + ALEWarningSign base02 yellow bold + #else + ALEErrorSign red base02 bold + ALEInfoSign cyan base02 bold + ALEWarningSign yellow base02 bold + #endif + ALEErrorSignLineNr base02 red + ALEInfoSignLineNr base02 cyan + ALEWarningSignLineNr base02 yellow +#endif +ALEError red none undercurl guisp=red +ALEErrorLine none none +ALEInfo cyan none undercurl guisp=cyan +ALEInfoLine none none +ALEWarning yellow none undercurl guisp=yellow +ALEWarningLine none none + +ALEStyleError -> ALEError +ALEStyleErrorSign -> ALEErrorSign +ALEStyleErrorSignLineNr -> ALEErrorSignLineNr +ALEStyleWarning -> ALEWarning +ALEStyleWarningSign -> ALEWarningSign +ALEStyleWarningSignLineNr -> ALEWarningSignLineNr +# }}} +# }}}