use autocmds to detect whitespace, shouldn't need max anymore

This commit is contained in:
Bailey Ling 2013-08-06 21:48:00 -04:00
parent d2c069b971
commit 0a015e5305
2 changed files with 25 additions and 18 deletions

View File

@ -1,36 +1,44 @@
" MIT license. Copyright (c) 2013 Bailey Ling. " MIT license. Copyright (c) 2013 Bailey Ling.
" vim: ts=2 sts=2 sw=2 fdm=indent " vim: ts=2 sts=2 sw=2 fdm=indent
function! airline#extensions#whitespace#check() " http://got-ravings.blogspot.com/2008/10/vim-pr0n-statusline-whitespace-flags.html
if line('$') > g:airline_whitespace_max_lines
return ''
endif
function! airline#extensions#whitespace#check()
if !exists('b:airline_whitespace_check')
let b:airline_whitespace_check = ''
let trailing = search(' $', 'nw') != 0 let trailing = search(' $', 'nw') != 0
let mixed = search('^ ', 'nw') != 0 && search('^\t', 'nw') != 0 let mixed = search('^ ', 'nw') != 0 && search('^\t', 'nw') != 0
if trailing || mixed if trailing || mixed
let text = g:airline_whitespace_symbol." " let b:airline_whitespace_check = g:airline_whitespace_symbol." "
if g:airline_detect_whitespace == 1 if g:airline_detect_whitespace == 1
if trailing if trailing
let text .= 'trailing ' let b:airline_whitespace_check .= 'trailing '
endif endif
if mixed if mixed
let text .= 'mixed-indent ' let b:airline_whitespace_check .= 'mixed-indent '
endif endif
endif endif
return text
endif endif
return '' endif
return b:airline_whitespace_check
endfunction! endfunction!
function! airline#extensions#whitespace#apply() function! airline#extensions#whitespace#apply()
if exists('w:airline_active') && w:airline_active if exists('w:airline_active') && w:airline_active
let w:airline_section_warning = '%{airline#extensions#whitespace#check()}' if !exists('w:airline_section_warning')
let w:airline_section_warning = ' '
endif
let w:airline_section_warning .= '%{airline#extensions#whitespace#check()}'
endif endif
endfunction endfunction
function! airline#extensions#whitespace#init(ext) function! airline#extensions#whitespace#init(ext)
call a:ext.add_statusline_funcref(function('airline#extensions#whitespace#apply')) call a:ext.add_statusline_funcref(function('airline#extensions#whitespace#apply'))
augroup airline_whitespace
autocmd!
autocmd CursorHold,BufWritePost * unlet! b:airline_whitespace_check
augroup END
endfunction endfunction

View File

@ -29,7 +29,6 @@ call s:check_defined('g:airline_detect_modified', 1)
call s:check_defined('g:airline_detect_paste', 1) call s:check_defined('g:airline_detect_paste', 1)
call s:check_defined('g:airline_detect_whitespace', 1) call s:check_defined('g:airline_detect_whitespace', 1)
call s:check_defined('g:airline_whitespace_symbol', '✹') call s:check_defined('g:airline_whitespace_symbol', '✹')
call s:check_defined('g:airline_whitespace_max_lines', 3000)
call s:check_defined('g:airline_branch_prefix', exists('g:airline_powerline_fonts')?' ':'') call s:check_defined('g:airline_branch_prefix', exists('g:airline_powerline_fonts')?' ':'')
call s:check_defined('g:airline_readonly_symbol', exists('g:airline_powerline_fonts')?'':'RO') call s:check_defined('g:airline_readonly_symbol', exists('g:airline_powerline_fonts')?'':'RO')
call s:check_defined('g:airline_linecolumn_prefix', exists('g:airline_powerline_fonts')?' ':':') call s:check_defined('g:airline_linecolumn_prefix', exists('g:airline_powerline_fonts')?' ':':')