Skip to content

Fix UTF-8 character width calculation in AppendFormatInternal (bytes … #146

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.

Sign up for GitHub

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

Closed
Molth wants to merge 1 commit into from
Closed

Fix UTF-8 character width calculation in AppendFormatInternal (bytes … #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions src/ZString/Utf8ValueStringBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,16 +411,17 @@ private void AppendFormatInternal<T>(T arg, int width, StandardFormat format, st
{
width *= -1;

if (!FormatterCache<T>.TryFormatDelegate(arg, buffer.AsSpan(index), out var charsWritten, format))
if (!FormatterCache<T>.TryFormatDelegate(arg, buffer.AsSpan(index), out var bytesWritten, format))
{
Grow(charsWritten);
if (!FormatterCache<T>.TryFormatDelegate(arg, buffer.AsSpan(index), out charsWritten, format))
Grow(bytesWritten);
if (!FormatterCache<T>.TryFormatDelegate(arg, buffer.AsSpan(index), out bytesWritten, format))
{
ThrowArgumentException(argName);
}
}

index += charsWritten;
var charsWritten = Encoding.UTF8.GetCharCount(buffer.AsSpan(index, bytesWritten));
index += bytesWritten;

int padding = width - charsWritten;
if (width > 0 && padding > 0)
Expand All @@ -445,23 +446,24 @@ private void AppendFormatInternal<T>(T arg, int width, StandardFormat format, st
{
Span<byte> s = stackalloc byte[typeof(T).IsValueType ? Unsafe.SizeOf<T>() * 8 : 1024];

if (!FormatterCache<T>.TryFormatDelegate(arg, s, out var charsWritten, format))
if (!FormatterCache<T>.TryFormatDelegate(arg, s, out var bytesWritten, format))
{
s = stackalloc byte[s.Length * 2];
if (!FormatterCache<T>.TryFormatDelegate(arg, s, out charsWritten, format))
if (!FormatterCache<T>.TryFormatDelegate(arg, s, out bytesWritten, format))
{
ThrowArgumentException(argName);
}
}

var charsWritten = Encoding.UTF8.GetCharCount(s.Slice(0, bytesWritten));
int padding = width - charsWritten;
if (padding > 0)
{
Append(' ', padding); // TODO Fill Method is too slow.
}

s.CopyTo(GetSpan(charsWritten));
Advance(charsWritten);
s.CopyTo(GetSpan(bytesWritten));
Advance(bytesWritten);
}
}
}
Expand Down