Skip to content

Add support for ICustomFormatter through the user-supplied format provider #133

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add support for ICustomFormatter through the user-supplied format provider #133

Show file tree
Hide file tree
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
8 changes: 2 additions & 6 deletions src/Serilog.Expressions/Templates/Compilation/CompiledFormattedExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,11 @@ void EvaluateUnaligned(EvaluationContext ctx, TextWriter output, IFormatProvider
return; // Null is empty

using var style = _secondaryText.Set(output, ref invisibleCharacterCount);

if (scalar.Value is IFormattable fmt)
output.Write(fmt.ToString(_format, formatProvider));
else
output.Write(scalar.Value.ToString());
scalar.Render(output, null, formatProvider);
}
else
{
invisibleCharacterCount += _jsonFormatter.Format(value, output);
}
}
}
}
75 changes: 22 additions & 53 deletions src/Serilog.Expressions/Templates/Compilation/CompiledMessageToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,26 @@ void EvaluateUnaligned(EvaluationContext ctx, TextWriter output, ref int invisib
switch (token)
{
case TextToken tt:
{
using var _ = _text.Set(output, ref invisibleCharacterCount);
output.Write(tt.Text);
break;
}
{
using var _ = _text.Set(output, ref invisibleCharacterCount);
output.Write(tt.Text);
break;
}
case PropertyToken pt:
{
EvaluateProperty(ctx.LogEvent.Properties, pt, output, ref invisibleCharacterCount);
break;
}
{
EvaluateProperty(ctx.LogEvent.Properties, pt, output, ref invisibleCharacterCount);
break;
}
default:
{
output.Write(token);
break;
}
{
output.Write(token);
break;
}
}
}
}

void EvaluateProperty(IReadOnlyDictionary<string,LogEventPropertyValue> properties, PropertyToken pt, TextWriter output, ref int invisibleCharacterCount)
void EvaluateProperty(IReadOnlyDictionary<string, LogEventPropertyValue> properties, PropertyToken pt, TextWriter output, ref int invisibleCharacterCount)
{
if (!properties.TryGetValue(pt.PropertyName, out var value))
{
Expand Down Expand Up @@ -136,45 +136,14 @@ void EvaluatePropertyUnaligned(LogEventPropertyValue propertyValue, TextWriter o
return;
}

if (value is ValueType)
var effectiveStyle = value switch
{
if (value is int or uint or long or ulong or decimal or byte or sbyte or short or ushort)
{
using (_num.Set(output, ref invisibleCharacterCount))
output.Write(((IFormattable)value).ToString(format, _formatProvider));
return;
}

if (value is double d)
{
using (_num.Set(output, ref invisibleCharacterCount))
output.Write(d.ToString(format, _formatProvider));
return;
}

if (value is float f)
{
using (_num.Set(output, ref invisibleCharacterCount))
output.Write(f.ToString(format, _formatProvider));
return;
}

if (value is bool b)
{
using (_bool.Set(output, ref invisibleCharacterCount))
output.Write(b);
return;
}
}

if (value is IFormattable formattable)
{
using (_scalar.Set(output, ref invisibleCharacterCount))
output.Write(formattable.ToString(format, _formatProvider));
return;
}
bool _ => _bool,
ValueType _ => _num,
_ => _scalar
};

using (_scalar.Set(output, ref invisibleCharacterCount))
output.Write(value);
using (effectiveStyle.Set(output, ref invisibleCharacterCount))
scalar.Render(output, format, _formatProvider);
}
}
}