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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
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 Char* data, const format_specs& specs,
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we need to separately pass data - you can use s instead.

FMT_ENABLE_IF(std::is_same<Char, char>::value)) -> size_t {
auto code_points = count_code_points_with_display_width_precision(
to_string_view(data), to_unsigned(specs.precision));
return code_point_index(s, to_unsigned(code_points));
Copy link
Contributor

Choose a reason for hiding this comment

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

code_points is already unsigned

}

template <typename Char>
FMT_CONSTEXPR auto handle_precision(
basic_string_view<Char> s, const Char*, const format_specs&,
FMT_ENABLE_IF(!std::is_same<Char, char>::value)) -> size_t {
return code_point_index(s, to_unsigned(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, data, specs);
}

bool is_debug = specs.type() == presentation_type::debug;
if (is_debug) {
Expand Down