Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistently reset color formatting #3034

Merged
merged 4 commits into from
Feb 8, 2024
Merged

Consistently reset color formatting #3034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d997b39
Consistently reset color formatting in `jv_dump_term`
thaliaarchi Feb 7, 2024
dc69571
Fix tests and test indented printing
thaliaarchi Feb 7, 2024
ccebd8e
Clear formatting immediately after colon
thaliaarchi Feb 7, 2024
d360c5c
Add missing string color case
thaliaarchi Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 17 additions & 23 deletions src/jv_print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,21 +260,17 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
break;
}
put_str("[", F, S, flags & JV_PRINT_ISATTY);
if (flags & JV_PRINT_PRETTY) {
put_char('\n', F, S, flags & JV_PRINT_ISATTY);
put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
}
jv_array_foreach(x, i, elem) {
if (i!=0) {
if (flags & JV_PRINT_PRETTY) {
put_str(",\n", F, S, flags & JV_PRINT_ISATTY);
put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
} else {
put_str(",", F, S, flags & JV_PRINT_ISATTY);
}
if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
put_char(',', F, S, flags & JV_PRINT_ISATTY);
}
if (color) put_str(COLRESET, F, S, flags & JV_PRINT_ISATTY);
if (flags & JV_PRINT_PRETTY) {
put_char('\n', F, S, flags & JV_PRINT_ISATTY);
put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
}
jv_dump_term(C, elem, flags, indent + 1, F, S);
if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
}
if (flags & JV_PRINT_PRETTY) {
put_char('\n', F, S, flags & JV_PRINT_ISATTY);
Expand All @@ -292,10 +288,6 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
break;
}
put_char('{', F, S, flags & JV_PRINT_ISATTY);
if (flags & JV_PRINT_PRETTY) {
put_char('\n', F, S, flags & JV_PRINT_ISATTY);
put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
}
int first = 1;
int i = 0;
jv keyset = jv_null();
Expand Down Expand Up @@ -326,14 +318,14 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
}

if (!first) {
if (flags & JV_PRINT_PRETTY){
put_str(",\n", F, S, flags & JV_PRINT_ISATTY);
put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
} else {
put_str(",", F, S, flags & JV_PRINT_ISATTY);
}
if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
put_char(',', F, S, flags & JV_PRINT_ISATTY);
}
if (color) put_str(COLRESET, F, S, flags & JV_PRINT_ISATTY);
if (flags & JV_PRINT_PRETTY) {
put_char('\n', F, S, flags & JV_PRINT_ISATTY);
put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
}

first = 0;
if (color) put_str(FIELD_COLOR, F, S, flags & JV_PRINT_ISATTY);
Expand All @@ -342,11 +334,13 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
if (color) put_str(COLRESET, F, S, flags & JV_PRINT_ISATTY);

if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
put_str((flags & JV_PRINT_PRETTY) ? ": " : ":", F, S, flags & JV_PRINT_ISATTY);
put_char(':', F, S, flags & JV_PRINT_ISATTY);
if (color) put_str(COLRESET, F, S, flags & JV_PRINT_ISATTY);
if (flags & JV_PRINT_PRETTY) {
put_char(' ', F, S, flags & JV_PRINT_ISATTY);
}

jv_dump_term(C, value, flags, indent + 1, F, S);
if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
}
if (flags & JV_PRINT_PRETTY) {
put_char('\n', F, S, flags & JV_PRINT_ISATTY);
Expand Down
123 changes: 89 additions & 34 deletions tests/shtest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,41 +436,96 @@ printf '\033[4;31mnull\033[0m\n' > $d/expect
cmp $d/color $d/expect

## Default colors, complex input
$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color
$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color
{
printf '\033[1;39m[\033[1;39m{'
printf '\033[0m\033[1;34m"a"\033['
printf '0m\033[1;39m:\033[0m\033['
printf '0;39mtrue\033[0m\033[1'
printf ';39m,\033[0m\033[1;34m'
printf '"b"\033[0m\033[1;39m:\033'
printf '[0m\033[0;39mfalse\033'
printf '[0m\033[1;39m\033[1;39'
printf 'm}\033[0m\033[1;39m,\033['
printf '0;39m123\033[0m\033[1;'
printf '39m,\033[0;90mnull\033'
printf '[0m\033[1;39m\033[1;39'
printf 'm]\033[0m\n'
printf '\033[1;39m[\033[0m'
printf '\033[1;39m{\033[0m'
printf '\033[1;34m"a"\033[0m'
printf '\033[1;39m:\033[0m'
printf '\033[0;39mtrue\033[0m'
printf '\033[1;39m,\033[0m'
printf '\033[1;34m"b"\033[0m'
printf '\033[1;39m:\033[0m'
printf '\033[0;39mfalse\033[0m'
printf '\033[1;39m}\033[0m'
printf '\033[1;39m,\033[0m'
printf '\033[0;32m"abc"\033[0m'
printf '\033[1;39m,\033[0m'
printf '\033[0;39m123\033[0m'
printf '\033[1;39m,\033[0m'
printf '\033[0;90mnull\033[0m'
printf '\033[1;39m]\033[0m\n'
} > $d/expect
cmp $d/color $d/expect

## Set non-default colors, complex input
JQ_COLORS='0;30:0;31:0;32:0;33:0;34:1;35:1;36:1;37' \
$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color
$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color
{
printf '\033[1;35m[\033[1;36m{'
printf '\033[0m\033[1;37m"a"\033['
printf '0m\033[1;36m:\033[0m\033['
printf '0;32mtrue\033[0m\033[1'
printf ';36m,\033[0m\033[1;37m'
printf '"b"\033[0m\033[1;36m:\033'
printf '[0m\033[0;31mfalse\033'
printf '[0m\033[1;36m\033[1;36'
printf 'm}\033[0m\033[1;35m,\033['
printf '0;33m123\033[0m\033[1;'
printf '35m,\033[0;30mnull\033'
printf '[0m\033[1;35m\033[1;35'
printf 'm]\033[0m\n'
printf '\033[1;35m[\033[0m'
printf '\033[1;36m{\033[0m'
printf '\033[1;37m"a"\033[0m'
printf '\033[1;36m:\033[0m'
printf '\033[0;32mtrue\033[0m'
printf '\033[1;36m,\033[0m'
printf '\033[1;37m"b"\033[0m'
printf '\033[1;36m:\033[0m'
printf '\033[0;31mfalse\033[0m'
printf '\033[1;36m}\033[0m'
printf '\033[1;35m,\033[0m'
printf '\033[0;34m"abc"\033[0m'
printf '\033[1;35m,\033[0m'
printf '\033[0;33m123\033[0m'
printf '\033[1;35m,\033[0m'
printf '\033[0;30mnull\033[0m'
printf '\033[1;35m]\033[0m\n'
} > $d/expect
cmp $d/color $d/expect

## Default colors, complex input, indented
$JQ -Cn '[{"a":true,"b":false},"abc",123,null]' > $d/color
{
printf '\033[1;39m[\033[0m\n'
printf ' \033[1;39m{\033[0m\n'
printf ' \033[1;34m"a"\033[0m'
printf '\033[1;39m:\033[0m '
printf '\033[0;39mtrue\033[0m'
printf '\033[1;39m,\033[0m\n'
printf ' \033[1;34m"b"\033[0m'
printf '\033[1;39m:\033[0m '
printf '\033[0;39mfalse\033[0m\n'
printf ' \033[1;39m}\033[0m'
printf '\033[1;39m,\033[0m\n'
printf ' \033[0;32m"abc"\033[0m'
printf '\033[1;39m,\033[0m\n'
printf ' \033[0;39m123\033[0m'
printf '\033[1;39m,\033[0m\n'
printf ' \033[0;90mnull\033[0m\n'
printf '\033[1;39m]\033[0m\n'
} > $d/expect
cmp $d/color $d/expect

## Set non-default colors, complex input, indented
Copy link
Member

@wader wader Feb 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this regression test verify the reset issue for arrays? i can visually see the issue using JQ_COLORS='0;30:0;31:0;32:0;33:0;34:7;35:1;36:1;37' jq -Cn '[{"a":true,"b":false},123,null]' (7 to reverse colors for arrays)

Nice tests 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

file

JQ_COLORS='0;30:0;31:0;32:0;33:0;34:1;35:1;36:1;37' \
$JQ -Cn '[{"a":true,"b":false},"abc",123,null]' > $d/color
{
printf '\033[1;35m[\033[0m\n'
printf ' \033[1;36m{\033[0m\n'
printf ' \033[1;37m"a"\033[0m'
printf '\033[1;36m:\033[0m '
printf '\033[0;32mtrue\033[0m'
printf '\033[1;36m,\033[0m\n'
printf ' \033[1;37m"b"\033[0m'
printf '\033[1;36m:\033[0m '
printf '\033[0;31mfalse\033[0m\n'
printf ' \033[1;36m}\033[0m'
printf '\033[1;35m,\033[0m\n'
printf ' \033[0;34m"abc"\033[0m'
printf '\033[1;35m,\033[0m\n'
printf ' \033[0;33m123\033[0m'
printf '\033[1;35m,\033[0m\n'
printf ' \033[0;30mnull\033[0m\n'
printf '\033[1;35m]\033[0m\n'
} > $d/expect
cmp $d/color $d/expect

Expand All @@ -480,25 +535,25 @@ cmp $d/color $d/expect
# on stderr.
set -vx
echo 'Failed to set $JQ_COLORS' > $d/expect_warning
$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/expect
$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/expect
JQ_COLORS='garbage;30:*;31:,;3^:0;$%:0;34:1;35:1;36' \
$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
cmp $d/color $d/expect
cmp $d/warning $d/expect_warning
JQ_COLORS='1234567890123456789;30:0;31:0;32:0;33:0;34:1;35:1;36' \
$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
cmp $d/color $d/expect
cmp $d/warning $d/expect_warning
JQ_COLORS='1;31234567890123456789:0;31:0;32:0;33:0;34:1;35:1;36' \
$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
cmp $d/color $d/expect
cmp $d/warning $d/expect_warning
JQ_COLORS='1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456' \
$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
cmp $d/color $d/expect
cmp $d/warning $d/expect_warning
JQ_COLORS="0123456789123:0123456789123:0123456789123:0123456789123:0123456789123:0123456789123:0123456789123:0123456789123:" \
$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
cmp $d/color $d/expect
cmp $d/warning $d/expect_warning

Expand Down