Skip to content

Commit 9c7fb68

Browse files
vonhoffvonhoff
committed
Cleanup
1 parent 675dbfa commit 9c7fb68

File tree

6 files changed

+59
-44
lines changed

6 files changed

+59
-44
lines changed

‎Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Formatting/DisplayValueFormatter.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,25 @@ private void FormatLiteralValue(ScalarValue scalar, IRtfCanvas canvas, string? f
4747
case null:
4848
Theme.Render(canvas, StyleToken.Null, "null");
4949
return;
50+
5051
case string text:
5152
RenderString(text, canvas, format, isLiteral);
5253
return;
54+
5355
case byte[] bytes:
5456
_stringBuilder.Clear();
5557
_stringBuilder.Append('"').Append(Convert.ToBase64String(bytes)).Append('"');
5658
Theme.Render(canvas, StyleToken.String, _stringBuilder.ToString());
5759
return;
60+
5861
case bool b:
5962
Theme.Render(canvas, StyleToken.Boolean, b.ToString());
6063
return;
64+
6165
case Uri uri:
6266
Theme.Render(canvas, StyleToken.Scalar, uri.ToString());
6367
return;
68+
6469
case IFormattable formattable:
6570
RenderFormattable(canvas, formattable, format);
6671
return;
@@ -91,7 +96,6 @@ private void RenderString(string text, IRtfCanvas canvas, string? format, bool i
9196
}
9297
}
9398

94-
9599
protected override bool VisitDictionaryValue(ValueFormatterState state, DictionaryValue dictionary)
96100
{
97101
if (state.Format.Contains("j"))

‎Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Formatting/JsonValueFormatter.cs‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,19 @@ private void FormatLiteralValue(ScalarValue scalar, IRtfCanvas canvas)
134134
case null:
135135
Theme.Render(canvas, StyleToken.Null, "null");
136136
return;
137+
137138
case string str:
138139
Theme.Render(canvas, StyleToken.String, GetQuotedJsonString(str));
139140
return;
141+
140142
case byte[] bytes:
141143
Theme.Render(canvas, StyleToken.String, GetQuotedJsonString(Convert.ToBase64String(bytes)));
142144
return;
145+
143146
case bool b:
144147
Theme.Render(canvas, StyleToken.Boolean, b ? "true" : "false");
145148
return;
149+
146150
case double d:
147151
if (double.IsNaN(d) || double.IsInfinity(d))
148152
{
@@ -153,6 +157,7 @@ private void FormatLiteralValue(ScalarValue scalar, IRtfCanvas canvas)
153157
Theme.Render(canvas, StyleToken.Number, d.ToString("R", CultureInfo.InvariantCulture));
154158
}
155159
return;
160+
156161
case float f:
157162
if (float.IsNaN(f) || float.IsInfinity(f))
158163
{
@@ -163,6 +168,7 @@ private void FormatLiteralValue(ScalarValue scalar, IRtfCanvas canvas)
163168
Theme.Render(canvas, StyleToken.Number, f.ToString("R", CultureInfo.InvariantCulture));
164169
}
165170
return;
171+
166172
case char:
167173
case DateTime:
168174
case DateTimeOffset:
@@ -179,9 +185,11 @@ private void FormatLiteralValue(ScalarValue scalar, IRtfCanvas canvas)
179185
case DateTime dt:
180186
writer.Write(dt.ToString("O", CultureInfo.InvariantCulture));
181187
break;
188+
182189
case DateTimeOffset dto:
183190
writer.Write(dto.ToString("O", CultureInfo.InvariantCulture));
184191
break;
192+
185193
default:
186194
scalar.Render(writer, null, _formatProvider);
187195
break;
@@ -190,6 +198,7 @@ private void FormatLiteralValue(ScalarValue scalar, IRtfCanvas canvas)
190198

191199
Theme.Render(canvas, StyleToken.Scalar, GetQuotedJsonString(_literalBuilder.ToString()));
192200
return;
201+
193202
default:
194203
if (value is IFormattable formattable)
195204
{
@@ -209,7 +218,6 @@ private void FormatLiteralValue(ScalarValue scalar, IRtfCanvas canvas)
209218
}
210219
}
211220

212-
213221
private static void WriteQuotedJsonString(string str, TextWriter output)
214222
{
215223
output.Write('\"');
@@ -221,25 +229,32 @@ private static void WriteQuotedJsonString(string str, TextWriter output)
221229
case '"':
222230
output.Write("\\\"");
223231
break;
232+
224233
case '\\':
225234
output.Write(@"\\");
226235
break;
236+
227237
case '\n':
228238
output.Write("\\n");
229239
break;
240+
230241
case '\r':
231242
output.Write("\\r");
232243
break;
244+
233245
case '\f':
234246
output.Write("\\f");
235247
break;
248+
236249
case '\t':
237250
output.Write("\\t");
238251
break;
252+
239253
case < (char)32:
240254
output.Write("\\u");
241255
output.Write(((int)c).ToString("X4"));
242256
break;
257+
243258
default:
244259
output.Write(c);
245260
break;

‎Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Rendering/LevelTokenRenderer.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ private static string GetLevelMoniker(LogEventLevel value, string format = "")
105105
{
106106
case < 1:
107107
return string.Empty;
108+
108109
case > 4:
109110
{
110111
var stringValue = value.ToString();

‎Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Rtf/RtfBuilder.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ private void EscapeAndAppend(string value)
134134
case '\\' or '{' or '}':
135135
_body.Append('\\').Append(ch);
136136
break;
137+
137138
case '\n':
138139
_body.Append("\\par\r\n");
139140
break;

‎Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Themes/Style.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ namespace Serilog.Sinks.RichTextBoxForms.Themes
2222
{
2323
public readonly struct Style
2424
{
25-
public Style(Color foreground)
26-
{
27-
Background = Color.Black;
28-
Foreground = foreground;
29-
}
30-
3125
public Style(Color foreground, Color background)
3226
{
3327
Background = background;

‎Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Themes/ThemePresets.cs‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ public static class ThemePresets
2626
new Style(ThemeColors.White, ThemeColors.Black),
2727
new Dictionary<StyleToken, Style>
2828
{
29-
[StyleToken.Text] = new(ThemeColors.White),
30-
[StyleToken.SecondaryText] = new(ThemeColors.Gray),
31-
[StyleToken.TertiaryText] = new(ThemeColors.Gray),
32-
[StyleToken.Invalid] = new(ThemeColors.Yellow),
33-
[StyleToken.Null] = new(ThemeColors.LightBlue),
34-
[StyleToken.Name] = new(ThemeColors.Gray),
35-
[StyleToken.String] = new(ThemeColors.Cyan),
36-
[StyleToken.Number] = new(ThemeColors.Magenta),
37-
[StyleToken.Boolean] = new(ThemeColors.LightBlue),
38-
[StyleToken.Scalar] = new(ThemeColors.Green),
39-
[StyleToken.LevelVerbose] = new(ThemeColors.Gray),
40-
[StyleToken.LevelDebug] = new(ThemeColors.Gray),
41-
[StyleToken.LevelInformation] = new(ThemeColors.White),
42-
[StyleToken.LevelWarning] = new(ThemeColors.Yellow),
29+
[StyleToken.Text] = new(ThemeColors.White, ThemeColors.Black),
30+
[StyleToken.SecondaryText] = new(ThemeColors.Gray, ThemeColors.Black),
31+
[StyleToken.TertiaryText] = new(ThemeColors.Gray, ThemeColors.Black),
32+
[StyleToken.Invalid] = new(ThemeColors.Yellow, ThemeColors.Black),
33+
[StyleToken.Null] = new(ThemeColors.LightBlue, ThemeColors.Black),
34+
[StyleToken.Name] = new(ThemeColors.Gray, ThemeColors.Black),
35+
[StyleToken.String] = new(ThemeColors.Cyan, ThemeColors.Black),
36+
[StyleToken.Number] = new(ThemeColors.Magenta, ThemeColors.Black),
37+
[StyleToken.Boolean] = new(ThemeColors.LightBlue, ThemeColors.Black),
38+
[StyleToken.Scalar] = new(ThemeColors.Green, ThemeColors.Black),
39+
[StyleToken.LevelVerbose] = new(ThemeColors.Gray, ThemeColors.Black),
40+
[StyleToken.LevelDebug] = new(ThemeColors.Gray, ThemeColors.Black),
41+
[StyleToken.LevelInformation] = new(ThemeColors.White, ThemeColors.Black),
42+
[StyleToken.LevelWarning] = new(ThemeColors.Yellow, ThemeColors.Black),
4343
[StyleToken.LevelError] = new(ThemeColors.White, ThemeColors.Red),
4444
[StyleToken.LevelFatal] = new(ThemeColors.White, ThemeColors.Red)
4545
});
@@ -48,19 +48,19 @@ public static class ThemePresets
4848
new Style(ThemeColors.White, ThemeColors.Black),
4949
new Dictionary<StyleToken, Style>
5050
{
51-
[StyleToken.Text] = new(ThemeColors.White),
52-
[StyleToken.SecondaryText] = new(ThemeColors.Gray),
53-
[StyleToken.TertiaryText] = new(ThemeColors.Gray),
51+
[StyleToken.Text] = new(ThemeColors.White, ThemeColors.Black),
52+
[StyleToken.SecondaryText] = new(ThemeColors.Gray, ThemeColors.Black),
53+
[StyleToken.TertiaryText] = new(ThemeColors.Gray, ThemeColors.Black),
5454
[StyleToken.Invalid] = new(ThemeColors.White, ThemeColors.DarkGray),
55-
[StyleToken.Null] = new(ThemeColors.White),
56-
[StyleToken.Name] = new(ThemeColors.Gray),
57-
[StyleToken.String] = new(ThemeColors.White),
58-
[StyleToken.Number] = new(ThemeColors.White),
59-
[StyleToken.Boolean] = new(ThemeColors.White),
60-
[StyleToken.Scalar] = new(ThemeColors.White),
61-
[StyleToken.LevelVerbose] = new(ThemeColors.Gray),
62-
[StyleToken.LevelDebug] = new(ThemeColors.Gray),
63-
[StyleToken.LevelInformation] = new(ThemeColors.White),
55+
[StyleToken.Null] = new(ThemeColors.White, ThemeColors.Black),
56+
[StyleToken.Name] = new(ThemeColors.Gray, ThemeColors.Black),
57+
[StyleToken.String] = new(ThemeColors.White, ThemeColors.Black),
58+
[StyleToken.Number] = new(ThemeColors.White, ThemeColors.Black),
59+
[StyleToken.Boolean] = new(ThemeColors.White, ThemeColors.Black),
60+
[StyleToken.Scalar] = new(ThemeColors.White, ThemeColors.Black),
61+
[StyleToken.LevelVerbose] = new(ThemeColors.Gray, ThemeColors.Black),
62+
[StyleToken.LevelDebug] = new(ThemeColors.Gray, ThemeColors.Black),
63+
[StyleToken.LevelInformation] = new(ThemeColors.White, ThemeColors.Black),
6464
[StyleToken.LevelWarning] = new(ThemeColors.White, ThemeColors.DarkGray),
6565
[StyleToken.LevelError] = new(ThemeColors.Black, ThemeColors.White),
6666
[StyleToken.LevelFatal] = new(ThemeColors.Black, ThemeColors.White)
@@ -70,16 +70,16 @@ public static class ThemePresets
7070
new Style(ThemeColors.Gray, ThemeColors.Black),
7171
new Dictionary<StyleToken, Style>
7272
{
73-
[StyleToken.Text] = new(ThemeColors.Gray),
74-
[StyleToken.SecondaryText] = new(ThemeColors.Gray),
75-
[StyleToken.TertiaryText] = new(ThemeColors.Gray),
76-
[StyleToken.Invalid] = new(ThemeColors.Yellow),
77-
[StyleToken.Null] = new(ThemeColors.White),
78-
[StyleToken.Name] = new(ThemeColors.White),
79-
[StyleToken.String] = new(ThemeColors.White),
80-
[StyleToken.Number] = new(ThemeColors.White),
81-
[StyleToken.Boolean] = new(ThemeColors.White),
82-
[StyleToken.Scalar] = new(ThemeColors.White),
73+
[StyleToken.Text] = new(ThemeColors.Gray, ThemeColors.Black),
74+
[StyleToken.SecondaryText] = new(ThemeColors.Gray, ThemeColors.Black),
75+
[StyleToken.TertiaryText] = new(ThemeColors.Gray, ThemeColors.Black),
76+
[StyleToken.Invalid] = new(ThemeColors.Yellow, ThemeColors.Black),
77+
[StyleToken.Null] = new(ThemeColors.White, ThemeColors.Black),
78+
[StyleToken.Name] = new(ThemeColors.White, ThemeColors.Black),
79+
[StyleToken.String] = new(ThemeColors.White, ThemeColors.Black),
80+
[StyleToken.Number] = new(ThemeColors.White, ThemeColors.Black),
81+
[StyleToken.Boolean] = new(ThemeColors.White, ThemeColors.Black),
82+
[StyleToken.Scalar] = new(ThemeColors.White, ThemeColors.Black),
8383
[StyleToken.LevelVerbose] = new(ThemeColors.Gray, ThemeColors.DarkGray),
8484
[StyleToken.LevelDebug] = new(ThemeColors.White, ThemeColors.DarkGray),
8585
[StyleToken.LevelInformation] = new(ThemeColors.White, ThemeColors.Blue),

0 commit comments

Comments
 (0)