diff options
| author | Thalia Archibald <thalia@archibald.dev> | 2024-02-07 13:05:23 -0800 |
|---|---|---|
| committer | Nico Williams <nico@cryptonector.com> | 2024-02-08 00:11:54 -0600 |
| commit | 48df9bce0c73bac9d19e33d34f078c1b99647f5e (patch) | |
| tree | 5c50df4de70bf086e146f73c88b739288db05470 | |
| parent | 76853f60465c8582d02695ff733199b9945f3b02 (diff) | |
Clear formatting immediately after colon
| -rw-r--r-- | src/jv_print.c | 5 | ||||
| -rwxr-xr-x | tests/shtest | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/jv_print.c b/src/jv_print.c index 8e68a271..44ff36f3 100644 --- a/src/jv_print.c +++ b/src/jv_print.c @@ -334,8 +334,11 @@ 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); } diff --git a/tests/shtest b/tests/shtest index 1fabbd03..d600d91d 100755 --- a/tests/shtest +++ b/tests/shtest @@ -484,11 +484,11 @@ $JQ -Cn '[{"a":true,"b":false},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[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[1;39m:\033[0m ' printf '\033[0;39mfalse\033[0m\n' printf ' \033[1;39m}\033[0m' printf '\033[1;39m,\033[0m\n' @@ -506,11 +506,11 @@ JQ_COLORS='0;30:0;31:0;32:0;33:0;34:1;35:1;36:1;37' \ 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[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[1;36m:\033[0m ' printf '\033[0;31mfalse\033[0m\n' printf ' \033[1;36m}\033[0m' printf '\033[1;35m,\033[0m\n' |