From 9b41fe5de95f1b3faa9a21f81b7c3229f13ebc06 Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Thu, 15 Mar 2018 18:01:39 +0000 Subject: [PATCH] Replace tabs tabline remaining_space with a member variable --- .../airline/extensions/tabline/builder.vim | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/autoload/airline/extensions/tabline/builder.vim b/autoload/airline/extensions/tabline/builder.vim index f56b9a9..b8d69bf 100644 --- a/autoload/airline/extensions/tabline/builder.vim +++ b/autoload/airline/extensions/tabline/builder.vim @@ -16,7 +16,7 @@ function! s:prototype.build() dict if has_key(self, '_left_position') let tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0) 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_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_size = s:strchars(s:evaluate_tabline(skipped_tabs_marker)) " 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 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 " 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) let self._right_position += 1 let self._left_tab -= 1 @@ -44,25 +44,25 @@ function! s:prototype.build() dict " Add the tab to the right if self._right_tab <= num_tabs 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) let self._right_position += 1 let self._right_tab += 1 endif - while remaining_space > 0 + while self._remaining_space > 0 if self._left_tab > 0 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 - if remaining_space >= 0 + let self._remaining_space -= s:strchars(s:evaluate_tabline(tab_title)) + left_alt_sep_size + if self._remaining_space >= 0 call self.insert_section(self.get_group(self._left_tab), tab_title, self._left_position) let self._right_position += 1 let self._left_tab -= 1 endif elseif self._right_tab <= num_tabs 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 - if remaining_space >= 0 + let self._remaining_space -= s:strchars(s:evaluate_tabline(tab_title)) + left_alt_sep_size + if self._remaining_space >= 0 call self.insert_section(self.get_group(self._right_tab), tab_title, self._right_position) let self._right_position += 1 let self._right_tab += 1