VimPlug/vim-airline
1
0
Fork 0
mirror of https://github.com/vim-airline/vim-airline.git synced 2025-12-06 04:04:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(tabline): ensure tab_nr updates in buffers.vim (#2734)
Some checks failed
CI / Test (v7.4) (push) Has been cancelled
Details
CI / Test (v8.0.0000) (push) Has been cancelled
Details
CI / Test (v8.1.0000) (push) Has been cancelled
Details
CI / Test (v8.2.0000) (push) Has been cancelled
Details
CI / Test (v8.2.1000) (push) Has been cancelled
Details
CI / Test (v9.0.0000) (push) Has been cancelled
Details
CI / Test (v9.1.0000) (push) Has been cancelled
Details
reviewdog / runner / vint (push) Has been cancelled
Details

Browse Source 
Previously, when using the rendering in buffers.vim, the tabline only
considered the current buffer and column width when checking for
updates, despite optionally using the tab number in rendering. This
would cause incorrect tabline rendering when switching between tab pages
if the buffer and column width didn't change. This change mimics the
already existent behavior in `tabline/tabs.vim` which caches the current
tab number for comparison when updating. Some other formatting is
changed to align `buffers.vim` to `tabs.vim`.

Fixes: vim-airline/vim-airline#2733
This commit is contained in:
Will Wills
2025-11-04 09:47:56 -08:00
committed by GitHub
parent 159573187e
commit 6b51799f26
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
autoload/airline/extensions/tabline/buffers.vim
View File

@@ -4,8 +4,8 @@
scriptencoding utf-8 scriptencoding utf-8
let s:spc = g:airline_symbols.space let s:spc = g:airline_symbols.space
let s:current_bufnr = -1 let s:current_bufnr = -1
let s:current_tabnr = -1
let s:current_modified = 0 let s:current_modified = 0
let s:current_tabline = '' let s:current_tabline = ''
let s:current_visible_buffers = [] let s:current_visible_buffers = []
@@ -49,14 +49,15 @@ function! airline#extensions#tabline#buffers#invalidate()
endfunction endfunction
function! airline#extensions#tabline#buffers#get() function! airline#extensions#tabline#buffers#get()
let curbuf = bufnr('%')
let curtab = tabpagenr()
try try
call <sid>map_keys() call <sid>map_keys()
catch catch
" no-op " no-op
endtry endtry
let cur = bufnr('%') if curbuf == s:current_bufnr && curtab == s:current_tabnr && &columns == s:column_width
if cur == s:current_bufnr && &columns == s:column_width if !g:airline_detect_modified || getbufvar(curbuf, '&modified') == s:current_modified
if !g:airline_detect_modified || getbufvar(cur, '&modified') == s:current_modified
return s:current_tabline return s:current_tabline
endif endif
endif endif
@@ -77,10 +78,10 @@ function! airline#extensions#tabline#buffers#get()
let b.overflow_group = 'airline_tabhid' let b.overflow_group = 'airline_tabhid'
let b.buffers = airline#extensions#tabline#buflist#list() let b.buffers = airline#extensions#tabline#buflist#list()
if get(g:, 'airline#extensions#tabline#current_first', 0) if get(g:, 'airline#extensions#tabline#current_first', 0)
if index(b.buffers, cur) > -1 if index(b.buffers, curbuf) > -1
call remove(b.buffers, index(b.buffers, cur)) call remove(b.buffers, index(b.buffers, curbuf))
endif endif
let b.buffers = [cur] + b.buffers let b.buffers = [curbuf] + b.buffers
endif endif
function! b.get_group(i) dict function! b.get_group(i) dict
@@ -129,7 +130,7 @@ function! airline#extensions#tabline#buffers#get()
endif endif
endfunction endfunction
let current_buffer = max([index(b.buffers, cur), 0]) let current_buffer = max([index(b.buffers, curbuf), 0])
let last_buffer = len(b.buffers) - 1 let last_buffer = len(b.buffers) - 1
call b.insert_titles(current_buffer, 0, last_buffer) call b.insert_titles(current_buffer, 0, last_buffer)
@@ -142,7 +143,8 @@ function! airline#extensions#tabline#buffers#get()
call airline#extensions#tabline#add_tab_label(b) call airline#extensions#tabline#add_tab_label(b)
let s:current_bufnr = cur let s:current_bufnr = curbuf
let s:current_tabnr = curtab
let s:column_width = &columns let s:column_width = &columns
let s:current_tabline = b.build() let s:current_tabline = b.build()
let s:current_visible_buffers = copy(b.buffers) let s:current_visible_buffers = copy(b.buffers)