github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 10:43:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Highlight && and || as operators

Browse Source 
This also switches 'and' and 'or' to operators as well.
This commit is contained in:
ridiculousfish 2018-03-04 15:03:56 -08:00
parent 357d3b8c6d
commit f83742d579
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fish_tests.cpp
View File

@ -3951,10 +3951,23 @@ static void test_highlighting() {
{L"2>", highlight_spec_redirection},
{NULL, -1}};
const highlight_component_t components15[] = {{L"if", highlight_spec_command},
{L"true", highlight_spec_command},
{L"&&", highlight_spec_operator},
{L"false", highlight_spec_command},
{L";", highlight_spec_statement_terminator},
{L"or", highlight_spec_operator},
{L"false", highlight_spec_command},
{L"||", highlight_spec_operator},
{L"true", highlight_spec_command},
{L";", highlight_spec_statement_terminator},
{L"end", highlight_spec_command},
{NULL, -1}};
const highlight_component_t *tests[] = {components1, components2, components3, components4,
components5, components6, components7, components8,
components9, components10, components11, components12,
components13, components14};
components13, components14, components15};
for (size_t which = 0; which < sizeof tests / sizeof *tests; which++) {
const highlight_component_t *components = tests[which];
// Count how many we have.
@ -3990,8 +4003,10 @@ static void test_highlighting() {
if (expected_colors.at(i) != colors.at(i)) {
const wcstring spaces(i, L' ');
err(L"Wrong color at index %lu in text (expected %#x, actual %#x):\n%ls\n%ls^", i,
expected_colors.at(i), colors.at(i), text.c_str(), spaces.c_str());
err(L"Wrong color in test %lu at index %lu in text (expected %#x, actual "
L"%#x):\n%ls\n%ls^",
which + 1, i, expected_colors.at(i), colors.at(i), text.c_str(),
spaces.c_str());
}
}
}

10
src/highlight.cpp
View File

@ -1059,6 +1059,16 @@ const highlighter_t::color_array_t &highlighter_t::highlight() {
this->color_argument(fhead.child<1>());
break;
}
case parse_token_type_andand:
case parse_token_type_oror:
this->color_node(node, highlight_spec_operator);
break;
case symbol_job_decorator:
this->color_node(node, highlight_spec_operator);
break;
case parse_token_type_pipe:
case parse_token_type_background:
case parse_token_type_end:

2
src/parse_tree.h
View File

@ -95,7 +95,7 @@ class parse_node_t {
// This is used to store e.g. the statement decoration.
parse_node_tag_t tag : 4;
// Description
wcstring describe(void) const;
wcstring describe() const;
// Constructor
explicit parse_node_t(parse_token_type_t ty)