AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable printing the reset escape code when no style modifiers where applied. (#973)

Browse Source
This commit is contained in:
Nicolas 2018-12-10 00:57:20 +01:00 committed by Victor Zverovich
parent b0f2224719
commit 24594c747e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/fmt/color.h
View File

@ -438,20 +438,26 @@ template <
typename S, typename Char = typename internal::char_t<S>::type> typename S, typename Char = typename internal::char_t<S>::type>
void vprint(std::FILE *f, const text_style &ts, const S &format, void vprint(std::FILE *f, const text_style &ts, const S &format,
basic_format_args<typename buffer_context<Char>::type> args) { basic_format_args<typename buffer_context<Char>::type> args) {
bool has_style = false;
if (ts.has_emphasis()) { if (ts.has_emphasis()) {
has_style = true;
internal::fputs<Char>( internal::fputs<Char>(
internal::make_emphasis<Char>(ts.get_emphasis()), f); internal::make_emphasis<Char>(ts.get_emphasis()), f);
} }
if (ts.has_foreground()) { if (ts.has_foreground()) {
has_style = true;
internal::fputs<Char>( internal::fputs<Char>(
internal::make_foreground_color<Char>(ts.get_foreground()), f); internal::make_foreground_color<Char>(ts.get_foreground()), f);
} }
if (ts.has_background()) { if (ts.has_background()) {
has_style = true;
internal::fputs<Char>( internal::fputs<Char>(
internal::make_background_color<Char>(ts.get_background()), f); internal::make_background_color<Char>(ts.get_background()), f);
} }
vprint(f, format, args); vprint(f, format, args);
if (has_style) {
internal::reset_color<Char>(f); internal::reset_color<Char>(f);
}
} }
/** /**

1
test/format-impl-test.cc
View File

@ -232,4 +232,5 @@ TEST(ColorsTest, Colors) {
"\x1b[1mbold error\x1b[0m"); "\x1b[1mbold error\x1b[0m");
EXPECT_WRITE(stderr, fmt::print(stderr, fg(fmt::color::blue), "blue log"), EXPECT_WRITE(stderr, fmt::print(stderr, fg(fmt::color::blue), "blue log"),
"\x1b[38;2;000;000;255mblue log\x1b[0m"); "\x1b[38;2;000;000;255mblue log\x1b[0m");
EXPECT_WRITE(stdout, fmt::print(fmt::text_style(), "hi"), "hi");
} }