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

Generate tabs directly in tabline/builder.build

Browse Source
This commit is contained in:
mrmr1993 2018-03-15 17:10:49 +00:00
parent 3f87d28abb
commit 349d01ba39
2 changed files with 89 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
autoload/airline/extensions/tabline/builder.vim
View File

@ -5,14 +5,21 @@ scriptencoding utf-8
let s:prototype = {}
function! s:prototype.insert_tabs(tabs_position, curtab) dict
function! s:prototype.insert_tabs(curtab) dict
let self._tabs_position = self.get_position()
let self._curtab = a:curtab
endfunction
function! s:prototype.build() dict
if has_key(self, "_tabs_position")
let tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
let num_tabs = tabpagenr('$')
let left_tab = a:curtab - 1
let right_tab = a:curtab + 1
let left_position = a:tabs_position
let right_position = a:tabs_position + 1
let remaining_space = &columns - s:strchars(s:evaluate_tabline(self.build()))
let curtab = self._curtab
let left_tab = curtab - 1
let right_tab = curtab + 1
let left_position = self._tabs_position
let right_position = self._tabs_position + 1
let remaining_space = &columns - s:strchars(s:evaluate_tabline(self._build()))
let left_sep_size = s:strchars(s:evaluate_tabline(self._context.left_sep))
let left_alt_sep_size = s:strchars(s:evaluate_tabline(self._context.left_alt_sep))
@ -23,12 +30,12 @@ function! s:prototype.insert_tabs(tabs_position, curtab) dict
let remaining_space -= 2 * skipped_tabs_marker_size + left_sep_size + left_alt_sep_size
" Add the current tab
let tab_title = self.get_title(tab_nr_type, a:curtab)
let tab_title = self.get_title(tab_nr_type, curtab)
let remaining_space -= s:strchars(s:evaluate_tabline(tab_title))
" There are always two left_seps (either side of the selected tab) and all
" other seperators are left_alt_seps.
let remaining_space -= 2 * left_sep_size - left_alt_sep_size
call self.insert_section(self.get_group(a:curtab), tab_title, left_position)
call self.insert_section(self.get_group(curtab), tab_title, left_position)
if get(g:, 'airline#extensions#tabline#current_first', 0)
" always have current tabpage first
@ -77,6 +84,9 @@ function! s:prototype.insert_tabs(tabs_position, curtab) dict
if right_tab <= num_tabs
call self.insert_raw('%#airline_tab#'.skipped_tabs_marker, right_position)
endif
endif
return self._build()
endfunction
function! s:evaluate_tabline(tabline)
@ -102,6 +112,7 @@ endfunction
function! airline#extensions#tabline#builder#new(context)
let builder = airline#builder#new(a:context)
let builder._build = builder.build
call extend(builder, s:prototype, 'force')
return builder
endfunction

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

@ -43,26 +43,6 @@ function! airline#extensions#tabline#tabs#get()
call airline#extensions#tabline#add_label(b, 'tabs')
let tabs_position = b.get_position()
call b.add_section('airline_tabfill', '')
call b.split()
call b.add_section('airline_tabfill', '')
if get(g:, 'airline#extensions#tabline#show_close_button', 1)
call b.add_section('airline_tab_right', ' %999X'.
\ get(g:, 'airline#extensions#tabline#close_symbol', 'X').' ')
endif
if get(g:, 'airline#extensions#tabline#show_splits', 1) == 1
let buffers = tabpagebuflist(curtab)
for nr in buffers
let group = airline#extensions#tabline#group_of_bufnr(buffers, nr) . "_right"
call b.add_section_spaced(group, '%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)')
endfor
call airline#extensions#tabline#add_label(b, 'buffers')
endif
function! b.get_group(i) dict
let curtab = tabpagenr()
let group = 'airline_tab'
@ -90,7 +70,25 @@ function! airline#extensions#tabline#tabs#get()
return val.'%'.a:i.'T %{airline#extensions#tabline#title('.a:i.')} %)'
endfunction
call b.insert_tabs(tabs_position, curtab)
call b.insert_tabs(curtab)
call b.add_section('airline_tabfill', '')
call b.split()
call b.add_section('airline_tabfill', '')
if get(g:, 'airline#extensions#tabline#show_close_button', 1)
call b.add_section('airline_tab_right', ' %999X'.
\ get(g:, 'airline#extensions#tabline#close_symbol', 'X').' ')
endif
if get(g:, 'airline#extensions#tabline#show_splits', 1) == 1
let buffers = tabpagebuflist(curtab)
for nr in buffers
let group = airline#extensions#tabline#group_of_bufnr(buffers, nr) . "_right"
call b.add_section_spaced(group, '%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)')
endfor
call airline#extensions#tabline#add_label(b, 'buffers')
endif
let s:current_bufnr = curbuf
let s:current_tabnr = curtab