github/kovidgoyal-kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-07-03 11:12:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove tabs_to_be_shown_in_tab_bar_as_sequence

Browse Source 
It was a dangerous API as it kinda implied the returned tabs were a copy
but they werent when no filter was present. Take the small perf hit of
always making a copy for safety.
This commit is contained in:
Kovid Goyal
2025-08-24 20:12:28 +05:30
parent 543e113be0
commit d8cfb6b180
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kitty/tabs.py
View File

@@ -1166,17 +1166,8 @@ class TabManager: # {{{
return (t for t in self if t is at or t in m)
return self.tabs
@property
def tabs_to_be_shown_in_tab_bar_as_sequence(self) -> Sequence[Tab]:
f = get_options().tab_bar_filter
if f:
at = self.active_tab
m = set(self.filtered_tabs(f))
return tuple(t for t in self if t is at or t in m)
return self.tabs
def next_tab(self, delta: int = 1) -> None:
if (tabs := self.tabs_to_be_shown_in_tab_bar_as_sequence) is self.tabs:
if (len(tabs := tuple(self.tabs_to_be_shown_in_tab_bar))) == len(self.tabs):
if (num := len(tabs)) > 1:
self.set_active_tab_idx((self.active_tab_idx + num + delta) % num)
else:
@@ -1200,7 +1191,7 @@ class TabManager: # {{{
break
def tab_at_location(self, loc: str) -> Tab | None:
tabs = self.tabs_to_be_shown_in_tab_bar_as_sequence
tabs = tuple(self.tabs_to_be_shown_in_tab_bar)
if loc == 'prev':
if self.active_tab_history:
return self.tab_for_id(self.active_tab_history[-1])
@@ -1211,7 +1202,7 @@ class TabManager: # {{{
return None
def goto_tab(self, tab_num: int) -> None:
tabs = self.tabs_to_be_shown_in_tab_bar_as_sequence
tabs = tuple(self.tabs_to_be_shown_in_tab_bar)
if tab_num >= len(tabs):
tab_num = max(0, len(tabs) - 1)
if tab_num >= 0:
@@ -1304,7 +1295,7 @@ class TabManager: # {{{
return None
def move_tab(self, delta: int = 1) -> None:
tabs = self.tabs_to_be_shown_in_tab_bar_as_sequence
tabs = tuple(self.tabs_to_be_shown_in_tab_bar)
if len(tabs) > 1:
idx = self.active_tab_idx
new_active_tab = tabs[(idx + len(tabs) + delta) % len(tabs)]
@@ -1362,7 +1353,7 @@ class TabManager: # {{{
def remove(self, removed_tab: Tab) -> None:
active_tab_before_removal = self.active_tab
tabs = self.tabs_to_be_shown_in_tab_bar_as_sequence
tabs = tuple(self.tabs_to_be_shown_in_tab_bar)
self._remove_tab(removed_tab)
while True:
try:
@@ -1388,6 +1379,7 @@ class TabManager: # {{{
tab_id = self.active_tab_history.pop()
next_active_tab = self.tab_for_id(tab_id)
case 'left':
print(2222222222, tabs.index(active_tab_before_removal))
next_active_tab = tabs[(tabs.index(active_tab_before_removal) - 1 + len(tabs)) % len(tabs)]
remove_from_end_of_active_history(next_active_tab)
case 'right':