Merge pull request #589 from paulhybryant/master

Minor enhancement for tabline
This commit is contained in:
Bailey Ling 2014-09-15 12:30:08 -04:00
commit 50c9ea89a5
2 changed files with 48 additions and 1 deletions

View File

@ -9,6 +9,7 @@ let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1) let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
let s:show_close_button = get(g:, 'airline#extensions#tabline#show_close_button', 1) let s:show_close_button = get(g:, 'airline#extensions#tabline#show_close_button', 1)
let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X') let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
let s:buffer_idx_mode = get(g:, 'airline#extensions#tabline#buffer_idx_mode', 0)
let s:builder_context = { let s:builder_context = {
\ 'active' : 1, \ 'active' : 1,
@ -38,6 +39,9 @@ function! airline#extensions#tabline#init(ext)
call s:toggle_on() call s:toggle_on()
call a:ext.add_theme_func('airline#extensions#tabline#load_theme') call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
if s:buffer_idx_mode
call s:define_buffer_idx_mode_mappings()
endif
endfunction endfunction
function! s:toggle_off() function! s:toggle_off()
@ -210,6 +214,10 @@ function! s:get_buffers()
endif endif
endif endif
if s:buffer_idx_mode
let s:buffer_idx_mode_buffers = []
let l:index = 1
endif
let b = airline#builder#new(s:builder_context) let b = airline#builder#new(s:builder_context)
let tab_bufs = tabpagebuflist(tabpagenr()) let tab_bufs = tabpagebuflist(tabpagenr())
for nr in s:get_visible_buffers() for nr in s:get_visible_buffers()
@ -233,7 +241,13 @@ function! s:get_buffers()
let group = 'airline_tabhid' let group = 'airline_tabhid'
endif endif
endif endif
call b.add_section(group, s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.s:spc) if s:buffer_idx_mode
call b.add_section(group, '['.l:index.s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.']')
let l:index = l:index + 1
call add(s:buffer_idx_mode_buffers, nr)
else
call b.add_section(group, s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.s:spc)
endif
endfor endfor
call b.add_section('airline_tabfill', '') call b.add_section('airline_tabfill', '')
@ -245,6 +259,28 @@ function! s:get_buffers()
return s:current_tabline return s:current_tabline
endfunction endfunction
function! s:select_tab(buf_index)
" no-op when called in the NERDTree buffer
if exists('t:NERDTreeBufName') && bufname('%') == t:NERDTreeBufName
return
endif
if a:buf_index <= len(s:buffer_idx_mode_buffers)
exec "b!" . s:buffer_idx_mode_buffers[a:buf_index - 1]
endif
endfunction
function! s:define_buffer_idx_mode_mappings()
noremap <unique> <Plug>AirlineSelectTab1 :call <SID>select_tab(1)<CR>
noremap <unique> <Plug>AirlineSelectTab2 :call <SID>select_tab(2)<CR>
noremap <unique> <Plug>AirlineSelectTab3 :call <SID>select_tab(3)<CR>
noremap <unique> <Plug>AirlineSelectTab4 :call <SID>select_tab(4)<CR>
noremap <unique> <Plug>AirlineSelectTab5 :call <SID>select_tab(5)<CR>
noremap <unique> <Plug>AirlineSelectTab6 :call <SID>select_tab(6)<CR>
noremap <unique> <Plug>AirlineSelectTab7 :call <SID>select_tab(7)<CR>
noremap <unique> <Plug>AirlineSelectTab8 :call <SID>select_tab(8)<CR>
noremap <unique> <Plug>AirlineSelectTab9 :call <SID>select_tab(9)<CR>
endfunction
function! s:get_tabs() function! s:get_tabs()
let curbuf = bufnr('%') let curbuf = bufnr('%')
let curtab = tabpagenr() let curtab = tabpagenr()

View File

@ -404,6 +404,17 @@ eclim <https://eclim.org>
* enable/disable displaying tab type (far right) * enable/disable displaying tab type (far right)
let g:airline#extensions#tabline#show_tab_type = 1 let g:airline#extensions#tabline#show_tab_type = 1
* enable/disable displaying index of the buffer.
" When enabled, a map between buffer index and buffer number
" will be maintained. Up to nine mappings will be defined to
" allow switching to a buffer using its index easily.
" The mappings have the form <Plug>AirlineSelectTab{x}
" where x is a number from 1 to 9. One can defining mappings like this
" nmap <leader>1 <Plug>AirlineSelectTab1
" Note that buffering switching won't happen if the current buffer
" is a NERDTree buffer.
let g:airline#extensions#tabline#buffer_idx_mode = 1
* defines the name of a formatter for how buffer names are displayed. > * defines the name of a formatter for how buffer names are displayed. >
let g:airline#extensions#tabline#formatter = 'default' let g:airline#extensions#tabline#formatter = 'default'