Revert "highlight: skip processing the same hi group twice"

This reverts commit feee9bcf3c.

It brakes CI and shouldn't be needed
This commit is contained in:
Christian Brabandt 2017-06-27 14:44:49 +02:00
parent 62952b3887
commit 825aec9e4d
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 7 additions and 25 deletions

View File

@ -47,9 +47,7 @@ function! airline#load_theme()
endif endif
call airline#highlighter#load_theme() call airline#highlighter#load_theme()
let g:airline_theme_dict = {}
call airline#extensions#load_theme() call airline#extensions#load_theme()
unlet g:airline_theme_dict
call airline#update_statusline() call airline#update_statusline()
endfunction endfunction
@ -104,7 +102,6 @@ function! airline#update_statusline()
if airline#util#getwinvar(winnr(), 'airline_disabled', 0) if airline#util#getwinvar(winnr(), 'airline_disabled', 0)
return return
endif endif
let g:airline_theme_dict={}
for nr in filter(range(1, winnr('$')), 'v:val != winnr()') for nr in filter(range(1, winnr('$')), 'v:val != winnr()')
if airline#util#getwinvar(nr, 'airline_disabled', 0) if airline#util#getwinvar(nr, 'airline_disabled', 0)
continue continue
@ -120,7 +117,6 @@ function! airline#update_statusline()
let w:airline_active = 1 let w:airline_active = 1
let context = { 'winnr': winnr(), 'active': 1, 'bufnr': winbufnr(winnr()) } let context = { 'winnr': winnr(), 'active': 1, 'bufnr': winbufnr(winnr()) }
call s:invoke_funcrefs(context, g:airline_statusline_funcrefs) call s:invoke_funcrefs(context, g:airline_statusline_funcrefs)
unlet g:airline_theme_dict
endfunction endfunction
let s:contexts = {} let s:contexts = {}
@ -202,11 +198,9 @@ function! airline#check_mode(winnr)
return '' return ''
endif endif
if get(w:, 'airline_lastmode', '') != mode_string if get(w:, 'airline_lastmode', '') != mode_string
let g:airline_theme_dict = {}
call airline#highlighter#highlight_modified_inactive(context.bufnr) call airline#highlighter#highlight_modified_inactive(context.bufnr)
call airline#highlighter#highlight(l:mode, context.bufnr) call airline#highlighter#highlight(l:mode, context.bufnr)
let w:airline_lastmode = mode_string let w:airline_lastmode = mode_string
unlet g:airline_theme_dict
endif endif
return '' return ''

View File

@ -118,8 +118,6 @@ function! airline#extensions#tabline#get()
if !exists('#airline#BufAdd#*') if !exists('#airline#BufAdd#*')
autocmd airline BufAdd * call <sid>update_tabline() autocmd airline BufAdd * call <sid>update_tabline()
endif endif
try
let g:airline_theme_dict = {}
if s:ctrlspace if s:ctrlspace
return airline#extensions#tabline#ctrlspace#get() return airline#extensions#tabline#ctrlspace#get()
elseif s:show_buffers && curtabcnt == 1 || !s:show_tabs elseif s:show_buffers && curtabcnt == 1 || !s:show_tabs
@ -127,9 +125,6 @@ function! airline#extensions#tabline#get()
else else
return airline#extensions#tabline#tabs#get() return airline#extensions#tabline#tabs#get()
endif endif
finally
unlet g:airline_theme_dict
endtry
endfunction endfunction
function! airline#extensions#tabline#title(n) function! airline#extensions#tabline#title(n)

View File

@ -84,10 +84,6 @@ function! airline#highlighter#exec(group, colors)
if len(colors) == 4 if len(colors) == 4
call add(colors, '') call add(colors, '')
endif endif
if has_key(g:airline_theme_dict, 'a:group') &&
\ get(g:airline_theme_dict[a:group]) == a:colors
return
endif
if g:airline_gui_mode ==# 'gui' if g:airline_gui_mode ==# 'gui'
let new_hi = [colors[0], colors[1], '', '', colors[4]] let new_hi = [colors[0], colors[1], '', '', colors[4]]
else else
@ -102,7 +98,6 @@ function! airline#highlighter#exec(group, colors)
\ s:Get(colors, 4, 'term=', '')) \ s:Get(colors, 4, 'term=', ''))
exe cmd exe cmd
endif endif
let g:airline_theme_dict[a:group] = a:colors
endfunction endfunction
function! s:CheckDefined(colors) function! s:CheckDefined(colors)
@ -165,7 +160,6 @@ function! airline#highlighter#load_theme()
if pumvisible() if pumvisible()
return return
endif endif
let g:airline_theme_dict = {}
for winnr in filter(range(1, winnr('$')), 'v:val != winnr()') for winnr in filter(range(1, winnr('$')), 'v:val != winnr()')
call airline#highlighter#highlight_modified_inactive(winbufnr(winnr)) call airline#highlighter#highlight_modified_inactive(winbufnr(winnr))
endfor endfor
@ -175,7 +169,6 @@ function! airline#highlighter#load_theme()
else else
call airline#highlighter#highlight(['normal']) call airline#highlighter#highlight(['normal'])
endif endif
unlet g:airline_theme_dict
endfunction endfunction
function! airline#highlighter#add_separator(from, to, inverse) function! airline#highlighter#add_separator(from, to, inverse)