KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use a single SGR regex pattern cache

Browse Source
This commit is contained in:
Kovid Goyal 2022-01-16 09:46:52 +05:30
parent 0be0836890
commit 2538e94390
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kitty/tab_bar.py
View File

@ -4,7 +4,7 @@
import os
from functools import lru_cache, partial, wraps
from typing import (
Any, Callable, Dict, List, NamedTuple, Optional, Sequence, Tuple, Union, TYPE_CHECKING
Any, Callable, Dict, List, NamedTuple, Optional, Sequence, Tuple, Union
)
from .borders import Border, BorderColor
@ -17,11 +17,7 @@ from .fast_data_types import (
from .rgb import alpha_blend, color_as_sgr, color_from_int, to_color
from .types import WindowGeometry, run_once
from .typing import EdgeLiteral, PowerlineStyle
from .utils import color_as_int, log_error
if TYPE_CHECKING:
import re
from .utils import color_as_int, log_error, sgr_sanitizer_pat
class TabBarData(NamedTuple):
@ -156,15 +152,9 @@ class ExtraData:
next_tab: Optional[TabBarData] = None
@run_once
def attributed_string_pat() -> 're.Pattern[str]':
import re
return re.compile('(\x1b\\[[^m]*m)')
def draw_attributed_string(title: str, screen: Screen) -> None:
if '\x1b' in title:
for x in attributed_string_pat().split(title):
for x in sgr_sanitizer_pat(for_splitting=True).split(title):
if x.startswith('\x1b') and x.endswith('m'):
screen.apply_sgr(x[2:-1])
else:

6
kitty/utils.py
View File

@ -53,8 +53,10 @@ def expandvars(val: str, env: Mapping[str, str] = {}, fallback_to_os_env: bool =
return re.sub(r'\$(?:(\w+)|\{([^}]+)\})', sub, val.replace('$$', '\0')).replace('\0', '$')
@run_once
def sgr_sanitizer_pat() -> 're.Pattern[str]':
@lru_cache(maxsize=2)
def sgr_sanitizer_pat(for_splitting: bool = False) -> 're.Pattern[str]':
if for_splitting:
return re.compile('(\033\\[.*?m)')
return re.compile('\033\\[.*?m')