From 6acf9b8c635764d5be944e3c39f10d3335a3fcc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Luthi?= <cedric.luthi@gmail.com>
Date: Wed, 10 May 2023 15:20:12 +0200
Subject: [PATCH] Add an implicit operator to convert from Color to Style
 (#1160)

---
 src/Spectre.Console.Json/JsonText.cs          | 18 ++---
 .../Progress/Columns/ElapsedTimeColumn.cs     |  2 +-
 .../Live/Progress/Columns/PercentageColumn.cs |  2 +-
 .../Progress/Columns/ProgressBarColumn.cs     |  6 +-
 .../Progress/Columns/RemainingTimeColumn.cs   |  2 +-
 .../Live/Progress/Columns/SpinnerColumn.cs    |  2 +-
 src/Spectre.Console/Live/Status/Status.cs     |  2 +-
 .../Prompts/MultiSelectionPrompt.cs           |  2 +-
 .../Prompts/SelectionPrompt.cs                |  4 +-
 src/Spectre.Console/Style.cs                  |  9 +++
 src/Spectre.Console/Widgets/Calendar.cs       |  2 +-
 .../Widgets/Exceptions/ExceptionStyle.cs      | 16 ++--
 src/Spectre.Console/Widgets/ProgressBar.cs    |  6 +-
 .../Widgets/Table/TableRenderer.cs            |  4 +-
 .../Unit/Prompts/TextPromptTests.cs           | 76 +++++++++----------
 test/Spectre.Console.Tests/Unit/StyleTests.cs | 15 +++-
 16 files changed, 95 insertions(+), 73 deletions(-)

diff --git a/src/Spectre.Console.Json/JsonText.cs b/src/Spectre.Console.Json/JsonText.cs
index 21a83da..4d8c825 100644
--- a/src/Spectre.Console.Json/JsonText.cs
+++ b/src/Spectre.Console.Json/JsonText.cs
@@ -89,15 +89,15 @@ public sealed class JsonText : JustInTimeRenderable
 
         var context = new JsonBuilderContext(new JsonTextStyles
         {
-            BracesStyle = BracesStyle ?? new Style(Color.Grey),
-            BracketsStyle = BracketsStyle ?? new Style(Color.Grey),
-            MemberStyle = MemberStyle ?? new Style(Color.Blue),
-            ColonStyle = ColonStyle ?? new Style(Color.Yellow),
-            CommaStyle = CommaStyle ?? new Style(Color.Grey),
-            StringStyle = StringStyle ?? new Style(Color.Red),
-            NumberStyle = NumberStyle ?? new Style(Color.Green),
-            BooleanStyle = BooleanStyle ?? new Style(Color.Green),
-            NullStyle = NullStyle ?? new Style(Color.Grey),
+            BracesStyle = BracesStyle ?? Color.Grey,
+            BracketsStyle = BracketsStyle ?? Color.Grey,
+            MemberStyle = MemberStyle ?? Color.Blue,
+            ColonStyle = ColonStyle ?? Color.Yellow,
+            CommaStyle = CommaStyle ?? Color.Grey,
+            StringStyle = StringStyle ?? Color.Red,
+            NumberStyle = NumberStyle ?? Color.Green,
+            BooleanStyle = BooleanStyle ?? Color.Green,
+            NullStyle = NullStyle ?? Color.Grey,
         });
 
         _syntax.Accept(JsonBuilder.Shared, context);
diff --git a/src/Spectre.Console/Live/Progress/Columns/ElapsedTimeColumn.cs b/src/Spectre.Console/Live/Progress/Columns/ElapsedTimeColumn.cs
index a29fdfb..b6e9a65 100644
--- a/src/Spectre.Console/Live/Progress/Columns/ElapsedTimeColumn.cs
+++ b/src/Spectre.Console/Live/Progress/Columns/ElapsedTimeColumn.cs
@@ -11,7 +11,7 @@ public sealed class ElapsedTimeColumn : ProgressColumn
     /// <summary>
     /// Gets or sets the style of the remaining time text.
     /// </summary>
-    public Style Style { get; set; } = new Style(foreground: Color.Blue);
+    public Style Style { get; set; } = Color.Blue;
 
     /// <inheritdoc/>
     public override IRenderable Render(RenderOptions options, ProgressTask task, TimeSpan deltaTime)
diff --git a/src/Spectre.Console/Live/Progress/Columns/PercentageColumn.cs b/src/Spectre.Console/Live/Progress/Columns/PercentageColumn.cs
index 0dbef1c..617d6c6 100644
--- a/src/Spectre.Console/Live/Progress/Columns/PercentageColumn.cs
+++ b/src/Spectre.Console/Live/Progress/Columns/PercentageColumn.cs
@@ -13,7 +13,7 @@ public sealed class PercentageColumn : ProgressColumn
     /// <summary>
     /// Gets or sets the style for a completed task.
     /// </summary>
-    public Style CompletedStyle { get; set; } = new Style(foreground: Color.Green);
+    public Style CompletedStyle { get; set; } = Color.Green;
 
     /// <inheritdoc/>
     public override IRenderable Render(RenderOptions options, ProgressTask task, TimeSpan deltaTime)
diff --git a/src/Spectre.Console/Live/Progress/Columns/ProgressBarColumn.cs b/src/Spectre.Console/Live/Progress/Columns/ProgressBarColumn.cs
index 16c7c19..5a8dc89 100644
--- a/src/Spectre.Console/Live/Progress/Columns/ProgressBarColumn.cs
+++ b/src/Spectre.Console/Live/Progress/Columns/ProgressBarColumn.cs
@@ -13,17 +13,17 @@ public sealed class ProgressBarColumn : ProgressColumn
     /// <summary>
     /// Gets or sets the style of completed portions of the progress bar.
     /// </summary>
-    public Style CompletedStyle { get; set; } = new Style(foreground: Color.Yellow);
+    public Style CompletedStyle { get; set; } = Color.Yellow;
 
     /// <summary>
     /// Gets or sets the style of a finished progress bar.
     /// </summary>
-    public Style FinishedStyle { get; set; } = new Style(foreground: Color.Green);
+    public Style FinishedStyle { get; set; } = Color.Green;
 
     /// <summary>
     /// Gets or sets the style of remaining portions of the progress bar.
     /// </summary>
-    public Style RemainingStyle { get; set; } = new Style(foreground: Color.Grey);
+    public Style RemainingStyle { get; set; } = Color.Grey;
 
     /// <summary>
     /// Gets or sets the style of an indeterminate progress bar.
diff --git a/src/Spectre.Console/Live/Progress/Columns/RemainingTimeColumn.cs b/src/Spectre.Console/Live/Progress/Columns/RemainingTimeColumn.cs
index 3ce467a..9495877 100644
--- a/src/Spectre.Console/Live/Progress/Columns/RemainingTimeColumn.cs
+++ b/src/Spectre.Console/Live/Progress/Columns/RemainingTimeColumn.cs
@@ -11,7 +11,7 @@ public sealed class RemainingTimeColumn : ProgressColumn
     /// <summary>
     /// Gets or sets the style of the remaining time text.
     /// </summary>
-    public Style Style { get; set; } = new Style(foreground: Color.Blue);
+    public Style Style { get; set; } = Color.Blue;
 
     /// <inheritdoc/>
     public override IRenderable Render(RenderOptions options, ProgressTask task, TimeSpan deltaTime)
diff --git a/src/Spectre.Console/Live/Progress/Columns/SpinnerColumn.cs b/src/Spectre.Console/Live/Progress/Columns/SpinnerColumn.cs
index 425de14..5b23ccd 100644
--- a/src/Spectre.Console/Live/Progress/Columns/SpinnerColumn.cs
+++ b/src/Spectre.Console/Live/Progress/Columns/SpinnerColumn.cs
@@ -74,7 +74,7 @@ public sealed class SpinnerColumn : ProgressColumn
     /// <summary>
     /// Gets or sets the style of the spinner.
     /// </summary>
-    public Style? Style { get; set; } = new Style(foreground: Color.Yellow);
+    public Style? Style { get; set; } = Color.Yellow;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="SpinnerColumn"/> class.
diff --git a/src/Spectre.Console/Live/Status/Status.cs b/src/Spectre.Console/Live/Status/Status.cs
index 59a1115..7e71d85 100644
--- a/src/Spectre.Console/Live/Status/Status.cs
+++ b/src/Spectre.Console/Live/Status/Status.cs
@@ -15,7 +15,7 @@ public sealed class Status
     /// <summary>
     /// Gets or sets the spinner style.
     /// </summary>
-    public Style? SpinnerStyle { get; set; } = new Style(foreground: Color.Yellow);
+    public Style? SpinnerStyle { get; set; } = Color.Yellow;
 
     /// <summary>
     /// Gets or sets a value indicating whether or not status
diff --git a/src/Spectre.Console/Prompts/MultiSelectionPrompt.cs b/src/Spectre.Console/Prompts/MultiSelectionPrompt.cs
index 8c8626b..e1ef43b 100644
--- a/src/Spectre.Console/Prompts/MultiSelectionPrompt.cs
+++ b/src/Spectre.Console/Prompts/MultiSelectionPrompt.cs
@@ -225,7 +225,7 @@ public sealed class MultiSelectionPrompt<T> : IPrompt<List<T>>, IListPromptStrat
     IRenderable IListPromptStrategy<T>.Render(IAnsiConsole console, bool scrollable, int cursorIndex, IEnumerable<(int Index, ListPromptItem<T> Node)> items)
     {
         var list = new List<IRenderable>();
-        var highlightStyle = HighlightStyle ?? new Style(foreground: Color.Blue);
+        var highlightStyle = HighlightStyle ?? Color.Blue;
 
         if (Title != null)
         {
diff --git a/src/Spectre.Console/Prompts/SelectionPrompt.cs b/src/Spectre.Console/Prompts/SelectionPrompt.cs
index 5835c4a..4b9fdbe 100644
--- a/src/Spectre.Console/Prompts/SelectionPrompt.cs
+++ b/src/Spectre.Console/Prompts/SelectionPrompt.cs
@@ -137,8 +137,8 @@ public sealed class SelectionPrompt<T> : IPrompt<T>, IListPromptStrategy<T>
     IRenderable IListPromptStrategy<T>.Render(IAnsiConsole console, bool scrollable, int cursorIndex, IEnumerable<(int Index, ListPromptItem<T> Node)> items)
     {
         var list = new List<IRenderable>();
-        var disabledStyle = DisabledStyle ?? new Style(foreground: Color.Grey);
-        var highlightStyle = HighlightStyle ?? new Style(foreground: Color.Blue);
+        var disabledStyle = DisabledStyle ?? Color.Grey;
+        var highlightStyle = HighlightStyle ?? Color.Blue;
 
         if (Title != null)
         {
diff --git a/src/Spectre.Console/Style.cs b/src/Spectre.Console/Style.cs
index 9ca844e..ec65222 100644
--- a/src/Spectre.Console/Style.cs
+++ b/src/Spectre.Console/Style.cs
@@ -132,6 +132,15 @@ public sealed class Style : IEquatable<Style>
         return Parse(style);
     }
 
+    /// <summary>
+    /// Implicitly converts <see cref="Color"/> into a <see cref="Style"/> with a foreground color.
+    /// </summary>
+    /// <param name="color">The foreground color.</param>
+    public static implicit operator Style(Color color)
+    {
+        return new Style(foreground: color);
+    }
+
     /// <summary>
     /// Converts the string representation of a style to its <see cref="Style"/> equivalent.
     /// </summary>
diff --git a/src/Spectre.Console/Widgets/Calendar.cs b/src/Spectre.Console/Widgets/Calendar.cs
index 6e2bcd9..280e94e 100644
--- a/src/Spectre.Console/Widgets/Calendar.cs
+++ b/src/Spectre.Console/Widgets/Calendar.cs
@@ -153,7 +153,7 @@ public sealed class Calendar : JustInTimeRenderable, IHasCulture, IHasTableBorde
         _useSafeBorder = true;
         _borderStyle = null;
         _culture = CultureInfo.InvariantCulture;
-        _highlightStyle = new Style(foreground: Color.Blue);
+        _highlightStyle = Color.Blue;
         _showHeader = true;
         _calendarEvents = new ListWithCallback<CalendarEvent>(() => MarkAsDirty());
     }
diff --git a/src/Spectre.Console/Widgets/Exceptions/ExceptionStyle.cs b/src/Spectre.Console/Widgets/Exceptions/ExceptionStyle.cs
index c34e62d..78a4ab1 100644
--- a/src/Spectre.Console/Widgets/Exceptions/ExceptionStyle.cs
+++ b/src/Spectre.Console/Widgets/Exceptions/ExceptionStyle.cs
@@ -13,27 +13,27 @@ public sealed class ExceptionStyle
     /// <summary>
     /// Gets or sets the exception color.
     /// </summary>
-    public Style Exception { get; set; } = new Style(Color.White);
+    public Style Exception { get; set; } = Color.White;
 
     /// <summary>
     /// Gets or sets the method color.
     /// </summary>
-    public Style Method { get; set; } = new Style(Color.Yellow);
+    public Style Method { get; set; } = Color.Yellow;
 
     /// <summary>
     /// Gets or sets the parameter type color.
     /// </summary>
-    public Style ParameterType { get; set; } = new Style(Color.Blue);
+    public Style ParameterType { get; set; } = Color.Blue;
 
     /// <summary>
     /// Gets or sets the parameter name color.
     /// </summary>
-    public Style ParameterName { get; set; } = new Style(Color.Silver);
+    public Style ParameterName { get; set; } = Color.Silver;
 
     /// <summary>
     /// Gets or sets the parenthesis color.
     /// </summary>
-    public Style Parenthesis { get; set; } = new Style(Color.Silver);
+    public Style Parenthesis { get; set; } = Color.Silver;
 
     /// <summary>
     /// Gets or sets the path color.
@@ -43,15 +43,15 @@ public sealed class ExceptionStyle
     /// <summary>
     /// Gets or sets the line number color.
     /// </summary>
-    public Style LineNumber { get; set; } = new Style(Color.Blue);
+    public Style LineNumber { get; set; } = Color.Blue;
 
     /// <summary>
     /// Gets or sets the color for dimmed text such as "at" or "in".
     /// </summary>
-    public Style Dimmed { get; set; } = new Style(Color.Grey);
+    public Style Dimmed { get; set; } = Color.Grey;
 
     /// <summary>
     /// Gets or sets the color for non emphasized items.
     /// </summary>
-    public Style NonEmphasized { get; set; } = new Style(Color.Silver);
+    public Style NonEmphasized { get; set; } = Color.Silver;
 }
\ No newline at end of file
diff --git a/src/Spectre.Console/Widgets/ProgressBar.cs b/src/Spectre.Console/Widgets/ProgressBar.cs
index 6b59a42..099e700 100644
--- a/src/Spectre.Console/Widgets/ProgressBar.cs
+++ b/src/Spectre.Console/Widgets/ProgressBar.cs
@@ -16,9 +16,9 @@ internal sealed class ProgressBar : Renderable, IHasCulture
     public bool IsIndeterminate { get; set; }
     public CultureInfo? Culture { get; set; }
 
-    public Style CompletedStyle { get; set; } = new Style(foreground: Color.Yellow);
-    public Style FinishedStyle { get; set; } = new Style(foreground: Color.Green);
-    public Style RemainingStyle { get; set; } = new Style(foreground: Color.Grey);
+    public Style CompletedStyle { get; set; } = Color.Yellow;
+    public Style FinishedStyle { get; set; } = Color.Green;
+    public Style RemainingStyle { get; set; } = Color.Grey;
     public Style IndeterminateStyle { get; set; } = DefaultPulseStyle;
 
     internal static Style DefaultPulseStyle { get; } = new Style(foreground: Color.DodgerBlue1, background: Color.Grey23);
diff --git a/src/Spectre.Console/Widgets/Table/TableRenderer.cs b/src/Spectre.Console/Widgets/Table/TableRenderer.cs
index 467fe61..c6f44df 100644
--- a/src/Spectre.Console/Widgets/Table/TableRenderer.cs
+++ b/src/Spectre.Console/Widgets/Table/TableRenderer.cs
@@ -2,8 +2,8 @@ namespace Spectre.Console;
 
 internal static class TableRenderer
 {
-    private static readonly Style _defaultHeadingStyle = new Style(Color.Silver);
-    private static readonly Style _defaultCaptionStyle = new Style(Color.Grey);
+    private static readonly Style _defaultHeadingStyle = Color.Silver;
+    private static readonly Style _defaultCaptionStyle = Color.Grey;
 
     public static List<Segment> Render(TableRendererContext context, List<int> columnWidths)
     {
diff --git a/test/Spectre.Console.Tests/Unit/Prompts/TextPromptTests.cs b/test/Spectre.Console.Tests/Unit/Prompts/TextPromptTests.cs
index 734a4fd..ad79dc5 100644
--- a/test/Spectre.Console.Tests/Unit/Prompts/TextPromptTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Prompts/TextPromptTests.cs
@@ -247,42 +247,42 @@ public sealed class TextPromptTests
 
         // Then
         return Verifier.Verify(console.Output);
-    }
-
-    [Fact]
-    [Expectation("SecretDefaultValueCustomMask")]
-    public Task Should_Choose_Custom_Masked_Default_Value_If_Nothing_Is_Entered_And_Prompt_Is_Secret_And_Mask_Is_Custom()
-    {
-        // Given
-        var console = new TestConsole();
-        console.Input.PushKey(ConsoleKey.Enter);
-
-        // When
-        console.Prompt(
-            new TextPrompt<string>("Favorite fruit?")
-                .Secret('-')
-                .DefaultValue("Banana"));
-
-        // Then
-        return Verifier.Verify(console.Output);
-    }
-
-    [Fact]
-    [Expectation("SecretDefaultValueNullMask")]
-    public Task Should_Choose_Empty_Masked_Default_Value_If_Nothing_Is_Entered_And_Prompt_Is_Secret_And_Mask_Is_Null()
-    {
-        // Given
-        var console = new TestConsole();
-        console.Input.PushKey(ConsoleKey.Enter);
-
-        // When
-        console.Prompt(
-            new TextPrompt<string>("Favorite fruit?")
-                .Secret(null)
-                .DefaultValue("Banana"));
-
-        // Then
-        return Verifier.Verify(console.Output);
+    }
+
+    [Fact]
+    [Expectation("SecretDefaultValueCustomMask")]
+    public Task Should_Choose_Custom_Masked_Default_Value_If_Nothing_Is_Entered_And_Prompt_Is_Secret_And_Mask_Is_Custom()
+    {
+        // Given
+        var console = new TestConsole();
+        console.Input.PushKey(ConsoleKey.Enter);
+
+        // When
+        console.Prompt(
+            new TextPrompt<string>("Favorite fruit?")
+                .Secret('-')
+                .DefaultValue("Banana"));
+
+        // Then
+        return Verifier.Verify(console.Output);
+    }
+
+    [Fact]
+    [Expectation("SecretDefaultValueNullMask")]
+    public Task Should_Choose_Empty_Masked_Default_Value_If_Nothing_Is_Entered_And_Prompt_Is_Secret_And_Mask_Is_Null()
+    {
+        // Given
+        var console = new TestConsole();
+        console.Input.PushKey(ConsoleKey.Enter);
+
+        // When
+        console.Prompt(
+            new TextPrompt<string>("Favorite fruit?")
+                .Secret(null)
+                .DefaultValue("Banana"));
+
+        // Then
+        return Verifier.Verify(console.Output);
     }
 
     [Fact]
@@ -337,7 +337,7 @@ public sealed class TextPromptTests
         var prompt = new TextPrompt<string>("Enter Value:")
                 .ShowDefaultValue()
                 .DefaultValue("default")
-                .DefaultValueStyle(new Style(foreground: Color.Red));
+                .DefaultValueStyle(Color.Red);
 
         // When
         console.Prompt(prompt);
@@ -384,7 +384,7 @@ public sealed class TextPromptTests
                 .ShowChoices()
                 .AddChoice("Choice 1")
                 .AddChoice("Choice 2")
-                .ChoicesStyle(new Style(foreground: Color.Red));
+                .ChoicesStyle(Color.Red);
 
         // When
         console.Prompt(prompt);
diff --git a/test/Spectre.Console.Tests/Unit/StyleTests.cs b/test/Spectre.Console.Tests/Unit/StyleTests.cs
index e75ce20..b0b4660 100644
--- a/test/Spectre.Console.Tests/Unit/StyleTests.cs
+++ b/test/Spectre.Console.Tests/Unit/StyleTests.cs
@@ -1,7 +1,20 @@
 namespace Spectre.Console.Tests.Unit;
 
 public sealed class StyleTests
-{
+{
+    [Fact]
+    public void Should_Convert_From_Color_As_Expected()
+    {
+        // Given
+        Style style;
+
+        // When
+        style = Color.Red;
+
+        // Then
+        style.Foreground.ShouldBe(Color.Red);
+    }
+
     [Fact]
     public void Should_Combine_Two_Styles_As_Expected()
     {