Fix hex color short code expansion (#1425)

Author: turkoid

CHANGELOG.rst

@@ -12,7 +12,7 @@
 - Add requirement for ``TERM`` environment variable not to be ``"dumb"`` to enable colorization (`#1287 <https://github.com/Delgan/loguru/pull/1287>`_, thanks `@snosov1 <https://github.com/snosov1>`_).
 - Make ``logger.catch()`` usable as an asynchronous context manager (`#1084 <https://github.com/Delgan/loguru/issues/1084>`_).
 - Make ``logger.catch()`` compatible with asynchronous generators (`#1302 <https://github.com/Delgan/loguru/issues/1302>`_).
-
+- Fix hex color short code expansion (`#1426 <https://github.com/Delgan/loguru/issues/1426>`_).
 
 `0.7.3`_ (2024-12-06)
 =====================

loguru/_colorizer.py

@@ -316,7 +316,7 @@ def _get_ansicode(self, tag):
 
         # An alternative syntax for setting the color (e.g. <fg red>, <bg red>).
         if tag.startswith("fg ") or tag.startswith("bg "):
-            st, color = tag[:2], tag[3:]
+            st, color = tag[:2], tag[3:].strip(" ")
             code = "38" if st == "fg" else "48"
 
             if st == "fg" and color.lower() in foreground:
@@ -325,10 +325,15 @@ def _get_ansicode(self, tag):
                 return background[color.upper()]
             if color.isdigit() and int(color) <= 255:
                 return "\033[%s;5;%sm" % (code, color)
-            if re.match(r"#(?:[a-fA-F0-9]{3}){1,2}$", color):
+            if (
+                color.startswith("#")
+                and all(s in "0123456789abcdef" for s in color[1:].lower())
+                and len(color[1:]) in [3, 6]
+            ):
                 hex_color = color[1:]
                 if len(hex_color) == 3:
-                    hex_color *= 2
+                    r, g, b = list(hex_color)
+                    hex_color = (r * 2) + (g * 2) + (b * 2)
                 rgb = tuple(int(hex_color[i : i + 2], 16) for i in (0, 2, 4))
                 return "\033[%s;2;%s;%s;%sm" % ((code, *rgb))
             if color.count(",") == 2:

tests/test_ansimarkup_extended.py

@@ -35,7 +35,7 @@ def test_foreground_colors(text, expected):
     [
         ("<fg #ff0000>1</fg #ff0000>", "\x1b[38;2;255;0;0m" "1" + Style.RESET_ALL),
         ("<bg #00A000>1</bg #00A000>", "\x1b[48;2;0;160;0m" "1" + Style.RESET_ALL),
-        ("<fg #F12>1</fg #F12>", "\x1b[38;2;241;47;18m" "1" + Style.RESET_ALL),
+        ("<fg #F12>1</fg #F12>", "\x1b[38;2;255;17;34m" "1" + Style.RESET_ALL),
     ],
 )
 def test_8bit_colors(text, expected):
@@ -47,14 +47,32 @@ def test_8bit_colors(text, expected):
     [
         ("<fg #ff0000>1</fg #ff0000>", "\x1b[38;2;255;0;0m" "1" + Style.RESET_ALL),
         ("<bg #00A000>1</bg #00A000>", "\x1b[48;2;0;160;0m" "1" + Style.RESET_ALL),
-        ("<fg #F12>1</fg #F12>", "\x1b[38;2;241;47;18m" "1" + Style.RESET_ALL),
-        ("<bg #BEE>1</bg #BEE>", "\x1b[48;2;190;235;238m" "1" + Style.RESET_ALL),
+        ("<fg #F12>1</fg #F12>", "\x1b[38;2;255;17;34m" "1" + Style.RESET_ALL),
+        ("<bg #BEE>1</bg #BEE>", "\x1b[48;2;187;238;238m" "1" + Style.RESET_ALL),
     ],
 )
 def test_hex_colors(text, expected):
     assert parse(text, strip=False) == expected
 
 
+@pytest.mark.parametrize(
+    ("short_code", "long_code"),
+    [
+        ("abc", "aabbcc"),
+        ("f00", "ff0000"),
+        ("f12", "ff1122"),
+        ("bee", "bbeeee"),
+        ("Ace", "AAccee"),
+    ],
+    ids=lambda code: "#" + code,
+)
+@pytest.mark.parametrize("layer", ["fg", "bg"])
+def test_hex_short_code_equals_long_code(layer, short_code, long_code):
+    short_code_colorized = parse("<%s #%s>_</>" % (layer, short_code))
+    long_code_colorized = parse("<%s #%s>_</>" % (layer, long_code))
+    assert short_code_colorized == long_code_colorized
+
+
 @pytest.mark.parametrize(
     ("text", "expected"),
     [