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

Merge pull request #751 from esmil/master

Browse Source 
whitespace: add more lenient mixed whitespace algorithm
This commit is contained in:
Bailey Ling 2015-05-19 20:54:03 -04:00
commit 3d3c382822
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/airline/extensions/whitespace.vim
View File

@ -30,6 +30,8 @@ function! s:check_mixed_indent()
" count of spaces at the end of tabs should be less then tabstop value " count of spaces at the end of tabs should be less then tabstop value
let t_l_s = '(^\t+ {' . &ts . ',}' . '\S)' let t_l_s = '(^\t+ {' . &ts . ',}' . '\S)'
return search('\v' . t_s_t . '|' . t_l_s, 'nw') return search('\v' . t_s_t . '|' . t_l_s, 'nw')
elseif s:indent_algo == 2
return search('\v(^\t* +\t\s*\S)', 'nw')
else else
return search('\v(^\t+ +)|(^ +\t+)', 'nw') return search('\v(^\t+ +)|(^ +\t+)', 'nw')
endif endif

5
doc/airline.txt
View File

@ -407,6 +407,11 @@ eclim <https://eclim.org>
" certain number of spaces are allowed after tabs, but not in between " certain number of spaces are allowed after tabs, but not in between
" this algorithm works well for /** */ style comments in a tab-indented file " this algorithm works well for /** */ style comments in a tab-indented file
let g:airline#extensions#whitespace#mixed_indent_algo = 1 let g:airline#extensions#whitespace#mixed_indent_algo = 1
" spaces are allowed after tabs, but not in between
" this algorithm works well with programming styles that use tabs for
" indentation and spaces for alignment
let g:airline#extensions#whitespace#mixed_indent_algo = 2
< <
* customize the whitespace symbol. > * customize the whitespace symbol. >
let g:airline#extensions#whitespace#symbol = '!' let g:airline#extensions#whitespace#symbol = '!'