From cf42bf2bcacfba7ef6766dc85d9c6702b6bfe9b8 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrewdkaster@gmail.com>
Date: Mon, 22 Jul 2024 14:10:16 -0600
Subject: [PATCH] LibGfx: Factor out #rrggbb Color parsing into its own helper
 function

---
 Userland/Libraries/LibGfx/Color.cpp | 102 +++++++++++++++-------------
 1 file changed, 53 insertions(+), 49 deletions(-)

diff --git a/Userland/Libraries/LibGfx/Color.cpp b/Userland/Libraries/LibGfx/Color.cpp
index f4fd91823ce..501fc7a19eb 100644
--- a/Userland/Libraries/LibGfx/Color.cpp
+++ b/Userland/Libraries/LibGfx/Color.cpp
@@ -262,60 +262,64 @@ Optional<Color> Color::from_named_css_color_string(StringView string)
     return {};
 }
 
+static Optional<Color> hex_string_to_color(StringView string)
+{
+    auto hex_nibble_to_u8 = [](char nibble) -> Optional<u8> {
+        if (!isxdigit(nibble))
+            return {};
+        if (nibble >= '0' && nibble <= '9')
+            return nibble - '0';
+        return 10 + (tolower(nibble) - 'a');
+    };
+
+    if (string.length() == 4) {
+        Optional<u8> r = hex_nibble_to_u8(string[1]);
+        Optional<u8> g = hex_nibble_to_u8(string[2]);
+        Optional<u8> b = hex_nibble_to_u8(string[3]);
+        if (!r.has_value() || !g.has_value() || !b.has_value())
+            return {};
+        return Color(r.value() * 17, g.value() * 17, b.value() * 17);
+    }
+
+    if (string.length() == 5) {
+        Optional<u8> r = hex_nibble_to_u8(string[1]);
+        Optional<u8> g = hex_nibble_to_u8(string[2]);
+        Optional<u8> b = hex_nibble_to_u8(string[3]);
+        Optional<u8> a = hex_nibble_to_u8(string[4]);
+        if (!r.has_value() || !g.has_value() || !b.has_value() || !a.has_value())
+            return {};
+        return Color(r.value() * 17, g.value() * 17, b.value() * 17, a.value() * 17);
+    }
+
+    if (string.length() != 7 && string.length() != 9)
+        return {};
+
+    auto to_hex = [&](char c1, char c2) -> Optional<u8> {
+        auto nib1 = hex_nibble_to_u8(c1);
+        auto nib2 = hex_nibble_to_u8(c2);
+        if (!nib1.has_value() || !nib2.has_value())
+            return {};
+        return nib1.value() << 4 | nib2.value();
+    };
+
+    Optional<u8> r = to_hex(string[1], string[2]);
+    Optional<u8> g = to_hex(string[3], string[4]);
+    Optional<u8> b = to_hex(string[5], string[6]);
+    Optional<u8> a = string.length() == 9 ? to_hex(string[7], string[8]) : Optional<u8>(255);
+
+    if (!r.has_value() || !g.has_value() || !b.has_value() || !a.has_value())
+        return {};
+
+    return Color(r.value(), g.value(), b.value(), a.value());
+}
+
 Optional<Color> Color::from_string(StringView string)
 {
     if (string.is_empty())
         return {};
 
-    if (string[0] == '#') {
-        auto hex_nibble_to_u8 = [](char nibble) -> Optional<u8> {
-            if (!isxdigit(nibble))
-                return {};
-            if (nibble >= '0' && nibble <= '9')
-                return nibble - '0';
-            return 10 + (tolower(nibble) - 'a');
-        };
-
-        if (string.length() == 4) {
-            Optional<u8> r = hex_nibble_to_u8(string[1]);
-            Optional<u8> g = hex_nibble_to_u8(string[2]);
-            Optional<u8> b = hex_nibble_to_u8(string[3]);
-            if (!r.has_value() || !g.has_value() || !b.has_value())
-                return {};
-            return Color(r.value() * 17, g.value() * 17, b.value() * 17);
-        }
-
-        if (string.length() == 5) {
-            Optional<u8> r = hex_nibble_to_u8(string[1]);
-            Optional<u8> g = hex_nibble_to_u8(string[2]);
-            Optional<u8> b = hex_nibble_to_u8(string[3]);
-            Optional<u8> a = hex_nibble_to_u8(string[4]);
-            if (!r.has_value() || !g.has_value() || !b.has_value() || !a.has_value())
-                return {};
-            return Color(r.value() * 17, g.value() * 17, b.value() * 17, a.value() * 17);
-        }
-
-        if (string.length() != 7 && string.length() != 9)
-            return {};
-
-        auto to_hex = [&](char c1, char c2) -> Optional<u8> {
-            auto nib1 = hex_nibble_to_u8(c1);
-            auto nib2 = hex_nibble_to_u8(c2);
-            if (!nib1.has_value() || !nib2.has_value())
-                return {};
-            return nib1.value() << 4 | nib2.value();
-        };
-
-        Optional<u8> r = to_hex(string[1], string[2]);
-        Optional<u8> g = to_hex(string[3], string[4]);
-        Optional<u8> b = to_hex(string[5], string[6]);
-        Optional<u8> a = string.length() == 9 ? to_hex(string[7], string[8]) : Optional<u8>(255);
-
-        if (!r.has_value() || !g.has_value() || !b.has_value() || !a.has_value())
-            return {};
-
-        return Color(r.value(), g.value(), b.value(), a.value());
-    }
+    if (string[0] == '#')
+        return hex_string_to_color(string);
 
     if (string.starts_with("rgb("sv, CaseSensitivity::CaseInsensitive) && string.ends_with(')'))
         return parse_rgb_color(string);