Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-16 15:04:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

escape_code_length: Test colors last

Browse source 
We have a *lot* of color sequences to try and tparm is slow (on the
whole, when you do this thousands of times).

So let's just check colors last, which makes everything else (which is
comparatively nothing) faster, while barely impacting
colors (benchmarking confirms no measurable difference).

Fixes #8253.
This commit is contained in:
Fabian Homborg 2021-08-26 21:01:55 +02:00
parent a36a26c28b
commit ee2d2caeaa
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/screen.cpp
View file

@ -252,13 +252,15 @@ maybe_t<size_t> escape_code_length(const wchar_t *code) {
if (*code != L'\x1B') return none();
size_t esc_seq_len = 0;
bool found = is_color_escape_seq(code, &esc_seq_len);
if (!found) found = is_visual_escape_seq(code, &esc_seq_len);
bool found = is_visual_escape_seq(code, &esc_seq_len);
if (!found) found = is_screen_name_escape_seq(code, &esc_seq_len);
if (!found) found = is_osc_escape_seq(code, &esc_seq_len);
if (!found) found = is_three_byte_escape_seq(code, &esc_seq_len);
if (!found) found = is_csi_style_escape_seq(code, &esc_seq_len);
if (!found) found = is_two_byte_escape_seq(code, &esc_seq_len);
// Colors are the hardest to match, so we try last.
// (also tparm is *slow*, we should try to find a better replacement)
if (!found) found = is_color_escape_seq(code, &esc_seq_len);
return found ? maybe_t<size_t>{esc_seq_len} : none();
}