Skip to content

Brought output template text color into line with previous literate theme #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2017
Merged

Brought output template text color into line with previous literate theme #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedDisplayValueFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,21 @@ protected override int VisitSequenceValue(ThemedValueFormatterState state, Seque

var count = 0;

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('[');

var delim = "";
for (var index = 0; index < sequence.Elements.Count; ++index)
{
if (delim.Length != 0)
using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(delim);

delim = ", ";
Visit(state, sequence.Elements[index]);
}

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(']');

return count;
Expand All @@ -81,14 +81,14 @@ protected override int VisitStructureValue(ThemedValueFormatterState state, Stru
state.Output.Write(' ');
}

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('{');

var delim = "";
for (var index = 0; index < structure.Properties.Count; ++index)
{
if (delim.Length != 0)
using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(delim);

delim = ", ";
Expand All @@ -98,13 +98,13 @@ protected override int VisitStructureValue(ThemedValueFormatterState state, Stru
using (ApplyStyle(state.Output, ConsoleThemeStyle.Name, ref count))
state.Output.Write(property.Name);

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('=');

count += Visit(state.Nest(), property.Value);
}

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('}');

return count;
Expand All @@ -114,31 +114,31 @@ protected override int VisitDictionaryValue(ThemedValueFormatterState state, Dic
{
var count = 0;

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('{');

var delim = "";
foreach (var element in dictionary.Elements)
{
if (delim.Length != 0)
using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(delim);

delim = ", ";

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('[');

using (ApplyStyle(state.Output, ConsoleThemeStyle.String, ref count))
count += Visit(state.Nest(), element.Key);

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write("]=");

count += Visit(state.Nest(), element.Value);
}

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('}');

return count;
Expand Down
26 changes: 13 additions & 13 deletions src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedJsonValueFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@ protected override int VisitSequenceValue(ThemedValueFormatterState state, Seque

var count = 0;

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('[');

var delim = "";
for (var index = 0; index < sequence.Elements.Count; ++index)
{
if (delim.Length != 0)
using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(delim);

delim = ", ";
Visit(state, sequence.Elements[index]);
}

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(']');

return count;
Expand All @@ -76,14 +76,14 @@ protected override int VisitStructureValue(ThemedValueFormatterState state, Stru
{
var count = 0;

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('{');

var delim = "";
for (var index = 0; index < structure.Properties.Count; ++index)
{
if (delim.Length != 0)
using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(delim);

delim = ", ";
Expand All @@ -93,27 +93,27 @@ protected override int VisitStructureValue(ThemedValueFormatterState state, Stru
using (ApplyStyle(state.Output, ConsoleThemeStyle.Name, ref count))
JsonValueFormatter.WriteQuotedJsonString(property.Name, state.Output);

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(": ");

count += Visit(state, property.Value);
}
if (structure.TypeTag != null)
{
using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(delim);

using (ApplyStyle(state.Output, ConsoleThemeStyle.Name, ref count))
JsonValueFormatter.WriteQuotedJsonString("$type", state.Output);

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(": ");

using (ApplyStyle(state.Output, ConsoleThemeStyle.String, ref count))
JsonValueFormatter.WriteQuotedJsonString(structure.TypeTag, state.Output);
}

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('}');

return count;
Expand All @@ -123,28 +123,28 @@ protected override int VisitDictionaryValue(ThemedValueFormatterState state, Dic
{
int count = 0;

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('{');

var delim = "";
foreach (var element in dictionary.Elements)
{
if (delim.Length != 0)
using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(delim);

delim = ", ";

using (ApplyStyle(state.Output, ConsoleThemeStyle.String, ref count))
JsonValueFormatter.WriteQuotedJsonString((element.Key.Value ?? "null").ToString(), state.Output);

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write(": ");

count += Visit(state, element.Value);
}

using (ApplyStyle(state.Output, ConsoleThemeStyle.Punctuation, ref count))
using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
state.Output.Write('}');

return count;
Expand Down
2 changes: 1 addition & 1 deletion src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/TextTokenRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public TextTokenRenderer(ConsoleTheme theme, string text)
public override void Render(LogEvent logEvent, TextWriter output)
{
var _ = 0;
using (_theme.Apply(output, ConsoleThemeStyle.SecondaryText, ref _))
using (_theme.Apply(output, ConsoleThemeStyle.TertiaryText, ref _))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is the actual change; the other diff points are caused by the enum item rename.

output.Write(_text);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Serilog.Sinks.Console/Sinks/SystemConsole/Themes/AnsiConsoleThemes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ static class AnsiConsoleThemes
{
[ConsoleThemeStyle.Text] = "\x1b[37;1m",
[ConsoleThemeStyle.SecondaryText] = "\x1b[37m",
[ConsoleThemeStyle.Punctuation] = "\x1b[30;1m",
[ConsoleThemeStyle.TertiaryText] = "\x1b[30;1m",
[ConsoleThemeStyle.Invalid] = "\x1b[33;1m",
[ConsoleThemeStyle.Null] = "\x1b[34;1m",
[ConsoleThemeStyle.Name] = "\x1b[37m",
Expand All @@ -44,7 +44,7 @@ static class AnsiConsoleThemes
{
[ConsoleThemeStyle.Text] = "\x1b[37;1m",
[ConsoleThemeStyle.SecondaryText] = "\x1b[37m",
[ConsoleThemeStyle.Punctuation] = "\x1b[30;1m",
[ConsoleThemeStyle.TertiaryText] = "\x1b[30;1m",
[ConsoleThemeStyle.Invalid] = "\x1b[37;1m\x1b[47m",
[ConsoleThemeStyle.Null] = "\x1b[1m\x1b[37;1m",
[ConsoleThemeStyle.Name] = "\x1b[37m",
Expand All @@ -65,7 +65,7 @@ static class AnsiConsoleThemes
{
[ConsoleThemeStyle.Text] = "\x1b[38;5;0253m",
[ConsoleThemeStyle.SecondaryText] = "\x1b[38;5;0246m",
[ConsoleThemeStyle.Punctuation] = "\x1b[38;5;0253m",
[ConsoleThemeStyle.TertiaryText] = "\x1b[38;5;0253m",
[ConsoleThemeStyle.Invalid] = "\x1b[33;1m",
[ConsoleThemeStyle.Null] = "\x1b[38;5;0038m",
[ConsoleThemeStyle.Name] = "\x1b[38;5;0081m",
Expand Down
5 changes: 3 additions & 2 deletions src/Serilog.Sinks.Console/Sinks/SystemConsole/Themes/ConsoleThemeStyle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ public enum ConsoleThemeStyle
SecondaryText,

/// <summary>
/// Punctuation used when writing structured data.
/// De-emphasized text, for example literal text in output templates and
/// punctuation used when writing structured data.
/// </summary>
Punctuation,
TertiaryText,

/// <summary>
/// Output demonstrating some kind of configuration issue, e.g. an invalid
Expand Down
4 changes: 2 additions & 2 deletions src/Serilog.Sinks.Console/Sinks/SystemConsole/Themes/SystemConsoleThemes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static class SystemConsoleThemes
{
[ConsoleThemeStyle.Text] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
[ConsoleThemeStyle.SecondaryText] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Gray },
[ConsoleThemeStyle.Punctuation] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.DarkGray },
[ConsoleThemeStyle.TertiaryText] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.DarkGray },
[ConsoleThemeStyle.Invalid] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Yellow },
[ConsoleThemeStyle.Null] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Blue },
[ConsoleThemeStyle.Name] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Gray },
Expand All @@ -45,7 +45,7 @@ static class SystemConsoleThemes
{
[ConsoleThemeStyle.Text] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
[ConsoleThemeStyle.SecondaryText] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Gray },
[ConsoleThemeStyle.Punctuation] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.DarkGray },
[ConsoleThemeStyle.TertiaryText] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.DarkGray },
[ConsoleThemeStyle.Invalid] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White, Background = ConsoleColor.DarkGray},
[ConsoleThemeStyle.Null] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
[ConsoleThemeStyle.Name] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Gray },
Expand Down