Removes console background color for better compatibility with differ…

…ent console themes (#257)
statiqdev · Dec 22, 2022 · 72b6d70 · 72b6d70
1 parent 79e6f43
commit 72b6d70
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -2,6 +2,7 @@
 
 - Fixed `ElseIf` when `Predicate.RequiresDocument` is false in `ExecuteIf` module (#255, #256, thanks @nils-a).
 - Adds the ability to configure a specific date/time as "current". All code and themes should now use `IExecutionState.GetCurrentDateTime()` instead of `DateTime.Now`, etc.
+- Removes console background color for better compatibility with different console themes (#257).
 
 # 1.0.0-beta.63
 

diff --git a/src/core/Statiq.App/Logging/ConsoleContent.cs b/src/core/Statiq.App/Logging/ConsoleContent.cs
@@ -4,24 +4,20 @@ namespace Statiq.App
 {
     internal struct ConsoleContent
     {
-        public ConsoleContent(ConsoleColor foreground, ConsoleColor background, in ReadOnlyMemory<char> message)
+        public ConsoleContent(ConsoleColor foreground, in ReadOnlyMemory<char> message)
         {
             Foreground = foreground;
-            Background = background;
             Message = message;
         }
 
         public ConsoleContent(in ReadOnlyMemory<char> message)
         {
             Foreground = ConsoleColor.Gray;
-            Background = ConsoleColor.Black;
             Message = message;
         }
 
         public ConsoleColor Foreground { get; }
 
-        public ConsoleColor Background { get; }
-
         public ReadOnlyMemory<char> Message { get; }
     }
-}
+}
diff --git a/src/core/Statiq.App/Logging/ConsoleLogMessage.cs b/src/core/Statiq.App/Logging/ConsoleLogMessage.cs
@@ -53,10 +53,10 @@ public void GetConsoleContent(List<ConsoleContent> consoleContentBuffer)
                 if (lastAngle > 0)
                 {
                     int firstAngle = FormattedMessage.IndexOf('»');
-                    consoleContentBuffer.Add(new ConsoleContent(ConsoleColor.Blue, ConsoleColor.Black, FormattedMessage.AsMemory(0, firstAngle + 1)));
+                    consoleContentBuffer.Add(new ConsoleContent(ConsoleColor.Blue, FormattedMessage.AsMemory(0, firstAngle + 1)));
                     if (firstAngle < lastAngle)
                     {
-                        consoleContentBuffer.Add(new ConsoleContent(ConsoleColor.Cyan, ConsoleColor.Black, FormattedMessage.AsMemory(firstAngle + 1, lastAngle - (firstAngle + 1) + 1)));
+                        consoleContentBuffer.Add(new ConsoleContent(ConsoleColor.Cyan, FormattedMessage.AsMemory(firstAngle + 1, lastAngle - (firstAngle + 1) + 1)));
                     }
                 }
                 else
@@ -68,7 +68,7 @@ public void GetConsoleContent(List<ConsoleContent> consoleContentBuffer)
                 int normalStart = lastAngle + 1;
                 if (CategoryName?.StartsWith(NamespacePrefix) == false)
                 {
-                    consoleContentBuffer.Add(new ConsoleContent(ConsoleColor.DarkGray, ConsoleColor.Black, $"[{CategoryName}] ".AsMemory()));
+                    consoleContentBuffer.Add(new ConsoleContent(ConsoleColor.DarkGray, $"[{CategoryName}] ".AsMemory()));
                     consoleContentBuffer.Add(new ConsoleContent(FormattedMessage.AsMemory(normalStart, FormattedMessage.Length - normalStart)));
                 }
                 else
@@ -123,7 +123,7 @@ public void GetConsoleContent(List<ConsoleContent> consoleContentBuffer)
                 // Add the category
                 if (CategoryName?.StartsWith(NamespacePrefix) == false)
                 {
-                    consoleContentBuffer.Add(new ConsoleContent(ConsoleColor.DarkGray, ConsoleColor.Black, $"[{CategoryName}] ".AsMemory()));
+                    consoleContentBuffer.Add(new ConsoleContent(ConsoleColor.DarkGray, $"[{CategoryName}] ".AsMemory()));
                 }
 
                 // Then add the message
@@ -154,13 +154,13 @@ logLevel switch
         private ConsoleContent GetLogLevelConsoleContent(LogLevel logLevel, in ReadOnlyMemory<char> message) =>
             logLevel switch
             {
-                LogLevel.Critical => new ConsoleContent(ConsoleColor.DarkRed, ConsoleColor.Black, message),
-                LogLevel.Error => new ConsoleContent(ConsoleColor.Red, ConsoleColor.Black, message),
-                LogLevel.Warning => new ConsoleContent(ConsoleColor.Yellow, ConsoleColor.Black, message),
-                LogLevel.Information => new ConsoleContent(ConsoleColor.DarkGreen, ConsoleColor.Black, message),
-                LogLevel.Debug => new ConsoleContent(ConsoleColor.DarkGray, ConsoleColor.Black, message),
-                LogLevel.Trace => new ConsoleContent(ConsoleColor.DarkGray, ConsoleColor.Black, message),
+                LogLevel.Critical => new ConsoleContent(ConsoleColor.DarkRed, message),
+                LogLevel.Error => new ConsoleContent(ConsoleColor.Red, message),
+                LogLevel.Warning => new ConsoleContent(ConsoleColor.Yellow, message),
+                LogLevel.Information => new ConsoleContent(ConsoleColor.DarkGreen, message),
+                LogLevel.Debug => new ConsoleContent(ConsoleColor.DarkGray, message),
+                LogLevel.Trace => new ConsoleContent(ConsoleColor.DarkGray, message),
                 _ => new ConsoleContent(message),
             };
     }
-}
+}
diff --git a/src/core/Statiq.App/Logging/ConsoleLoggerProvider.cs b/src/core/Statiq.App/Logging/ConsoleLoggerProvider.cs
@@ -94,7 +94,6 @@ private void WriteMessage(ConsoleLogMessage message)
                 foreach (ConsoleContent content in ConsoleContentBuffer)
                 {
                     Console.ForegroundColor = content.Foreground;
-                    Console.BackgroundColor = content.Background;
                     Console.Write(content.Message.ToString());
                 }
                 Console.WriteLine();