Update the examples a little

Author: nblumhardt

example/Sample/Program.cs

@@ -12,25 +12,22 @@ public static void Main()
         {
             SelfLog.Enable(Console.Error);
 
-            TextFormattingExample();
+            TextFormattingExample1();
             JsonFormattingExample();
             PipelineComponentExample();
+            TextFormattingExample2();
         }
 
-        static void TextFormattingExample()
+        static void TextFormattingExample1()
         {
             using var log = new LoggerConfiguration()
                 .WriteTo.Console(new ExpressionTemplate(
-                    "[{@t:HH:mm:ss} " +
-                    "{@l:u3} " +
-                    "({coalesce(Substring(SourceContext, LastIndexOf(SourceContext, '.') + 1), '<no source>')})] " +
-                    "{@m} " +
-                    "(first item is {coalesce(Items[0], '<empty>')})" +
-                    "\n" +
-                    "{@x}"))
+                    "[{@t:HH:mm:ss} {@l:u3}" +
+                    "{#if SourceContext is not null} ({Substring(SourceContext, LastIndexOf(SourceContext, '.') + 1)}){#end}] " +
+                    "{@m} (first item is {coalesce(Items[0], '<empty>')})\n{@x}"))
                 .CreateLogger();
 
-            log.Information("Running {Example}", nameof(TextFormattingExample));
+            log.Information("Running {Example}", nameof(TextFormattingExample1));
 
             log.ForContext<Program>()
                 .Information("Cart contains {@Items}", new[] { "Tea", "Coffee" });
@@ -75,5 +72,26 @@ static void PipelineComponentExample()
             log.ForContext<Program>()
                 .Information("Cart contains {@Items}", new[] { "Apricots" });
         }
+        
+        static void TextFormattingExample2()
+        {
+            using var log = new LoggerConfiguration()
+                .WriteTo.Console(new ExpressionTemplate(
+                    "{@l:w4}: {SourceContext}\n" +
+                    "{#if Scope is not null}" +
+                    "      {#each s in Scope}=> {s}{#delimit} {#end}\n" +
+                    "{#end}" +
+                    "      {@m}\n" +
+                    "{@x}"))
+                .CreateLogger();
+
+            var program = log.ForContext<Program>();
+            program.Information("Starting up");
+            
+            // Emulate data produced by the Serilog.AspNetCore integration
+            var scoped = program.ForContext("Scope", new[] {"Main", "TextFormattingExample2()"});
+            
+            scoped.Information("Hello, world!");
+        }
     }
 }

src/Serilog.Expressions/Templates/Compilation/NameResolution/TemplateLocalNameResolver.cs

@@ -49,8 +49,8 @@ Template Transform(FormattedExpression fx, Stack<string> locals)
         Template Transform(Conditional cond, Stack<string> locals)
         {
             return new Conditional(
-                cond.Condition,
-                cond.Consequent,
+                ExpressionLocalNameBinder.BindLocalValueNames(cond.Condition, locals),
+                Transform(cond.Consequent, locals),
                 cond.Alternative != null ? Transform(cond.Alternative, locals) : null);
         }