External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added format_string forwarding tests to color-test, Fixed #3536

Browse Source
This commit is contained in:
Sven Mikael Persson 2023-07-17 21:19:14 -04:00
parent 661b23edeb
commit 52ca3cd096
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/fmt/core.h
View File

@ -536,6 +536,12 @@ constexpr auto to_string_view(const S& s)
-> basic_string_view<typename S::char_type> { -> basic_string_view<typename S::char_type> {
return basic_string_view<typename S::char_type>(s); return basic_string_view<typename S::char_type>(s);
} }
// Catch basic_format_string for any char type.
template <typename S, FMT_ENABLE_IF(!is_compile_string<S>::value)>
constexpr auto to_string_view(const S& s)
-> decltype(s.get()) {
return s.get();
}
void to_string_view(...); void to_string_view(...);
// Specifies whether S is a string type convertible to fmt::basic_string_view. // Specifies whether S is a string type convertible to fmt::basic_string_view.

24
test/color-test.cc
View File

@ -58,6 +58,13 @@ TEST(color_test, format) {
"\x1b[4m\x1b[38;2;000;000;255mbar\x1b[0m"); "\x1b[4m\x1b[38;2;000;000;255mbar\x1b[0m");
} }
TEST(color_test, format_forwarding) {
const fmt::format_string<int,int,int> format_str_int = "rgb(255,20,30){}{}{}";
auto sv = fmt::detail::to_string_view(format_str_int);
EXPECT_EQ(fmt::format(fg(fmt::rgb(255, 20, 30)), format_str_int, 1, 2, 3),
"\x1b[38;2;255;020;030mrgb(255,20,30)123\x1b[0m");
}
TEST(color_test, format_to) { TEST(color_test, format_to) {
auto out = std::string(); auto out = std::string();
fmt::format_to(std::back_inserter(out), fg(fmt::rgb(255, 20, 30)), fmt::format_to(std::back_inserter(out), fg(fmt::rgb(255, 20, 30)),
@ -66,7 +73,24 @@ TEST(color_test, format_to) {
"\x1b[38;2;255;020;030mrgb(255,20,30)123\x1b[0m"); "\x1b[38;2;255;020;030mrgb(255,20,30)123\x1b[0m");
} }
TEST(color_test, format_to_forwarding) {
auto out = std::string();
const fmt::format_string<int,int,int> format_str_int = "rgb(255,20,30){}{}{}";
fmt::format_to(std::back_inserter(out), fg(fmt::rgb(255, 20, 30)),
format_str_int, 1, 2, 3);
EXPECT_EQ(fmt::to_string(out),
"\x1b[38;2;255;020;030mrgb(255,20,30)123\x1b[0m");
}
TEST(color_test, print) { TEST(color_test, print) {
EXPECT_WRITE(stdout, fmt::print(fg(fmt::rgb(255, 20, 30)), "rgb(255,20,30)"), EXPECT_WRITE(stdout, fmt::print(fg(fmt::rgb(255, 20, 30)), "rgb(255,20,30)"),
"\x1b[38;2;255;020;030mrgb(255,20,30)\x1b[0m"); "\x1b[38;2;255;020;030mrgb(255,20,30)\x1b[0m");
} }
TEST(color_test, print_forwarding) {
const fmt::format_string<int,int,int> format_str_int = "rgb(255,20,30){}{}{}";
EXPECT_WRITE(stdout, fmt::print(fg(fmt::rgb(255, 20, 30)), format_str_int, 1, 2, 3),
"\x1b[38;2;255;020;030mrgb(255,20,30)123\x1b[0m");
EXPECT_WRITE(stdout, fmt::print(stdout, fg(fmt::rgb(255, 20, 30)), format_str_int, 1, 2, 3),
"\x1b[38;2;255;020;030mrgb(255,20,30)123\x1b[0m");
}