tyler.durden/vim-airline
1
0
Fork 0
mirror of https://github.com/vim-airline/vim-airline.git synced 2025-07-27 07:54:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

tabline: AirlineSelectTab still wrong sometimes

Browse Source 
Partly revert commit 105e9daaf71d1493cdf342a2cc736cbb5
and fix #1857 another way, by making sure, that buffers are not taking
away from the s:current_visible_buffers list.

Fixes #1857
Fixes #1872
This commit is contained in:
Christian Brabandt 2019-02-06 22:42:10 +01:00
parent 767c1efd10
commit 624d2f1438
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,12 +148,13 @@ function! airline#extensions#tabline#buffers#get()
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)
if b._right_title <= last_buffer " Do not remove from s:current_visible_buffers, this breaks s:select_tab()
call remove(s:current_visible_buffers, b._right_title, last_buffer) "if b._right_title <= last_buffer
endif " call remove(s:current_visible_buffers, b._right_title, last_buffer)
if b._left_title > 0 "endif
call remove(s:current_visible_buffers, 0, b._left_title) "if b._left_title > 0
endif " call remove(s:current_visible_buffers, 0, b._left_title)
"endif
return s:current_tabline return s:current_tabline
endfunction endfunction
@ -163,24 +164,15 @@ function! s:select_tab(buf_index)
\ ['vimfiler', 'nerdtree']), &ft) \ ['vimfiler', 'nerdtree']), &ft)
return return
endif endif
let idx = a:buf_index
let buf = index(s:current_visible_buffers, a:buf_index) if s:current_visible_buffers[0] == -1
if buf >= 0 let idx = idx + 1
try
exec 'b!' . s:current_visible_buffers[buf]
catch /^Vim\%((\a\+)\)\=:E939/
" buffer 0 does not exist
catch /^Vim\%((\a\+)\)\=:E86/
" should not happen hopefully ;)
call airline#util#warning(printf("Buffer Number %d does not exist", a:buf_index))
catch /^Vim\%((\a\+)\)\=:E518/
" invalid modeline
call airline#util#warning("Invalid modeline: ". v:exception)
catch
" catch all, something broken... :|
call airline#util#warning("Exception not handled: ". v:exception)
endtry
endif endif
let buf = get(s:current_visible_buffers, idx, 0)
if buf != 0
exec 'b!' . buf
endif
endfunction endfunction
function! s:jump_to_tab(offset) function! s:jump_to_tab(offset)
@ -194,7 +186,7 @@ endfunction
function! s:map_keys() function! s:map_keys()
if get(g:, 'airline#extensions#tabline#buffer_idx_mode', 1) if get(g:, 'airline#extensions#tabline#buffer_idx_mode', 1)
for i in range(1, 9) for i in range(1, 9)
exe printf('noremap <silent> <Plug>AirlineSelectTab%d :call <SID>select_tab(%d)<CR>', i, i) exe printf('noremap <silent> <Plug>AirlineSelectTab%d :call <SID>select_tab(%d)<CR>', i, i-1)
endfor endfor
noremap <silent> <Plug>AirlineSelectPrevTab :<C-u>call <SID>jump_to_tab(-v:count1)<CR> noremap <silent> <Plug>AirlineSelectPrevTab :<C-u>call <SID>jump_to_tab(-v:count1)<CR>
noremap <silent> <Plug>AirlineSelectNextTab :<C-u>call <SID>jump_to_tab(v:count1)<CR> noremap <silent> <Plug>AirlineSelectNextTab :<C-u>call <SID>jump_to_tab(v:count1)<CR>