matt/vim-solarized8
1
0
Fork 0
mirror of https://github.com/lifepillar/vim-solarized8.git synced 2025-12-10 15:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use underline for MatchParen in some light variants.

Browse Source 
In order to avoid reverting dc6c1df completely, this commit introduces
underline as a further clue to distinguish matching parentheses. In the
normal and high contrast variants, underline is used for MatchParen when
g:solarized_visibility is set to "low" or "normal", while a dark
background is used when g:solarized_visibility is set to "high". For
flat and low contrast variants, underline is used when
g:solarized_visibility is set to "high" (otherwise, the appearance is
the same as before this commit).
This commit is contained in:
Lifepillar
2017-05-26 09:36:28 +02:00
parent b9e295e3b0
commit b261473732
9 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
colors/solarized8_dark.vim
View File

@@ -33,6 +33,7 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
if get(g:, "solarized_visibility", "") == "high"
hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
@@ -138,7 +139,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

2
colors/solarized8_dark_flat.vim
View File

@@ -29,6 +29,7 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
if get(g:, "solarized_visibility", "") == "high"
hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
@@ -136,7 +137,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

2
colors/solarized8_dark_high.vim
View File

@@ -33,6 +33,7 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
if get(g:, "solarized_visibility", "") == "high"
hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
@@ -138,7 +139,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

2
colors/solarized8_dark_low.vim
View File

@@ -33,6 +33,7 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
if get(g:, "solarized_visibility", "") == "high"
hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
@@ -138,7 +139,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

4
colors/solarized8_light.vim
View File

@@ -38,16 +38,19 @@ if get(g:, "solarized_visibility", "") == "high"
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=12 guibg=#839496
elseif get(g:, "solarized_visibility", "") == "low"
hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
else
hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
endif
hi! NormalMode ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
@@ -138,7 +141,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=12 guibg=#839496
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

4
colors/solarized8_light_flat.vim
View File

@@ -34,16 +34,19 @@ if get(g:, "solarized_visibility", "") == "high"
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5
elseif get(g:, "solarized_visibility", "") == "low"
hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5
else
hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5
endif
if get(g:, "solarized_statusline", "") == "low"
hi! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse,bold gui=NONE,reverse,bold
@@ -136,7 +139,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

4
colors/solarized8_light_high.vim
View File

@@ -38,16 +38,19 @@ if get(g:, "solarized_visibility", "") == "high"
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83
elseif get(g:, "solarized_visibility", "") == "low"
hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
else
hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
endif
hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
@@ -138,7 +141,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

4
colors/solarized8_light_low.vim
View File

@@ -38,16 +38,19 @@ if get(g:, "solarized_visibility", "") == "high"
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=8 guifg=#002b36 ctermbg=NONE guibg=NONE
elseif get(g:, "solarized_visibility", "") == "low"
hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=8 guifg=#002b36 ctermbg=7 guibg=#eee8d5
else
hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5
hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=8 guifg=#002b36 ctermbg=7 guibg=#eee8d5
endif
hi! NormalMode ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
@@ -138,7 +141,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=8 guifg=#002b36 ctermbg=NONE guibg=NONE
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

55
src/solarized8.vim
View File

@@ -271,23 +271,50 @@ for s:solarized_background in ["dark", "light"]
"}}}
" Extended highlighting "{{{
" ---------------------------------------------------------------------
if s:solarized_background ==# "dark"
call s:put("hi! MatchParen" .s:fmt_bold .s:fg_base3 .s:bg_base02)
endif
" High visibility
call s:put('if get(g:, "solarized_visibility", "") == "high"')
if s:solarized_background ==# "dark"
call s:put(" hi! SpecialKey" .s:fmt_revr .s:fg_orange .s:bg_none)
call s:put(" hi! NonText" .s:fmt_bold .s:fg_orange .s:bg_none)
call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_orange)
call s:put(" hi! Title" .s:fmt_bold .s:fg_yellow .s:bg_none)
else
else " light
call s:put(" hi! SpecialKey" .s:fmt_revr .s:fg_red .s:bg_none)
call s:put(" hi! NonText" .s:fmt_bold .s:fg_red .s:bg_none)
call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_red)
call s:put(" hi! Title" .s:fmt_bold .s:fg_orange .s:bg_none)
if s:solarized_background ==# "light"
if s:solarized_contrast ==# "flat"
call s:put(" hi! MatchParen" .s:fmt_bldu .s:fg_orange .s:bg_base02)
elseif s:solarized_contrast ==# "low"
call s:put(" hi! MatchParen" .s:fmt_bldu .s:fg_base3 .s:bg_none)
else
call s:put(" hi! MatchParen" .s:fmt_bold .s:fg_base03 .s:bg_base00)
endif
endif
endif
" Low visibility
call s:put('elseif get(g:, "solarized_visibility", "") == "low"')
call s:put(" hi! SpecialKey" .s:fmt_bold .s:fg_base02 .s:bg_none)
call s:put(" hi! NonText" .s:fmt_bold .s:fg_base02 .s:bg_none)
call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_base01)
call s:put(" hi! Title" .s:fmt_bold .s:fg_base01 .s:bg_none)
if s:solarized_background ==# "light"
if s:solarized_contrast ==# "flat"
call s:put(" hi! MatchParen" .s:fmt_bold .s:fg_orange .s:bg_base02)
elseif s:solarized_contrast ==# "low"
call s:put(" hi! MatchParen" .s:fmt_bold .s:fg_base3 .s:bg_base02)
else
call s:put(" hi! MatchParen" .s:fmt_bldu .s:fg_red .s:bg_base02)
endif
endif
" Normal visibility
call s:put('else')
call s:put(" hi! SpecialKey" .s:fmt_bold .s:fg_base00 .s:bg_base02)
call s:put(" hi! NonText" .s:fmt_bold .s:fg_base00 .s:bg_none)
@@ -297,7 +324,18 @@ for s:solarized_background in ["dark", "light"]
else
call s:put(" hi! Title" .s:fmt_bold .s:fg_orange .s:bg_none)
endif
if s:solarized_background ==# "light"
if s:solarized_contrast ==# "flat"
call s:put(" hi! MatchParen" .s:fmt_bold .s:fg_orange .s:bg_base02)
elseif s:solarized_contrast ==# "low"
call s:put(" hi! MatchParen" .s:fmt_bold .s:fg_base3 .s:bg_base02)
else
call s:put(" hi! MatchParen" .s:fmt_bldu .s:fg_red .s:bg_base02)
endif
endif
call s:put('endif')
" End visibility
if s:solarized_contrast != "flat"
if s:solarized_background == "dark"
call s:put("hi! NormalMode" . s:fg_base0 .s:bg_base3. s:fmt_revbb)
@@ -500,21 +538,6 @@ for s:solarized_background in ["dark", "light"]
call s:put(" let g:terminal_color_" . s:col[0] . " = '" . s:col[1] . "'")
endfor
call s:put("endif")
" Changed by Lifepillar: better (in my opinion) highlighting for MatchParen
" (see also https://github.com/lifepillar/vim-solarized8/issues/11 and
" https://github.com/lifepillar/vim-solarized8/issues/15):
if s:solarized_background == "dark"
call s:put("hi! MatchParen" .s:fmt_bold .s:fg_base3 .s:bg_base02)
else
if s:solarized_contrast == "flat"
call s:put("hi! MatchParen" .s:fmt_bold .s:fg_orange .s:bg_base02)
elseif s:solarized_contrast == "low"
call s:put("hi! MatchParen" .s:fmt_bold .s:fg_base3 .s:bg_none)
else
call s:put("hi! MatchParen" .s:fmt_bold .s:fg_base03 .s:bg_base00)
endif
endif
"}}}
" vim syntax highlighting "{{{
" ---------------------------------------------------------------------