Rename Style and Appearance

* Renames Style -> Decoration
* Renames Appearance -> Style
* Adds Style.Parse and Style.TryParse

src/Spectre.Console/Internal/Ansi/AnsiBuilder.cs

@@ -7,11 +7,11 @@ namespace Spectre.Console.Internal
         public static string GetAnsi(
             ColorSystem system,
             string text,
-            Styles style,
+            Decoration decoration,
             Color foreground,
             Color background)
         {
-            var codes = AnsiStyleBuilder.GetAnsiCodes(style);
+            var codes = AnsiDecorationBuilder.GetAnsiCodes(decoration);
 
             // Got foreground?
             if (foreground != Color.Default)

src/Spectre.Console/Internal/Ansi/AnsiDecorationBuilder.cs

@@ -2,52 +2,52 @@ using System.Collections.Generic;
 
 namespace Spectre.Console.Internal
 {
-    internal static class AnsiStyleBuilder
+    internal static class AnsiDecorationBuilder
     {
         // TODO: Rewrite this to not yield
-        public static IEnumerable<byte> GetAnsiCodes(Styles style)
+        public static IEnumerable<byte> GetAnsiCodes(Decoration decoration)
         {
-            if ((style & Styles.Bold) != 0)
+            if ((decoration & Decoration.Bold) != 0)
             {
                 yield return 1;
             }
 
-            if ((style & Styles.Dim) != 0)
+            if ((decoration & Decoration.Dim) != 0)
             {
                 yield return 2;
             }
 
-            if ((style & Styles.Italic) != 0)
+            if ((decoration & Decoration.Italic) != 0)
             {
                 yield return 3;
             }
 
-            if ((style & Styles.Underline) != 0)
+            if ((decoration & Decoration.Underline) != 0)
             {
                 yield return 4;
             }
 
-            if ((style & Styles.SlowBlink) != 0)
+            if ((decoration & Decoration.SlowBlink) != 0)
             {
                 yield return 5;
             }
 
-            if ((style & Styles.RapidBlink) != 0)
+            if ((decoration & Decoration.RapidBlink) != 0)
             {
                 yield return 6;
             }
 
-            if ((style & Styles.Invert) != 0)
+            if ((decoration & Decoration.Invert) != 0)
             {
                 yield return 7;
             }
 
-            if ((style & Styles.Conceal) != 0)
+            if ((decoration & Decoration.Conceal) != 0)
             {
                 yield return 8;
             }
 
-            if ((style & Styles.Strikethrough) != 0)
+            if ((decoration & Decoration.Strikethrough) != 0)
             {
                 yield return 9;
             }

src/Spectre.Console/Internal/AnsiConsoleRenderer.cs

@@ -11,7 +11,7 @@ namespace Spectre.Console.Internal
 
         public Capabilities Capabilities { get; }
         public Encoding Encoding { get; }
-        public Styles Style { get; set; }
+        public Decoration Decoration { get; set; }
         public Color Foreground { get; set; }
         public Color Background { get; set; }
 
@@ -50,21 +50,7 @@ namespace Spectre.Console.Internal
             Encoding = @out.IsStandardOut() ? System.Console.OutputEncoding : Encoding.UTF8;
             Foreground = Color.Default;
             Background = Color.Default;
-            Style = Styles.None;
-        }
-
-        public void Reset(bool colors, bool styles)
-        {
-            if (colors)
-            {
-                Foreground = Color.Default;
-                Background = Color.Default;
-            }
-
-            if (styles)
-            {
-                Style = Styles.None;
-            }
+            Decoration = Decoration.None;
         }
 
         public void Write(string text)
@@ -77,7 +63,7 @@ namespace Spectre.Console.Internal
             _out.Write(AnsiBuilder.GetAnsi(
                 _system,
                 text.NormalizeLineEndings(native: true),
-                Style,
+                Decoration,
                 Foreground,
                 Background));
         }

src/Spectre.Console/Internal/ConsoleBuilder.cs

@@ -25,7 +25,7 @@ namespace Spectre.Console.Internal
             {
                 return new AnsiConsoleRenderer(buffer, colorSystem)
                 {
-                    Style = Styles.None,
+                    Decoration = Decoration.None,
                 };
             }
 

src/Spectre.Console/Internal/DecorationTable.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Spectre.Console.Internal
+{
+    internal static class DecorationTable
+    {
+        private static readonly Dictionary<string, Decoration?> _lookup;
+
+        [SuppressMessage("Performance", "CA1810:Initialize reference type static fields inline")]
+        static DecorationTable()
+        {
+            _lookup = new Dictionary<string, Decoration?>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "none", Decoration.None },
+                { "bold", Decoration.Bold },
+                { "dim", Decoration.Dim },
+                { "italic", Decoration.Italic },
+                { "underline", Decoration.Underline },
+                { "invert", Decoration.Invert },
+                { "conceal", Decoration.Conceal },
+                { "slowblink", Decoration.SlowBlink },
+                { "rapidblink", Decoration.RapidBlink },
+                { "strikethrough", Decoration.Strikethrough },
+            };
+        }
+
+        public static Decoration? GetDecoration(string name)
+        {
+            _lookup.TryGetValue(name, out var result);
+            return result;
+        }
+    }
+}

src/Spectre.Console/Internal/Extensions/AppearanceExtensions.cs

@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-
-namespace Spectre.Console.Internal
-{
-    internal static class AppearanceExtensions
-    {
-        public static Appearance Combine(this Appearance appearance, IEnumerable<Appearance> source)
-        {
-            var current = appearance;
-            foreach (var item in source)
-            {
-                current = current.Combine(item);
-            }
-
-            return current;
-        }
-    }
-}

src/Spectre.Console/Internal/Extensions/ConsoleExtensions.cs

@@ -5,18 +5,23 @@ namespace Spectre.Console.Internal
 {
     internal static class ConsoleExtensions
     {
-        public static IDisposable PushAppearance(this IAnsiConsole console, Appearance appearance)
+        public static IDisposable PushStyle(this IAnsiConsole console, Style style)
         {
             if (console is null)
             {
                 throw new ArgumentNullException(nameof(console));
             }
 
-            var current = new Appearance(console.Foreground, console.Background, console.Style);
-            console.SetColor(appearance.Foreground, true);
-            console.SetColor(appearance.Background, false);
-            console.Style = appearance.Style;
-            return new AppearanceScope(console, current);
+            if (style is null)
+            {
+                throw new ArgumentNullException(nameof(style));
+            }
+
+            var current = new Style(console.Foreground, console.Background, console.Decoration);
+            console.SetColor(style.Foreground, true);
+            console.SetColor(style.Background, false);
+            console.Decoration = style.Decoration;
+            return new StyleScope(console, current);
         }
 
         public static IDisposable PushColor(this IAnsiConsole console, Color color, bool foreground)
@@ -31,16 +36,16 @@ namespace Spectre.Console.Internal
             return new ColorScope(console, current, foreground);
         }
 
-        public static IDisposable PushStyle(this IAnsiConsole console, Styles style)
+        public static IDisposable PushDecoration(this IAnsiConsole console, Decoration decoration)
         {
             if (console is null)
             {
                 throw new ArgumentNullException(nameof(console));
             }
 
-            var current = console.Style;
-            console.Style = style;
-            return new StyleScope(console, current);
+            var current = console.Decoration;
+            console.Decoration = decoration;
+            return new DecorationScope(console, current);
         }
 
         public static void SetColor(this IAnsiConsole console, Color color, bool foreground)
@@ -61,30 +66,30 @@ namespace Spectre.Console.Internal
         }
     }
 
-    internal sealed class AppearanceScope : IDisposable
+    internal sealed class StyleScope : IDisposable
     {
         private readonly IAnsiConsole _console;
-        private readonly Appearance _apperance;
+        private readonly Style _style;
 
-        public AppearanceScope(IAnsiConsole console, Appearance appearance)
+        public StyleScope(IAnsiConsole console, Style style)
         {
             _console = console ?? throw new ArgumentNullException(nameof(console));
-            _apperance = appearance;
+            _style = style ?? throw new ArgumentNullException(nameof(style));
         }
 
         [SuppressMessage("Design", "CA1065:Do not raise exceptions in unexpected locations")]
         [SuppressMessage("Performance", "CA1821:Remove empty Finalizers")]
-        ~AppearanceScope()
+        ~StyleScope()
         {
-            throw new InvalidOperationException("Appearance scope was not disposed.");
+            throw new InvalidOperationException("Style scope was not disposed.");
         }
 
         public void Dispose()
         {
             GC.SuppressFinalize(this);
-            _console.SetColor(_apperance.Foreground, true);
-            _console.SetColor(_apperance.Background, false);
-            _console.Style = _apperance.Style;
+            _console.SetColor(_style.Foreground, true);
+            _console.SetColor(_style.Background, false);
+            _console.Decoration = _style.Decoration;
         }
     }
 
@@ -115,28 +120,28 @@ namespace Spectre.Console.Internal
         }
     }
 
-    internal sealed class StyleScope : IDisposable
+    internal sealed class DecorationScope : IDisposable
     {
         private readonly IAnsiConsole _console;
-        private readonly Styles _style;
+        private readonly Decoration _decoration;
 
-        public StyleScope(IAnsiConsole console, Styles color)
+        public DecorationScope(IAnsiConsole console, Decoration decoration)
         {
             _console = console ?? throw new ArgumentNullException(nameof(console));
-            _style = color;
+            _decoration = decoration;
         }
 
         [SuppressMessage("Design", "CA1065:Do not raise exceptions in unexpected locations")]
         [SuppressMessage("Performance", "CA1821:Remove empty Finalizers")]
-        ~StyleScope()
+        ~DecorationScope()
         {
-            throw new InvalidOperationException("Style scope was not disposed.");
+            throw new InvalidOperationException("Decoration scope was not disposed.");
         }
 
         public void Dispose()
         {
             GC.SuppressFinalize(this);
-            _console.Style = _style;
+            _console.Decoration = _decoration;
         }
     }
 }

src/Spectre.Console/Internal/Extensions/StyleExtensions.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+namespace Spectre.Console.Internal
+{
+    internal static class StyleExtensions
+    {
+        public static Style Combine(this Style style, IEnumerable<Style> source)
+        {
+            if (style is null)
+            {
+                throw new ArgumentNullException(nameof(style));
+            }
+
+            if (source is null)
+            {
+                return style;
+            }
+
+            var current = style;
+            foreach (var item in source)
+            {
+                current = current.Combine(item);
+            }
+
+            return current;
+        }
+    }
+}

src/Spectre.Console/Internal/FallbackConsoleRenderer.cs

@@ -44,7 +44,7 @@ namespace Spectre.Console.Internal
             }
         }
 
-        public Styles Style { get; set; }
+        public Decoration Decoration { get; set; }
 
         public Color Foreground
         {

src/Spectre.Console/Internal/StyleTable.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Spectre.Console.Internal
-{
-    internal static class StyleTable
-    {
-        private static readonly Dictionary<string, Styles?> _styles;
-
-        [SuppressMessage("Performance", "CA1810:Initialize reference type static fields inline")]
-        static StyleTable()
-        {
-            _styles = new Dictionary<string, Styles?>(StringComparer.OrdinalIgnoreCase)
-            {
-                { "bold", Styles.Bold },
-                { "dim", Styles.Dim },
-                { "italic", Styles.Italic },
-                { "underline", Styles.Underline },
-                { "invert", Styles.Invert },
-                { "conceal", Styles.Conceal },
-                { "slowblink", Styles.SlowBlink },
-                { "rapidblink", Styles.RapidBlink },
-                { "strikethrough", Styles.Strikethrough },
-            };
-        }
-
-        public static Styles? GetStyle(string name)
-        {
-            _styles.TryGetValue(name, out var style);
-            return style;
-        }
-    }
-}

src/Spectre.Console/Internal/Text/Markup/MarkupParser.cs

@@ -5,14 +5,14 @@ namespace Spectre.Console.Internal
 {
     internal static class MarkupParser
     {
-        public static Text Parse(string text, Appearance appearance = null)
+        public static Text Parse(string text, Style style = null)
         {
-            appearance ??= Appearance.Plain;
+            style ??= Style.Plain;
 
             var result = new Text(string.Empty);
             using var tokenizer = new MarkupTokenizer(text);
 
-            var stack = new Stack<Appearance>();
+            var stack = new Stack<Style>();
 
             while (tokenizer.MoveNext())
             {
@@ -20,8 +20,8 @@ namespace Spectre.Console.Internal
 
                 if (token.Kind == MarkupTokenKind.Open)
                 {
-                    var (style, foreground, background) = MarkupStyleParser.Parse(token.Value);
-                    stack.Push(new Appearance(foreground, background, style));
+                    var parsedStyle = StyleParser.Parse(token.Value);
+                    stack.Push(parsedStyle);
                 }
                 else if (token.Kind == MarkupTokenKind.Close)
                 {
@@ -35,8 +35,8 @@ namespace Spectre.Console.Internal
                 else if (token.Kind == MarkupTokenKind.Text)
                 {
                     // Get the effecive style.
-                    var style = appearance.Combine(stack);
-                    result.Append(token.Value, style);
+                    var effectiveStyle = style.Combine(stack);
+                    result.Append(token.Value, effectiveStyle);
                 }
                 else
                 {

src/Spectre.Console/Internal/Text/Markup/MarkupStyleParser.cs

@@ -1,65 +0,0 @@
-using System;
-
-namespace Spectre.Console.Internal
-{
-    internal static class MarkupStyleParser
-    {
-        public static (Styles? Style, Color? Foreground, Color? Background) Parse(string text)
-        {
-            var effectiveStyle = (Styles?)null;
-            var effectiveForeground = (Color?)null;
-            var effectiveBackground = (Color?)null;
-
-            var parts = text.Split(new[] { ' ' });
-            var foreground = true;
-            foreach (var part in parts)
-            {
-                if (part.Equals("on", StringComparison.OrdinalIgnoreCase))
-                {
-                    foreground = false;
-                    continue;
-                }
-
-                var style = StyleTable.GetStyle(part);
-                if (style != null)
-                {
-                    if (effectiveStyle == null)
-                    {
-                        effectiveStyle = Styles.None;
-                    }
-
-                    effectiveStyle |= style.Value;
-                }
-                else
-                {
-                    var color = ColorTable.GetColor(part);
-                    if (color == null)
-                    {
-                        throw new InvalidOperationException("Could not find color..");
-                    }
-
-                    if (foreground)
-                    {
-                        if (effectiveForeground != null)
-                        {
-                            throw new InvalidOperationException("A foreground has already been set.");
-                        }
-
-                        effectiveForeground = color;
-                    }
-                    else
-                    {
-                        if (effectiveBackground != null)
-                        {
-                            throw new InvalidOperationException("A background has already been set.");
-                        }
-
-                        effectiveBackground = color;
-                    }
-                }
-            }
-
-            return (effectiveStyle, effectiveForeground, effectiveBackground);
-        }
-    }
-}

src/Spectre.Console/Internal/Text/StyleParser.cs

@@ -0,0 +1,104 @@
+using System;
+
+namespace Spectre.Console.Internal
+{
+    internal static class StyleParser
+    {
+        public static Style Parse(string text)
+        {
+            var style = Parse(text, out var error);
+            if (error != null)
+            {
+                throw new InvalidOperationException(error);
+            }
+
+            return style;
+        }
+
+        public static bool TryParse(string text, out Style style)
+        {
+            style = Parse(text, out var error);
+            if (error != null)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private static Style Parse(string text, out string error)
+        {
+            var effectiveDecoration = (Decoration?)null;
+            var effectiveForeground = (Color?)null;
+            var effectiveBackground = (Color?)null;
+
+            var parts = text.Split(new[] { ' ' });
+            var foreground = true;
+            foreach (var part in parts)
+            {
+                if (part.Equals("default", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                if (part.Equals("on", StringComparison.OrdinalIgnoreCase))
+                {
+                    foreground = false;
+                    continue;
+                }
+
+                var decoration = DecorationTable.GetDecoration(part);
+                if (decoration != null)
+                {
+                    if (effectiveDecoration == null)
+                    {
+                        effectiveDecoration = Decoration.None;
+                    }
+
+                    effectiveDecoration |= decoration.Value;
+                }
+                else
+                {
+                    var color = ColorTable.GetColor(part);
+                    if (color == null)
+                    {
+                        if (!foreground)
+                        {
+                            error = $"Could not find color '{part}'.";
+                        }
+                        else
+                        {
+                            error = $"Could not find color or style '{part}'.";
+                        }
+
+                        return null;
+                    }
+
+                    if (foreground)
+                    {
+                        if (effectiveForeground != null)
+                        {
+                            error = "A foreground color has already been set.";
+                            return null;
+                        }
+
+                        effectiveForeground = color;
+                    }
+                    else
+                    {
+                        if (effectiveBackground != null)
+                        {
+                            error = "A background color has already been set.";
+                            return null;
+                        }
+
+                        effectiveBackground = color;
+                    }
+                }
+            }
+
+            error = null;
+            return new Style(effectiveForeground, effectiveBackground, effectiveDecoration);
+        }
+    }
+}