Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix fish_config rendering brights as normal on prompt previews

Browse source 
I noticed our default brgreen for fish_color_user was rendering
as just unstyled white.
This commit is contained in:
Aaron Gyes 2019-01-21 13:59:36 -08:00
parent a5e5f90f73
commit 8743961301
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
share/tools/web_config/fishconfig.css
View file

@ -474,6 +474,7 @@ img.delete_icon {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #c0c0c0; /* set_color normal, assume white (not brwhite) */
} }
.prompt_demo { .prompt_demo {

10
share/tools/web_config/webconfig.py
View file

@ -19,6 +19,7 @@ import socket
import string import string
import subprocess import subprocess
import sys import sys
from itertools import chain
FISH_BIN_PATH = False # will be set later FISH_BIN_PATH = False # will be set later
IS_PY2 = sys.version_info[0] == 2 IS_PY2 = sys.version_info[0] == 2
@ -252,7 +253,6 @@ def get_special_ansi_escapes():
def append_html_for_ansi_escape(full_val, result, span_open): def append_html_for_ansi_escape(full_val, result, span_open):
# Strip off the initial \x1b[ and terminating m # Strip off the initial \x1b[ and terminating m
val = full_val[2:-1] val = full_val[2:-1]
@ -269,10 +269,10 @@ def append_html_for_ansi_escape(full_val, result, span_open):
result.append('<span style="color: ' + html_color + '">') result.append('<span style="color: ' + html_color + '">')
return True # span now open return True # span now open
# term8 foreground color # term16 foreground color
if val in [str(x) for x in range(30, 38)]: if val in (str(x) for x in chain(range(90, 97), range(30, 38))):
close_span() close_span()
html_color = html_color_for_ansi_color_index(int(val) - 30) html_color = html_color_for_ansi_color_index(int(val) - (30 if int(val) < 90 else 82))
result.append('<span style="color: ' + html_color + '">') result.append('<span style="color: ' + html_color + '">')
return True # span now open return True # span now open
@ -282,7 +282,7 @@ def append_html_for_ansi_escape(full_val, result, span_open):
close_span() close_span()
return False return False
# We don't handle bold or underline yet # TODO We don't handle bold, underline, italics, dim, or reverse yet
# Do nothing on failure # Do nothing on failure
return span_open return span_open