Move functions around so it makes more sense, rebase

Author: h3xds1nz

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Knowncolors.cs

@@ -226,26 +226,6 @@ public static SolidColorBrush SolidColorBrushFromUint(uint argb)
 
             return scp;
         }
-
-        /// <summary>
-        /// Matches the input string against known color formats.
-        /// </summary>
-        /// <param name="colorString">The color string to categorize.</param>
-        /// <returns>A <see cref="ColorKind"/> specifying the input string format.</returns>
-        /// <remarks><see cref="ColorKind.KnownColor"/> is used as a fallback value.</remarks>
-        internal static ColorKind MatchColor(ReadOnlySpan<char> colorString)
-        {
-            if ((colorString.Length is 4 or 5 or 7 or 9) && (colorString[0] == '#'))
-                return ColorKind.NumericColor;
-
-            if (colorString.StartsWith("sc#", StringComparison.Ordinal))
-                return ColorKind.ScRgbColor;
-
-            if (colorString.StartsWith(Parsers.ContextColor, StringComparison.OrdinalIgnoreCase))
-                return ColorKind.ContextColor;
-
-            return ColorKind.KnownColor;
-        }
 #endif
 
         /// <summary>

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Parsers.cs

@@ -11,6 +11,11 @@ namespace MS.Internal;
 /// </summary>
 internal static partial class Parsers
 {
+    /// <summary>
+    /// The prefix for any <see cref="ColorKind.ContextColor"/> format.
+    /// </summary>
+    private const string ContextColor = "ContextColor ";
+
     /// <summary>
     /// Map from an ASCII char to its hex value, e.g. arr['b'] == 11. 0xFF means it's not a hex digit.
     /// </summary>
@@ -83,75 +88,24 @@ private static Color ParseHexColor(ReadOnlySpan<char> trimmedColor)
         return Color.FromArgb((byte)a, (byte)r, (byte)g, (byte)b);
     }
 
-    internal const string ContextColor = "ContextColor ";
-
-    private static Color ParseContextColor(ReadOnlySpan<char> trimmedColor, IFormatProvider formatProvider, ITypeDescriptorContext context)
-    {
-        if (!trimmedColor.StartsWith(ContextColor, StringComparison.OrdinalIgnoreCase))
-            throw new FormatException(SR.Parsers_IllegalToken);
-
-        // Skip "ContextColor " prefix
-        ReadOnlySpan<char> tokens = trimmedColor.Slice(ContextColor.Length).Trim();
-
-        // Check whether the format is at least e.g. "file://profile.icc 1.0"
-        Span<Range> splitSegments = stackalloc Range[4];
-
-        if (tokens.Split(splitSegments, ' ') < 2)
-            throw new FormatException(SR.Parsers_IllegalToken);
-
-        // Retrieve "file://profile.icc" part
-        string profileString = tokens[splitSegments[0]].ToString();
-        // Skip "file://profile.icc" part
-        ReadOnlySpan<char> colorPart = tokens.Slice(profileString.Length);
-
-        // Retrieve alpha value
-        ValueTokenizerHelper tokenizer = new(colorPart, formatProvider);
-        float alpha = float.Parse(tokenizer.NextTokenRequired(), formatProvider);
-
-        // While we do not support colors with more than 8 channels, the underlying initialization code will take care of it,
-        // so here we just silently count the color values and let it throw NotImplementedException in the color translation code-path.
-        int numTokens = colorPart.Count(',');
-        Span<float> values = stackalloc float[numTokens];
-
-        for (int i = 0; i < values.Length; i++)
-            values[i] = float.Parse(tokenizer.NextTokenRequired(), formatProvider);
-
-        UriHolder uriHolder = TypeConverterHelper.GetUriFromUriContext(context, profileString);
-        Uri profileUri = uriHolder.BaseUri is not null ? new Uri(uriHolder.BaseUri, uriHolder.OriginalUri) : uriHolder.OriginalUri;
-
-        // If the number of color values found does not match the number of channels in the profile, FromAValues will throw
-        return Color.FromAValues(alpha, values, profileUri);
-    }
-
-    private static Color ParseScRgbColor(ReadOnlySpan<char> trimmedColor, IFormatProvider formatProvider)
+    /// <summary>
+    /// Matches the input string against known color formats.
+    /// </summary>
+    /// <param name="colorString">The color string to categorize.</param>
+    /// <returns>A <see cref="ColorKind"/> specifying the input string format.</returns>
+    /// <remarks><see cref="ColorKind.KnownColor"/> is used as a fallback value.</remarks>
+    private static ColorKind MatchColor(ReadOnlySpan<char> colorString)
     {
-        if (!trimmedColor.StartsWith("sc#", StringComparison.Ordinal))
-            throw new FormatException(SR.Parsers_IllegalToken);
+        if ((colorString.Length is 4 or 5 or 7 or 9) && (colorString[0] == '#'))
+            return ColorKind.NumericColor;
 
-        // Skip prefix (sc#)
-        ReadOnlySpan<char> tokens = trimmedColor.Slice(3);
+        if (colorString.StartsWith("sc#", StringComparison.Ordinal))
+            return ColorKind.ScRgbColor;
 
-        // The tokenizer helper will tokenize a list based on the IFormatProvider.
-        ValueTokenizerHelper tokenizer = new(tokens, formatProvider);
-        Span<float> values = stackalloc float[4];
+        if (colorString.StartsWith(ContextColor, StringComparison.OrdinalIgnoreCase))
+            return ColorKind.ContextColor;
 
-        for (int i = 0; i < 3; i++)
-            values[i] = float.Parse(tokenizer.NextTokenRequired(), formatProvider);
-
-        if (tokenizer.NextToken())
-        {
-            values[3] = float.Parse(tokenizer.GetCurrentToken(), formatProvider);
-
-            // We should be out of tokens at this point
-            if (tokenizer.NextToken())
-            {
-                throw new FormatException(SR.Parsers_IllegalToken);
-            }
-
-            return Color.FromScRgb(values[0], values[1], values[2], values[3]);
-        }
-
-        return Color.FromScRgb(1.0f, values[0], values[1], values[2]);
+        return ColorKind.KnownColor;
     }
 
     /// <summary>
@@ -173,7 +127,7 @@ internal static Color ParseColor(string color, IFormatProvider formatProvider)
     internal static Color ParseColor(string color, IFormatProvider formatProvider, ITypeDescriptorContext context)
     {
         ReadOnlySpan<char> trimmedColor = color.AsSpan().Trim();
-        ColorKind colorKind = KnownColors.MatchColor(trimmedColor);
+        ColorKind colorKind = MatchColor(trimmedColor);
 
         // Check that our assumption stays true
         Debug.Assert(colorKind is ColorKind.NumericColor or ColorKind.ContextColor or ColorKind.ScRgbColor or ColorKind.KnownColor);
@@ -193,18 +147,16 @@ internal static Color ParseColor(string color, IFormatProvider formatProvider, I
     }
 
     /// <summary>
-    /// ParseBrush
-    /// <param name="brush"> string with brush description </param>
-    /// <param name="formatProvider">IFormatProvider for processing string</param>
-    /// <param name="context">ITypeDescriptorContext</param>
+    /// Parses a brush from the <paramref name="brush"/> string. This is in essence same as <see cref="ParseColor"/>,
+    /// but instead of getting a <see cref="Color"/> out, you get a <see cref="SolidColorBrush"/> instance.
     /// </summary>
     internal static Brush ParseBrush(string brush, IFormatProvider formatProvider, ITypeDescriptorContext context)
     {
         ReadOnlySpan<char> trimmedColor = brush.AsSpan().Trim();
         if (trimmedColor.IsEmpty)
             throw new FormatException(SR.Parser_Empty);
 
-        ColorKind colorKind = KnownColors.MatchColor(trimmedColor);
+        ColorKind colorKind = MatchColor(trimmedColor);
 
         // Check that our assumption stays true
         Debug.Assert(colorKind is ColorKind.NumericColor or ColorKind.ContextColor or ColorKind.ScRgbColor or ColorKind.KnownColor);
@@ -227,6 +179,74 @@ internal static Brush ParseBrush(string brush, IFormatProvider formatProvider, I
         return solidColorBrush is not null ? solidColorBrush : throw new FormatException(SR.Parsers_IllegalToken);
     }
 
+    private static Color ParseContextColor(ReadOnlySpan<char> trimmedColor, IFormatProvider formatProvider, ITypeDescriptorContext context)
+    {
+        if (!trimmedColor.StartsWith(ContextColor, StringComparison.OrdinalIgnoreCase))
+            throw new FormatException(SR.Parsers_IllegalToken);
+
+        // Skip "ContextColor " prefix
+        ReadOnlySpan<char> tokens = trimmedColor.Slice(ContextColor.Length).Trim();
+
+        // Check whether the format is at least e.g. "file://profile.icc 1.0"
+        Span<Range> splitSegments = stackalloc Range[4];
+
+        if (tokens.Split(splitSegments, ' ') < 2)
+            throw new FormatException(SR.Parsers_IllegalToken);
+
+        // Retrieve "file://profile.icc" part
+        string profileString = tokens[splitSegments[0]].ToString();
+        // Skip "file://profile.icc" part
+        ReadOnlySpan<char> colorPart = tokens.Slice(profileString.Length);
+
+        // Retrieve alpha value
+        ValueTokenizerHelper tokenizer = new(colorPart, formatProvider);
+        float alpha = float.Parse(tokenizer.NextTokenRequired(), formatProvider);
+
+        // While we do not support colors with more than 8 channels, the underlying initialization code will take care of it,
+        // so here we just silently count the color values and let it throw NotImplementedException in the color translation code-path.
+        int numTokens = colorPart.Count(',');
+        Span<float> values = stackalloc float[numTokens];
+
+        for (int i = 0; i < values.Length; i++)
+            values[i] = float.Parse(tokenizer.NextTokenRequired(), formatProvider);
+
+        UriHolder uriHolder = TypeConverterHelper.GetUriFromUriContext(context, profileString);
+        Uri profileUri = uriHolder.BaseUri is not null ? new Uri(uriHolder.BaseUri, uriHolder.OriginalUri) : uriHolder.OriginalUri;
+
+        // If the number of color values found does not match the number of channels in the profile, FromAValues will throw
+        return Color.FromAValues(alpha, values, profileUri);
+    }
+
+    private static Color ParseScRgbColor(ReadOnlySpan<char> trimmedColor, IFormatProvider formatProvider)
+    {
+        if (!trimmedColor.StartsWith("sc#", StringComparison.Ordinal))
+            throw new FormatException(SR.Parsers_IllegalToken);
+
+        // Skip prefix (sc#)
+        ReadOnlySpan<char> tokens = trimmedColor.Slice(3);
+
+        // The tokenizer helper will tokenize a list based on the IFormatProvider.
+        ValueTokenizerHelper tokenizer = new(tokens, formatProvider);
+        Span<float> values = stackalloc float[4];
+
+        for (int i = 0; i < 3; i++)
+            values[i] = float.Parse(tokenizer.NextTokenRequired(), formatProvider);
+
+        if (tokenizer.NextToken())
+        {
+            values[3] = float.Parse(tokenizer.GetCurrentToken(), formatProvider);
+
+            // We should be out of tokens at this point
+            if (tokenizer.NextToken())
+            {
+                throw new FormatException(SR.Parsers_IllegalToken);
+            }
+
+            return Color.FromScRgb(values[0], values[1], values[2], values[3]);
+        }
+
+        return Color.FromScRgb(1.0f, values[0], values[1], values[2]);
+    }
 
     /// <summary>
     /// ParseTransform - parse a Transform from a string