🐛 fix styled Text display

Author: RF-Tar-Railt

src/nonebot_plugin_alconna/uniseg/message.py

@@ -615,7 +615,7 @@ def __init__(
             self.__iadd__(Text(message), _merge=False)
         elif isinstance(message, Iterable):
             for i in message:
-                self.__iadd__(Text(i) if isinstance(i, str) else i)
+                self.__iadd__(Text(i) if isinstance(i, str) else i, _merge=False)
         elif isinstance(message, Segment):
             self.__iadd__(message, _merge=False)
         self.__merge_text__()

src/nonebot_plugin_alconna/uniseg/segment.py

@@ -337,11 +337,14 @@ def __str__(self) -> str:
         scales = sorted(styles.keys(), key=lambda x: x[0])
         left = scales[0][0]
         result.append(text[:left])
+        right = scales[0][1]
         for scale in scales:
+            if scale[0] > right:
+                result.append(text[right : scale[0]])
+            right = scale[1]
             prefix = "".join(f"<{style}>" for style in styles[scale])
             suffix = "".join(f"</{style}>" for style in reversed(styles[scale]))
             result.append(prefix + text[scale[0] : scale[1]] + suffix)
-        right = scales[-1][1]
         result.append(text[right:])
         text = "".join(result)
         pat = re.compile(r"</(\w+)(?<!/p)><\1>")
@@ -359,11 +362,15 @@ def __rich__(self):
         scales = sorted(styles.keys(), key=lambda x: x[0])
         left = scales[0][0]
         result.append(text[:left])
+        right = scales[0][1]
         for scale in scales:
+            if scale[0] > right:
+                result.append("\033[0m")
+                result.append(text[right : scale[0]])
+            right = scale[1]
             prefix = ";".join(f"{STYLE_TYPE_MAP[style]}" for style in styles[scale])
             result.append(f"\033[{prefix}m{text[scale[0] : scale[1]]}")
         result.append("\033[0m")
-        right = scales[-1][1]
         result.append(text[right:])
         return "".join(result)
 
@@ -390,10 +397,13 @@ def style_split(self):
         left = scales[0][0]
         if left > 0:
             result.append(Text(text[:left]))
+        right = scales[0][1]
         for scale in scales:
+            if scale[0] > right:
+                result.append(Text(text[right : scale[0]]))
             result.append(Text(text[scale[0] : scale[1]], {(scale[0] - left, scale[1] - left): styles[scale]}))
             left = scale[0]
-        right = scales[-1][1]
+            right = scale[1]
         if right < len(text):
             result.append(Text(text[right:]))
         return result

tests/test_uniseg.py

@@ -43,6 +43,18 @@ def test_uniseg():
     assert pat1.first.validate(Video(url="foobar")(Text("foobar"))).value() == Text("foobar")
     assert pat1.first.validate(Other(FallbackSegment.text("foobar"))(Text("foobar"))).failed
 
+    text2 = (
+        Text("[")
+        + Text("AAA").color("green")
+        + Text(" - ")
+        + Text("BB").color("blue")
+        + Text("]")
+        + Text("\n")
+        + Text("@Mr.Lee").color("yellow")
+        + Text("test")
+    )
+    assert str(text2) == "[<green>AAA</green> - <blue>BB</blue>]\n<yellow>@Mr.Lee</yellow>test"
+
 
 def test_unimsg():
     from nonebot_plugin_alconna.uniseg import FallbackSegment