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

Replace tabs tabline remaining_space with a member variable

Browse Source
This commit is contained in:
mrmr1993 2018-03-15 18:01:39 +00:00
parent 1328610188
commit 9b41fe5de9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ function! s:prototype.build() dict
if has_key(self, '_left_position') if has_key(self, '_left_position')
let tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0) let tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
let num_tabs = tabpagenr('$') let num_tabs = tabpagenr('$')
let remaining_space = &columns - s:strchars(s:evaluate_tabline(self._build())) let self._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_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)) let left_alt_sep_size = s:strchars(s:evaluate_tabline(self._context.left_alt_sep))
@ -24,14 +24,14 @@ function! s:prototype.build() dict
let skipped_tabs_marker = get(g:, 'airline#extensions#tabline#overflow_marker', g:airline_symbols.ellipsis) let skipped_tabs_marker = get(g:, 'airline#extensions#tabline#overflow_marker', g:airline_symbols.ellipsis)
let skipped_tabs_marker_size = s:strchars(s:evaluate_tabline(skipped_tabs_marker)) let skipped_tabs_marker_size = s:strchars(s:evaluate_tabline(skipped_tabs_marker))
" The left marker will have left_alt_sep, and the right will have left_sep. " The left marker will have left_alt_sep, and the right will have left_sep.
let remaining_space -= 2 * skipped_tabs_marker_size + left_sep_size + left_alt_sep_size let self._remaining_space -= 2 * skipped_tabs_marker_size + left_sep_size + left_alt_sep_size
" Add the current tab " Add the current tab
let tab_title = self.get_title(tab_nr_type, self._left_tab) let tab_title = self.get_title(tab_nr_type, self._left_tab)
let remaining_space -= s:strchars(s:evaluate_tabline(tab_title)) let self._remaining_space -= s:strchars(s:evaluate_tabline(tab_title))
" There are always two left_seps (either side of the selected tab) and all " There are always two left_seps (either side of the selected tab) and all
" other seperators are left_alt_seps. " other seperators are left_alt_seps.
let remaining_space -= 2 * left_sep_size - left_alt_sep_size let self._remaining_space -= 2 * left_sep_size - left_alt_sep_size
call self.insert_section(self.get_group(self._left_tab), tab_title, self._left_position) call self.insert_section(self.get_group(self._left_tab), tab_title, self._left_position)
let self._right_position += 1 let self._right_position += 1
let self._left_tab -= 1 let self._left_tab -= 1
@ -44,25 +44,25 @@ function! s:prototype.build() dict
" Add the tab to the right " Add the tab to the right
if self._right_tab <= num_tabs if self._right_tab <= num_tabs
let tab_title = self.get_title(tab_nr_type, self._right_tab) let tab_title = self.get_title(tab_nr_type, self._right_tab)
let remaining_space -= s:strchars(s:evaluate_tabline(tab_title)) + left_alt_sep_size let self._remaining_space -= s:strchars(s:evaluate_tabline(tab_title)) + left_alt_sep_size
call self.insert_section(self.get_group(self._right_tab), tab_title, self._right_position) call self.insert_section(self.get_group(self._right_tab), tab_title, self._right_position)
let self._right_position += 1 let self._right_position += 1
let self._right_tab += 1 let self._right_tab += 1
endif endif
while remaining_space > 0 while self._remaining_space > 0
if self._left_tab > 0 if self._left_tab > 0
let tab_title = self.get_title(tab_nr_type, self._left_tab) let tab_title = self.get_title(tab_nr_type, self._left_tab)
let remaining_space -= s:strchars(s:evaluate_tabline(tab_title)) + left_alt_sep_size let self._remaining_space -= s:strchars(s:evaluate_tabline(tab_title)) + left_alt_sep_size
if remaining_space >= 0 if self._remaining_space >= 0
call self.insert_section(self.get_group(self._left_tab), tab_title, self._left_position) call self.insert_section(self.get_group(self._left_tab), tab_title, self._left_position)
let self._right_position += 1 let self._right_position += 1
let self._left_tab -= 1 let self._left_tab -= 1
endif endif
elseif self._right_tab <= num_tabs elseif self._right_tab <= num_tabs
let tab_title = self.get_title(tab_nr_type, self._right_tab) let tab_title = self.get_title(tab_nr_type, self._right_tab)
let remaining_space -= s:strchars(s:evaluate_tabline(tab_title)) + left_alt_sep_size let self._remaining_space -= s:strchars(s:evaluate_tabline(tab_title)) + left_alt_sep_size
if remaining_space >= 0 if self._remaining_space >= 0
call self.insert_section(self.get_group(self._right_tab), tab_title, self._right_position) call self.insert_section(self.get_group(self._right_tab), tab_title, self._right_position)
let self._right_position += 1 let self._right_position += 1
let self._right_tab += 1 let self._right_tab += 1