Skip to content

Interpret precision as display width #4443

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.

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

Merged
merged 10 commits into from
May 25, 2025
42 changes: 40 additions & 2 deletions include/fmt/format.h
Original file line number Diff line number Diff line change
Expand Up @@ -2110,13 +2110,51 @@ FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value,
return write_int<Char>(out, make_write_int_arg(value, specs.sign()), specs);
}

FMT_INLINE auto count_code_points_with_display_width_precision(
string_view s, size_t display_width_precision) -> size_t {
size_t display_width = 0;
size_t code_points = 0;

// Iterate through the string to compute display width
for_each_codepoint(s, [&](uint32_t, string_view sv) {
// Compute the display width of the current code point
size_t cp_width = compute_width(sv);
if (display_width + cp_width > display_width_precision) {
return false; // Stop iteration when display width exceeds precision
}

display_width += cp_width;
code_points++;
return true;
});

return code_points;
}

template <typename Char>
FMT_CONSTEXPR auto handle_precision(
basic_string_view<Char> s, const format_specs& specs,
FMT_ENABLE_IF(std::is_same<Char, char>::value)) -> size_t {
auto code_points = count_code_points_with_display_width_precision(
s, to_unsigned(specs.precision));
return code_point_index(s, code_points);
}

template <typename Char>
FMT_CONSTEXPR auto handle_precision(
basic_string_view<Char> s, const format_specs&,
FMT_ENABLE_IF(!std::is_same<Char, char>::value)) -> size_t {
return code_point_index(s, s.size());
}

template <typename Char, typename OutputIt>
FMT_CONSTEXPR auto write(OutputIt out, basic_string_view<Char> s,
const format_specs& specs) -> OutputIt {
auto data = s.data();
auto size = s.size();
if (specs.precision >= 0 && to_unsigned(specs.precision) < size)
size = code_point_index(s, to_unsigned(specs.precision));
if (specs.precision >= 0 && to_unsigned(specs.precision) < size) {
size = handle_precision(s, specs);
}

bool is_debug = specs.type() == presentation_type::debug;
if (is_debug) {
Expand Down
5 changes: 5 additions & 0 deletions test/format-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// For the license information refer to format.h.

// Check if fmt/format.h compiles with windows.h included before it.
#include <gtest/gtest.h>
#ifdef _WIN32
# include <windows.h>
#endif
Expand Down Expand Up @@ -552,6 +553,10 @@ TEST(format_test, arg_errors) {
format_error, "argument not found");
}

TEST(format_test, display_width_precision) {
EXPECT_EQ(fmt::format("{:.5}", "🐱🐱🐱"), "🐱🐱");
}

template <int N> struct test_format {
template <typename... T>
static auto format(fmt::string_view fmt, const T&... args) -> std::string {
Expand Down