Apply string literal formatting in display mode (#25)

Author: nblumhardt

Build.ps1

@@ -24,7 +24,11 @@ foreach ($src in ls src/*) {
 	echo "build: Packaging project in $src"
 
     & dotnet build -c Release --version-suffix=$buildSuffix
-    & dotnet pack -c Release --include-symbols -o ..\..\artifacts --version-suffix=$suffix --no-build
+    if ($suffix) {
+        & dotnet pack -c Release --include-source -o ..\..\artifacts --version-suffix=$suffix --no-build
+    } else {
+        & dotnet pack -c Release --include-source -o ..\..\artifacts --no-build
+    }
     if($LASTEXITCODE -ne 0) { exit 1 }    
 
     Pop-Location
@@ -41,4 +45,4 @@ foreach ($test in ls test/*.Tests) {
     Pop-Location
 }
 
-Pop-Location
+Pop-Location

src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedDisplayValueFormatter.cs

@@ -159,7 +159,12 @@ public int FormatLiteralValue(ScalarValue scalar, TextWriter output, string form
             if (value is string str)
             {
                 using (ApplyStyle(output, ConsoleThemeStyle.String, ref count))
-                    JsonValueFormatter.WriteQuotedJsonString(str, output);
+                {
+                    if (format != "l")
+                        JsonValueFormatter.WriteQuotedJsonString(str, output);
+                    else
+                        output.Write(str);
+                }
                 return count;
             }
 

test/Serilog.Sinks.Console.Tests/Formatting/ThemedDisplayValueFormatterTests.cs

@@ -0,0 +1,23 @@
+using System.IO;
+using Serilog.Events;
+using Serilog.Sinks.SystemConsole.Formatting;
+using Serilog.Sinks.SystemConsole.Themes;
+using Xunit;
+
+namespace Serilog.Sinks.Console.Tests.Formatting
+{
+    public class ThemedDisplayValueFormatterTests
+    {
+        [Theory]
+        [InlineData("Hello", null, "\"Hello\"")]
+        [InlineData("Hello", "l", "Hello")]
+        public void StringFormattingIsApplied(string s, string format, string expected)
+        {
+            var f = new ThemedDisplayValueFormatter(ConsoleTheme.None, null);
+            var sw = new StringWriter();
+            f.FormatLiteralValue(new ScalarValue(s), sw, format);
+            var actual = sw.ToString();
+            Assert.Equal(expected, actual);
+        }
+    }
+}