github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 18:03:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove fish_color_match support

Browse Source 
fish_color_match is a variable which controls syntax highlighting for
matching quotes and parens, but only with interactive `read` with shell
highlighting disabled. It seems unlikely that anybody cares about this.
This commit is contained in:
ridiculousfish 2020-08-03 13:33:44 -07:00
parent af48d09ca6
commit f94a6a74f0
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@ -143,6 +143,7 @@ Completions
Deprecations and removed features Deprecations and removed features
--------------------------------- ---------------------------------
- fish no longer attempts to modify the terminal size via `TIOCSWINSZ`. - fish no longer attempts to modify the terminal size via `TIOCSWINSZ`.
- The `fish_color_match` variable is no longer used. (Previously this controlled the color of matching quotes and parens when using `read`).
For distributors and developers For distributors and developers
------------------------------- -------------------------------

4
src/fish_indent.cpp
View File

@ -627,7 +627,6 @@ static const char *highlight_role_to_string(highlight_role_t role) {
TEST_ROLE(statement_terminator) TEST_ROLE(statement_terminator)
TEST_ROLE(param) TEST_ROLE(param)
TEST_ROLE(comment) TEST_ROLE(comment)
TEST_ROLE(match)
TEST_ROLE(search_match) TEST_ROLE(search_match)
TEST_ROLE(operat) TEST_ROLE(operat)
TEST_ROLE(escape) TEST_ROLE(escape)
@ -736,9 +735,6 @@ static const wchar_t *html_class_name_for_color(highlight_spec_t spec) {
case highlight_role_t::comment: { case highlight_role_t::comment: {
return P(comment); return P(comment);
} }
case highlight_role_t::match: {
return P(match);
}
case highlight_role_t::search_match: { case highlight_role_t::search_match: {
return P(search_match); return P(search_match);
} }

12
src/highlight.cpp
View File

@ -53,8 +53,6 @@ static const wchar_t *get_highlight_var_name(highlight_role_t role) {
return L"fish_color_param"; return L"fish_color_param";
case highlight_role_t::comment: case highlight_role_t::comment:
return L"fish_color_comment"; return L"fish_color_comment";
case highlight_role_t::match:
return L"fish_color_match";
case highlight_role_t::search_match: case highlight_role_t::search_match:
return L"fish_color_search_match"; return L"fish_color_search_match";
case highlight_role_t::operat: case highlight_role_t::operat:
@ -115,8 +113,6 @@ static highlight_role_t get_fallback(highlight_role_t role) {
return highlight_role_t::normal; return highlight_role_t::normal;
case highlight_role_t::comment: case highlight_role_t::comment:
return highlight_role_t::normal; return highlight_role_t::normal;
case highlight_role_t::match:
return highlight_role_t::normal;
case highlight_role_t::search_match: case highlight_role_t::search_match:
return highlight_role_t::normal; return highlight_role_t::normal;
case highlight_role_t::operat: case highlight_role_t::operat:
@ -1359,8 +1355,8 @@ static void highlight_universal_internal(const wcstring &buffstr,
pos1 = lst.back(); pos1 = lst.back();
pos2 = str - buff; pos2 = str - buff;
if (pos1 == pos || pos2 == pos) { if (pos1 == pos || pos2 == pos) {
color.at(pos1).background = highlight_role_t::match; color.at(pos1).background = highlight_role_t::normal;
color.at(pos2).background = highlight_role_t::match; color.at(pos2).background = highlight_role_t::normal;
match_found = true; match_found = true;
} }
prev_q = *str == L'\"' ? L'\'' : L'\"'; prev_q = *str == L'\"' ? L'\'' : L'\"';
@ -1397,8 +1393,8 @@ static void highlight_universal_internal(const wcstring &buffstr,
if (test_char == dec_char) level--; if (test_char == dec_char) level--;
if (level == 0) { if (level == 0) {
long pos2 = i; long pos2 = i;
color.at(pos).background = highlight_role_t::match; color.at(pos).background = highlight_role_t::normal;
color.at(pos2).background = highlight_role_t::match; color.at(pos2).background = highlight_role_t::normal;
match_found = true; match_found = true;
break; break;
} }

1
src/highlight.h
View File

@ -19,7 +19,6 @@ enum class highlight_role_t : uint8_t {
statement_terminator, // process separator statement_terminator, // process separator
param, // command parameter (argument) param, // command parameter (argument)
comment, // comment comment, // comment
match, // matching parenthesis, etc.
search_match, // search match search_match, // search match
operat, // operator operat, // operator
escape, // escape sequences escape, // escape sequences