Remove trailing whitespace

This commit is contained in:
amarakon 2022-09-30 23:25:47 -04:00
parent 46dd872237
commit 3fe71a6ce6
11 changed files with 44 additions and 44 deletions

View File

@ -49,9 +49,9 @@ This is the Changelog for the vim-airline project.
- The branch extensions now also displays whether the repository is in a clean state - The branch extensions now also displays whether the repository is in a clean state
(will append a ! or ⚡if the repository is considered dirty). (will append a ! or ⚡if the repository is considered dirty).
- The whitespace extensions will also check for conflict markers - The whitespace extensions will also check for conflict markers
- `:AirlineRefresh` command now takes an additional `!` attribute, that **skips** - `:AirlineRefresh` command now takes an additional `!` attribute, that **skips**
recreating the highlighting groups (which might have a serious performance recreating the highlighting groups (which might have a serious performance
impact if done very often, as might be the case when the configuration variable impact if done very often, as might be the case when the configuration variable
`airline_skip_empty_sections` is active). `airline_skip_empty_sections` is active).
- airline can now also detect multiple cursor mode (issue [#1933](https://github.com/vim-airline/vim-airline/issues/1933)) - airline can now also detect multiple cursor mode (issue [#1933](https://github.com/vim-airline/vim-airline/issues/1933))
- expose hunks output using the function `airline#extensions#hunks#get_raw_hunks()` to the outside [#1877](https://github.com/vim-airline/vim-airline/pull/1877) - expose hunks output using the function `airline#extensions#hunks#get_raw_hunks()` to the outside [#1877](https://github.com/vim-airline/vim-airline/pull/1877)

View File

@ -1,4 +1,4 @@
# vim-airline # vim-airline
[![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/cb%40256bit.org) [![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/cb%40256bit.org)
[![reviewdog](https://github.com/vim-airline/vim-airline/workflows/reviewdog/badge.svg?branch=master&event=push)](https://github.com/vim-airline/vim-airline/actions?query=workflow%3Areviewdog+event%3Apush+branch%3Amaster) [![reviewdog](https://github.com/vim-airline/vim-airline/workflows/reviewdog/badge.svg?branch=master&event=push)](https://github.com/vim-airline/vim-airline/actions?query=workflow%3Areviewdog+event%3Apush+branch%3Amaster)

View File

@ -232,21 +232,21 @@ function! airline#check_mode(winnr)
if get(w:, 'airline_active', 1) if get(w:, 'airline_active', 1)
let m = mode(1) let m = mode(1)
" Refer :help mode() to see the list of modes " Refer :help mode() to see the list of modes
" NB: 'let mode' here refers to the display colour _groups_, " NB: 'let mode' here refers to the display colour _groups_,
" not the literal mode's code (i.e., m). E.g., Select modes " not the literal mode's code (i.e., m). E.g., Select modes
" v, S and ^V use 'visual' since they are of similar ilk. " v, S and ^V use 'visual' since they are of similar ilk.
" Some modes do not get recognised for status line purposes: " Some modes do not get recognised for status line purposes:
" no, nov, noV, no^V, !, cv, and ce. " no, nov, noV, no^V, !, cv, and ce.
" Mode name displayed is handled in init.vim (g:airline_mode_map). " Mode name displayed is handled in init.vim (g:airline_mode_map).
" "
if m[0] ==# "i" if m[0] ==# "i"
let mode = ['insert'] " Insert modes + submodes (i, ic, ix) let mode = ['insert'] " Insert modes + submodes (i, ic, ix)
elseif m[0] == "R" elseif m[0] == "R"
let mode = ['replace'] " Replace modes + submodes (R, Rc, Rv, Rx) (NB: case sensitive as 'r' is a mode) let mode = ['replace'] " Replace modes + submodes (R, Rc, Rv, Rx) (NB: case sensitive as 'r' is a mode)
elseif m[0] =~ '\v(v|V||s|S|)' elseif m[0] =~ '\v(v|V||s|S|)'
let mode = ['visual'] " Visual and Select modes (v, V, ^V, s, S, ^S)) let mode = ['visual'] " Visual and Select modes (v, V, ^V, s, S, ^S))
elseif m ==# "t" elseif m ==# "t"
let mode = ['terminal'] " Terminal mode (only has one mode (t)) let mode = ['terminal'] " Terminal mode (only has one mode (t))
elseif m[0] =~ '\v(c|r|!)' elseif m[0] =~ '\v(c|r|!)'
let mode = ['commandline'] " c, cv, ce, r, rm, r? (NB: cv and ce stay showing as mode entered from) let mode = ['commandline'] " c, cv, ce, r, rm, r? (NB: cv and ce stay showing as mode entered from)
@ -257,7 +257,7 @@ function! airline#check_mode(winnr)
" Vim plugin Multiple Cursors https://github.com/mg979/vim-visual-multi " Vim plugin Multiple Cursors https://github.com/mg979/vim-visual-multi
let m = 'multi' let m = 'multi'
endif endif
" Adjust to handle additional modes, which don't display correctly otherwise " Adjust to handle additional modes, which don't display correctly otherwise
if index(['niI', 'niR', 'niV', 'ic', 'ix', 'Rc', 'Rv', 'Rx', 'multi'], m) == -1 if index(['niI', 'niR', 'niV', 'ic', 'ix', 'Rc', 'Rv', 'Rx', 'multi'], m) == -1
let m = m[0] let m = m[0]
endif endif

View File

@ -33,7 +33,7 @@ endfunction
function! airline#extensions#tabline#ctrlspace#add_buffer_section(builder, cur_tab, cur_buf, pull_right) function! airline#extensions#tabline#ctrlspace#add_buffer_section(builder, cur_tab, cur_buf, pull_right)
let pos_extension = (a:pull_right ? '_right' : '') let pos_extension = (a:pull_right ? '_right' : '')
let buffer_list = [] let buffer_list = []
for bufferindex in sort(keys(ctrlspace#api#Buffers(a:cur_tab)), 'N') for bufferindex in sort(keys(ctrlspace#api#Buffers(a:cur_tab)), 'N')
for buffer in ctrlspace#api#BufferList(a:cur_tab) for buffer in ctrlspace#api#BufferList(a:cur_tab)

View File

@ -54,7 +54,7 @@ function! airline#extensions#tabline#tabs#get()
let group = 'airline_tabsel' let group = 'airline_tabsel'
if g:airline_detect_modified if g:airline_detect_modified
for bi in tabpagebuflist(curtab) for bi in tabpagebuflist(curtab)
if index(s:filtered_buflist,bi) != -1 if index(s:filtered_buflist,bi) != -1
if getbufvar(bi, '&modified') if getbufvar(bi, '&modified')
let group = 'airline_tabmod' let group = 'airline_tabmod'
endif endif
@ -91,7 +91,7 @@ function! airline#extensions#tabline#tabs#get()
if get(g:, 'airline#extensions#tabline#show_splits', 1) == 1 if get(g:, 'airline#extensions#tabline#show_splits', 1) == 1
let buffers = tabpagebuflist(curtab) let buffers = tabpagebuflist(curtab)
for nr in buffers for nr in buffers
if index(s:filtered_buflist,nr) != -1 if index(s:filtered_buflist,nr) != -1
let group = airline#extensions#tabline#group_of_bufnr(buffers, nr) . "_right" let group = airline#extensions#tabline#group_of_bufnr(buffers, nr) . "_right"
call b.add_section_spaced(group, '%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)') call b.add_section_spaced(group, '%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)')
endif endif

View File

@ -91,7 +91,7 @@ endfunction
" airline functions {{{1 " airline functions {{{1
" default filetypes: " default filetypes:
function! airline#extensions#wordcount#apply(...) function! airline#extensions#wordcount#apply(...)
let filetypes = get(g:, 'airline#extensions#wordcount#filetypes', let filetypes = get(g:, 'airline#extensions#wordcount#filetypes',
\ ['asciidoc', 'help', 'mail', 'markdown', 'nroff', 'org', 'rst', 'plaintex', 'tex', 'text']) \ ['asciidoc', 'help', 'mail', 'markdown', 'nroff', 'org', 'rst', 'plaintex', 'tex', 'text'])
" export current filetypes settings to global namespace " export current filetypes settings to global namespace
let g:airline#extensions#wordcount#filetypes = filetypes let g:airline#extensions#wordcount#filetypes = filetypes

View File

@ -32,7 +32,7 @@ function! airline#init#bootstrap()
call s:check_defined('g:airline_exclude_filetypes', []) call s:check_defined('g:airline_exclude_filetypes', [])
call s:check_defined('g:airline_exclude_preview', 0) call s:check_defined('g:airline_exclude_preview', 0)
" If g:airline_mode_map_codes is set to 1 in your .vimrc it will display " If g:airline_mode_map_codes is set to 1 in your .vimrc it will display
" only the modes' codes in the status line. Refer :help mode() for codes. " only the modes' codes in the status line. Refer :help mode() for codes.
" That may be a preferred presentation because it is minimalistic. " That may be a preferred presentation because it is minimalistic.
call s:check_defined('g:airline_mode_map_codes', 0) call s:check_defined('g:airline_mode_map_codes', 0)
@ -45,7 +45,7 @@ function! airline#init#bootstrap()
" \ 'Rv' : 'VIRTUAL REPLACE', " \ 'Rv' : 'VIRTUAL REPLACE',
" \ 'niV' : 'VIRTUAL REPLACE (NORMAL)', " \ 'niV' : 'VIRTUAL REPLACE (NORMAL)',
" \ } " \ }
" ...would override 'Rv' and 'niV' below respectively. " ...would override 'Rv' and 'niV' below respectively.
call extend(g:airline_mode_map, { call extend(g:airline_mode_map, {
\ '__' : '------', \ '__' : '------',
\ 'n' : 'NORMAL', \ 'n' : 'NORMAL',
@ -78,16 +78,16 @@ function! airline#init#bootstrap()
\ '!' : 'SHELL', \ '!' : 'SHELL',
\ 't' : 'TERMINAL', \ 't' : 'TERMINAL',
\ 'multi' : 'MULTI', \ 'multi' : 'MULTI',
\ }, 'keep') \ }, 'keep')
" NB: no*, cv, ce, r? and ! do not actually display " NB: no*, cv, ce, r? and ! do not actually display
else else
" Exception: The control character in ^S and ^V modes' codes " Exception: The control character in ^S and ^V modes' codes
" break the status line if allowed to render 'naturally' so " break the status line if allowed to render 'naturally' so
" they are overridden with ^ (when g:airline_mode_map_codes = 1) " they are overridden with ^ (when g:airline_mode_map_codes = 1)
call extend(g:airline_mode_map, { call extend(g:airline_mode_map, {
\ '' : '^V', \ '' : '^V',
\ '' : '^S', \ '' : '^S',
\ }, 'keep') \ }, 'keep')
endif endif
call s:check_defined('g:airline_theme_map', {}) call s:check_defined('g:airline_theme_map', {})

View File

@ -11,7 +11,7 @@ scriptencoding utf-8
" * airline_x (first section of the right most sections) " * airline_x (first section of the right most sections)
" * airline_y (section just to the right of airline_x) " * airline_y (section just to the right of airline_x)
" * airline_z (right most section) " * airline_z (right most section)
" * The mode of the buffer, as reported by the :mode() function. Airline " * The mode of the buffer, as reported by the :mode() function. Airline
" converts the values reported by mode() to the following: " converts the values reported by mode() to the following:
" * normal " * normal
" * insert " * insert
@ -22,7 +22,7 @@ scriptencoding utf-8
" The last one is actually no real mode as returned by mode(), but used by " The last one is actually no real mode as returned by mode(), but used by
" airline to style inactive statuslines (e.g. windows, where the cursor " airline to style inactive statuslines (e.g. windows, where the cursor
" currently does not reside in). " currently does not reside in).
" * In addition to each section and mode specified above, airline themes " * In addition to each section and mode specified above, airline themes
" can also specify overrides. Overrides can be provided for the following " can also specify overrides. Overrides can be provided for the following
" scenarios: " scenarios:
" * 'modified' " * 'modified'
@ -34,7 +34,7 @@ scriptencoding utf-8
" * g:airline#themes#<theme_name>#palette " * g:airline#themes#<theme_name>#palette
" where <theme_name> is substituted for the name of the theme.vim file where the " where <theme_name> is substituted for the name of the theme.vim file where the
" theme definition resides. Airline themes should reside somewhere on the " theme definition resides. Airline themes should reside somewhere on the
" 'runtimepath' where it will be loaded at vim startup, for example: " 'runtimepath' where it will be loaded at vim startup, for example:
" * autoload/airline/themes/theme_name.vim " * autoload/airline/themes/theme_name.vim
" "
" For this, the dark.vim, theme, this is defined as " For this, the dark.vim, theme, this is defined as
@ -42,12 +42,12 @@ let g:airline#themes#dark#palette = {}
" Keys in the dictionary are composed of the mode, and if specified the " Keys in the dictionary are composed of the mode, and if specified the
" override. For example: " override. For example:
" * g:airline#themes#dark#palette.normal " * g:airline#themes#dark#palette.normal
" * the colors for a statusline while in normal mode " * the colors for a statusline while in normal mode
" * g:airline#themes#dark#palette.normal_modified " * g:airline#themes#dark#palette.normal_modified
" * the colors for a statusline while in normal mode when the buffer has " * the colors for a statusline while in normal mode when the buffer has
" been modified " been modified
" * g:airline#themes#dark#palette.visual " * g:airline#themes#dark#palette.visual
" * the colors for a statusline while in visual mode " * the colors for a statusline while in visual mode
" "
" Values for each dictionary key is an array of color values that should be " Values for each dictionary key is an array of color values that should be
@ -56,7 +56,7 @@ let g:airline#themes#dark#palette = {}
" See "help attr-list" for valid values for the "opt" value. " See "help attr-list" for valid values for the "opt" value.
" "
" Each theme must provide an array of such values for each airline section of " Each theme must provide an array of such values for each airline section of
" the statusline (airline_a through airline_z). A convenience function, " the statusline (airline_a through airline_z). A convenience function,
" airline#themes#generate_color_map() exists to mirror airline_a/b/c to " airline#themes#generate_color_map() exists to mirror airline_a/b/c to
" airline_x/y/z, respectively. " airline_x/y/z, respectively.

View File

@ -137,7 +137,7 @@ endfunction
function! airline#util#ignore_buf(name) function! airline#util#ignore_buf(name)
let pat = '\c\v'. get(g:, 'airline#ignore_bufadd_pat', ''). let pat = '\c\v'. get(g:, 'airline#ignore_bufadd_pat', '').
\ get(g:, 'airline#extensions#tabline#ignore_bufadd_pat', \ get(g:, 'airline#extensions#tabline#ignore_bufadd_pat',
\ '!|defx|gundo|nerd_tree|startify|tagbar|term://|undotree|vimfiler') \ '!|defx|gundo|nerd_tree|startify|tagbar|term://|undotree|vimfiler')
return match(a:name, pat) > -1 return match(a:name, pat) > -1
endfunction endfunction

View File

@ -1546,7 +1546,7 @@ State indicators:
* use vimtex specific wordcount function * use vimtex specific wordcount function
for TeX buffers Note: this more accurate for TeX buffers Note: this more accurate
but may slow down Vim) > but may slow down Vim) >
let g:airline#extensions#vimtex#wordcount = 1 let g:airline#extensions#vimtex#wordcount = 1
------------------------------------- *airline-virtualenv* ------------------------------------- *airline-virtualenv*
virtualenv <https://github.com/jmcantrell/vim-virtualenv> virtualenv <https://github.com/jmcantrell/vim-virtualenv>

View File

@ -3,20 +3,20 @@ Describe builder.vim
Before each Before each
let s:builder = airline#builder#new({'active': 1}) let s:builder = airline#builder#new({'active': 1})
End End
It should start with an empty statusline It should start with an empty statusline
let stl = s:builder.build() let stl = s:builder.build()
Assert Equals(stl, '') Assert Equals(stl, '')
End End
It should transition colors from one to the next It should transition colors from one to the next
call s:builder.add_section('Normal', 'hello') call s:builder.add_section('Normal', 'hello')
call s:builder.add_section('Search', 'world') call s:builder.add_section('Search', 'world')
let stl = s:builder.build() let stl = s:builder.build()
Assert Match(stl,'%#Normal#hello%#Normal_to_Search#%#Search#world') Assert Match(stl,'%#Normal#hello%#Normal_to_Search#%#Search#world')
End End
It should reuse highlight group if background colors match It should reuse highlight group if background colors match
highlight Foo1 ctermfg=1 ctermbg=2 highlight Foo1 ctermfg=1 ctermbg=2
highlight Foo2 ctermfg=1 ctermbg=2 highlight Foo2 ctermfg=1 ctermbg=2
@ -25,8 +25,8 @@ Describe builder.vim
let stl = s:builder.build() let stl = s:builder.build()
Assert Match(stl, '%#Foo1#helloworld') Assert Match(stl, '%#Foo1#helloworld')
End End
It should switch highlight groups if foreground colors differ It should switch highlight groups if foreground colors differ
highlight Foo1 ctermfg=1 ctermbg=2 highlight Foo1 ctermfg=1 ctermbg=2
highlight Foo2 ctermfg=2 ctermbg=2 highlight Foo2 ctermfg=2 ctermbg=2
@ -35,13 +35,13 @@ Describe builder.vim
let stl = s:builder.build() let stl = s:builder.build()
Assert Match(stl, '%#Foo1#hello%#Foo1_to_Foo2#%#Foo2#world') Assert Match(stl, '%#Foo1#hello%#Foo1_to_Foo2#%#Foo2#world')
End End
It should split left/right sections It should split left/right sections
call s:builder.split() call s:builder.split()
let stl = s:builder.build() let stl = s:builder.build()
Assert Match(stl, '%=') Assert Match(stl, '%=')
End End
It after split, sections use the right separator It after split, sections use the right separator
call s:builder.split() call s:builder.split()
call s:builder.add_section('Normal', 'hello') call s:builder.add_section('Normal', 'hello')
@ -49,33 +49,33 @@ Describe builder.vim
let stl = s:builder.build() let stl = s:builder.build()
Assert Match(stl, 'hello%#Normal_to_Search#%#Search#world') Assert Match(stl, 'hello%#Normal_to_Search#%#Search#world')
End End
It should not repeat the same highlight group It should not repeat the same highlight group
call s:builder.add_section('Normal', 'hello') call s:builder.add_section('Normal', 'hello')
call s:builder.add_section('Normal', 'hello') call s:builder.add_section('Normal', 'hello')
let stl = s:builder.build() let stl = s:builder.build()
Assert Match(stl, '%#Normal#hellohello') Assert Match(stl, '%#Normal#hellohello')
End End
It should replace accent groups with the specified group It should replace accent groups with the specified group
call s:builder.add_section('Normal', '%#__accent_foo#hello') call s:builder.add_section('Normal', '%#__accent_foo#hello')
let stl = s:builder.build() let stl = s:builder.build()
Assert Match(stl, '%#Normal#%#Normal_foo#hello') Assert Match(stl, '%#Normal#%#Normal_foo#hello')
End End
It should replace two accent groups with correct groups It should replace two accent groups with correct groups
call s:builder.add_section('Normal', '%#__accent_foo#hello%#__accent_bar#world') call s:builder.add_section('Normal', '%#__accent_foo#hello%#__accent_bar#world')
let stl = s:builder.build() let stl = s:builder.build()
Assert Match(stl, '%#Normal_foo#hello%#Normal_bar#world') Assert Match(stl, '%#Normal_foo#hello%#Normal_bar#world')
End End
It should special restore group should go back to previous group It should special restore group should go back to previous group
call s:builder.add_section('Normal', '%#__restore__#') call s:builder.add_section('Normal', '%#__restore__#')
let stl = s:builder.build() let stl = s:builder.build()
Assert NotMatch(stl, '%#__restore__#') Assert NotMatch(stl, '%#__restore__#')
Assert Match(stl, '%#Normal#') Assert Match(stl, '%#Normal#')
End End
It should blend colors from the left through the split to the right It should blend colors from the left through the split to the right
call s:builder.add_section('Normal', 'hello') call s:builder.add_section('Normal', 'hello')
call s:builder.split() call s:builder.split()