Report the number of escape characters formatted into themed sequence rendering

nblumhardt · nblumhardt · commit fcecc687716d · 2023-01-14T08:12:22.000+10:00
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedJsonValueFormatter.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedJsonValueFormatter.cs
@@ -70,7 +70,7 @@ protected override int VisitSequenceValue(ThemedValueFormatterState state, Seque
                 }
 
                 delim = ", ";
-                Visit(state.Nest(), sequence.Elements[index]);
+                count += Visit(state.Nest(), sequence.Elements[index]);
             }
 
             using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/ExceptionTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/ExceptionTokenRenderer.cs
@@ -25,7 +25,7 @@ class ExceptionTokenRenderer : OutputTemplateTokenRenderer
 
         readonly ConsoleTheme _theme;
 
-        public ExceptionTokenRenderer(ConsoleTheme theme, PropertyToken pt)
+        public ExceptionTokenRenderer(ConsoleTheme theme)
         {
             _theme = theme;
         }
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/OutputTemplateRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/OutputTemplateRenderer.cs
@@ -52,7 +52,7 @@ public OutputTemplateRenderer(ConsoleTheme theme, string outputTemplate, IFormat
                 }
                 else if (pt.PropertyName == OutputProperties.ExceptionPropertyName)
                 {
-                    renderers.Add(new ExceptionTokenRenderer(theme, pt));
+                    renderers.Add(new ExceptionTokenRenderer(theme));
                 }
                 else if (pt.PropertyName == OutputProperties.MessagePropertyName)
                 {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected override int VisitSequenceValue(ThemedValueFormatterState state, Seque`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`delim = ", ";`
`73`		`- Visit(state.Nest(), sequence.Elements[index]);`
	`73`	`+ count += Visit(state.Nest(), sequence.Elements[index]);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ExceptionTokenRenderer : OutputTemplateTokenRenderer`
`25`	`25`
`26`	`26`	`readonly ConsoleTheme _theme;`
`27`	`27`
`28`		`- public ExceptionTokenRenderer(ConsoleTheme theme, PropertyToken pt)`
	`28`	`+ public ExceptionTokenRenderer(ConsoleTheme theme)`
`29`	`29`	`{`
`30`	`30`	`_theme = theme;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public OutputTemplateRenderer(ConsoleTheme theme, string outputTemplate, IFormat`
`52`	`52`	`}`
`53`	`53`	`else if (pt.PropertyName == OutputProperties.ExceptionPropertyName)`
`54`	`54`	`{`
`55`		`- renderers.Add(new ExceptionTokenRenderer(theme, pt));`
	`55`	`+ renderers.Add(new ExceptionTokenRenderer(theme));`
`56`	`56`	`}`
`57`	`57`	`else if (pt.PropertyName == OutputProperties.MessagePropertyName)`
`58`	`58`	`{`