vim/vim-airline
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1408 from chrisbra/highlight_improvements

Browse Source 
Highlight improvements
This commit is contained in:
Christian Brabandt 2017-02-24 18:32:25 +01:00 committed by GitHub
commit dd2740f510
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
autoload/airline/highlighter.vim
View File

@ -22,13 +22,18 @@ function! s:get_syn(group, what)
if !exists("g:airline_gui_mode") if !exists("g:airline_gui_mode")
let g:airline_gui_mode = airline#init#gui_mode() let g:airline_gui_mode = airline#init#gui_mode()
endif endif
let color = ''
if hlexists(a:group)
let color = synIDattr(synIDtrans(hlID(a:group)), a:what, g:airline_gui_mode) let color = synIDattr(synIDtrans(hlID(a:group)), a:what, g:airline_gui_mode)
if empty(color) || color == -1
let color = synIDattr(synIDtrans(hlID('Normal')), a:what, g:airline_gui_mode)
endif endif
if empty(color) || color == -1
" should always exists
let color = synIDattr(synIDtrans(hlID('Normal')), a:what, g:airline_gui_mode)
" however, just in case
if empty(color) || color == -1 if empty(color) || color == -1
let color = 'NONE' let color = 'NONE'
endif endif
endif
return color return color
endfunction endfunction
@ -67,7 +72,8 @@ function! airline#highlighter#exec(group, colors)
if len(colors) == 4 if len(colors) == 4
call add(colors, '') call add(colors, '')
endif endif
if old_hi != colors let colors = s:CheckDefined(colors)
if old_hi != colors || !hlexists(a:group)
let cmd = printf('hi %s %s %s %s %s %s %s %s', let cmd = printf('hi %s %s %s %s %s %s %s %s',
\ a:group, s:Get(colors, 0, 'guifg=', ''), s:Get(colors, 1, 'guibg=', ''), \ a:group, s:Get(colors, 0, 'guifg=', ''), s:Get(colors, 1, 'guibg=', ''),
\ s:Get(colors, 2, 'ctermfg=', ''), s:Get(colors, 3, 'ctermbg=', ''), \ s:Get(colors, 2, 'ctermfg=', ''), s:Get(colors, 3, 'ctermbg=', ''),
@ -77,6 +83,24 @@ function! airline#highlighter#exec(group, colors)
endif endif
endfunction endfunction
function! s:CheckDefined(colors)
" Checks, whether the definition of the colors is valid and is not empty or NONE
" e.g. if the colors would expand to this:
" hi airline_c ctermfg=NONE ctermbg=NONE
" that means to clear that highlighting group, therefore, add a special term=NONE
" argument
for val in a:colors
if !empty(val) && val !=# 'NONE'
return a:colors
endif
endfor
" this adds the bold attribute to the term argument of the :hi command,
" but at least this makes sure, the group will be defined
let fg = synIDattr(synIDtrans(hlID('Normal')), 'fg', 'cterm')
let bg = synIDattr(synIDtrans(hlID('Normal')), 'bg', 'cterm')
return a:colors[0:1] + [fg, bg] + [a:colors[4]]
endfunction
function! s:Get(dict, key, prefix, default) function! s:Get(dict, key, prefix, default)
if get(a:dict, a:key, a:default) isnot# a:default if get(a:dict, a:key, a:default) isnot# a:default
return a:prefix. get(a:dict, a:key) return a:prefix. get(a:dict, a:key)