Skip to content

Commit 5cc2ead

Browse files
committed
Modified for ainsi sixteen
1 parent 61519d4 commit 5cc2ead

File tree

3 files changed

+47
-108
lines changed

3 files changed

+47
-108
lines changed

src/Serilog.Expressions/Templates/Themes/AnsiTemplateThemes.cs

Lines changed: 0 additions & 102 deletions
This file was deleted.

src/Serilog.Expressions/Templates/Themes/TemplateTheme.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ public class TemplateTheme
3434
/// </summary>
3535
public static TemplateTheme Literate { get; } = TemplateThemes.Literate;
3636

37+
/// <summary>
38+
/// A theme in the style of the original <i>Serilog.Sinks.Literate</i> using only standard 16 terminal colors that will work on light backgrounds.
39+
/// </summary>
40+
public static TemplateTheme Sixteen { get; } = TemplateThemes.Sixteen;
41+
3742
internal static TemplateTheme None { get; } = new(new Dictionary<TemplateThemeStyle, string>());
3843

3944
readonly Dictionary<TemplateThemeStyle, Style> _styles;
@@ -46,7 +51,8 @@ public class TemplateTheme
4651
/// <exception cref="ArgumentNullException">When <paramref name="ansiStyles"/> is <code>null</code></exception>
4752
public TemplateTheme(IReadOnlyDictionary<TemplateThemeStyle, string> ansiStyles)
4853
{
49-
if (ansiStyles is null) throw new ArgumentNullException(nameof(ansiStyles));
54+
if (ansiStyles is null)
55+
throw new ArgumentNullException(nameof(ansiStyles));
5056
_styles = ansiStyles.ToDictionary(kv => kv.Key, kv => new Style(kv.Value));
5157
}
5258

@@ -59,8 +65,10 @@ public TemplateTheme(IReadOnlyDictionary<TemplateThemeStyle, string> ansiStyles)
5965
/// <exception cref="ArgumentNullException">When <paramref name="ansiStyles"/> is <code>null</code></exception>
6066
public TemplateTheme(TemplateTheme baseTheme, IReadOnlyDictionary<TemplateThemeStyle, string> ansiStyles)
6167
{
62-
if (baseTheme == null) throw new ArgumentNullException(nameof(baseTheme));
63-
if (ansiStyles is null) throw new ArgumentNullException(nameof(ansiStyles));
68+
if (baseTheme == null)
69+
throw new ArgumentNullException(nameof(baseTheme));
70+
if (ansiStyles is null)
71+
throw new ArgumentNullException(nameof(ansiStyles));
6472
_styles = new(baseTheme._styles);
6573
foreach (var kv in ansiStyles)
6674
_styles[kv.Key] = new(kv.Value);

src/Serilog.Expressions/Templates/Themes/TemplateThemes.cs

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ namespace Serilog.Templates.Themes;
1616

1717
static class TemplateThemes
1818
{
19-
public static TemplateTheme Literate { get; } = new(
19+
public static TemplateTheme Literate
20+
{
21+
get;
22+
} = new(
2023
new Dictionary<TemplateThemeStyle, string>
2124
{
2225
[TemplateThemeStyle.Text] = "\x1b[38;5;0015m",
@@ -37,7 +40,10 @@ static class TemplateThemes
3740
[TemplateThemeStyle.LevelFatal] = "\x1b[38;5;0015m\x1b[48;5;0196m",
3841
});
3942

40-
public static TemplateTheme Grayscale { get; } = new(
43+
public static TemplateTheme Grayscale
44+
{
45+
get;
46+
} = new(
4147
new Dictionary<TemplateThemeStyle, string>
4248
{
4349
[TemplateThemeStyle.Text] = "\x1b[37;1m",
@@ -58,7 +64,10 @@ static class TemplateThemes
5864
[TemplateThemeStyle.LevelFatal] = "\x1b[30m\x1b[47m",
5965
});
6066

61-
public static TemplateTheme Code { get; } = new(
67+
public static TemplateTheme Code
68+
{
69+
get;
70+
} = new(
6271
new Dictionary<TemplateThemeStyle, string>
6372
{
6473
[TemplateThemeStyle.Text] = "\x1b[38;5;0253m",
@@ -78,4 +87,28 @@ static class TemplateThemes
7887
[TemplateThemeStyle.LevelError] = "\x1b[38;5;0197m\x1b[48;5;0238m",
7988
[TemplateThemeStyle.LevelFatal] = "\x1b[38;5;0197m\x1b[48;5;0238m",
8089
});
90+
91+
public static TemplateTheme Sixteen
92+
{
93+
get;
94+
} = new(
95+
new Dictionary<TemplateThemeStyle, string>
96+
{
97+
[TemplateThemeStyle.Text] = string.Empty,
98+
[TemplateThemeStyle.SecondaryText] = string.Empty,
99+
[TemplateThemeStyle.TertiaryText] = string.Empty,
100+
[TemplateThemeStyle.Invalid] = "\x1b[33m",
101+
[TemplateThemeStyle.Null] = "\x1b[34m",
102+
[TemplateThemeStyle.Name] = string.Empty,
103+
[TemplateThemeStyle.String] = "\x1b[36m",
104+
[TemplateThemeStyle.Number] = "\x1b[35m",
105+
[TemplateThemeStyle.Boolean] = "\x1b[34m",
106+
[TemplateThemeStyle.Scalar] = "\x1b[32m",
107+
[TemplateThemeStyle.LevelVerbose] = "\x1b[30;1m",
108+
[TemplateThemeStyle.LevelDebug] = "\x1b[1m",
109+
[TemplateThemeStyle.LevelInformation] = "\x1b[36;1m",
110+
[TemplateThemeStyle.LevelWarning] = "\x1b[33;1m",
111+
[TemplateThemeStyle.LevelError] = "\x1b[31;1m",
112+
[TemplateThemeStyle.LevelFatal] = "\x1b[31;1m",
113+
});
81114
}

0 commit comments

Comments
 (0)