@@ -68,37 +68,25 @@ public AnsiConsoleRenderer(IConsole console)
6868 public void Render ( LogLevel level , string format , params object [ ] args )
6969 {
7070 var palette = _palette [ level ] ;
71- var tokens = FormatParser . Parse ( format ) ;
72-
73- var colorize = ! "{0}" . Equals ( format , StringComparison . Ordinal ) ;
71+ var ( tokens , tokenArgs ) = "{0}" . Equals ( format , StringComparison . Ordinal )
72+ ? ( [
73+ new LiteralToken ( string . Format ( format , args ) )
74+ ] ,
75+ [ ] )
76+ : ( FormatParser . Parse ( format ) , args ) ;
7477
7578 foreach ( var token in tokens )
7679 {
77- if ( colorize )
78- {
79- var colorEscapeCode = GetColorEscapeCode ( token , palette ) ;
80- var content = token . Render ( args ) ;
80+ var colorEscapeCode = GetColorEscapeCode ( token , palette ) ;
81+ var content = token . Render ( tokenArgs ) ;
8182
82- if ( level > LogLevel . Error )
83- {
84- _console . Write ( "{0}" , $ "{ colorEscapeCode } { content } { ResetEscapeCode } ") ;
85- }
86- else
87- {
88- _console . WriteError ( "{0}" , $ "{ colorEscapeCode } { content } { ResetEscapeCode } ") ;
89- }
83+ if ( level > LogLevel . Error )
84+ {
85+ _console . Write ( "{0}" , $ "{ colorEscapeCode } { content } { ResetEscapeCode } ") ;
9086 }
9187 else
9288 {
93- // Render without colorization.
94- if ( level > LogLevel . Error )
95- {
96- _console . Write ( "{0}" , token . Render ( args ) ) ;
97- }
98- else
99- {
100- _console . WriteError ( "{0}" , token . Render ( args ) ) ;
101- }
89+ _console . WriteError ( "{0}" , $ "{ colorEscapeCode } { content } { ResetEscapeCode } ") ;
10290 }
10391 }
10492
0 commit comments