Backport GH-487

Keep child components when joining text components

Fixes KyoriPowered/adventure-text-minimessage#181

Test with children at different positions in the component

Add a link to the compaction issue

Co-authored-by: Riley Park <[email protected]>
Use TextComponentImpl directly instead of the factory method

Author: 2 people

api/src/main/java/net/kyori/adventure/text/ComponentCompaction.java

@@ -106,7 +106,7 @@ static Component compact(final @NotNull Component self, final @Nullable Style pa
       final Style childStyle = child.style().merge(childParentStyle, Style.Merge.Strategy.IF_ABSENT_ON_TARGET);
       final Style neighborStyle = neighbor.style().merge(childParentStyle, Style.Merge.Strategy.IF_ABSENT_ON_TARGET);
 
-      if (child instanceof TextComponent && neighbor instanceof TextComponent && childStyle.equals(neighborStyle)) {
+      if (child.children().isEmpty() && child instanceof TextComponent && neighbor instanceof TextComponent && childStyle.equals(neighborStyle)) {
         final Component combined = joinText((TextComponent) child, (TextComponent) neighbor);
 
         // replace the child and its neighbor with the single, combined component
@@ -167,6 +167,6 @@ static Component compact(final @NotNull Component self, final @Nullable Style pa
   }
 
   private static TextComponent joinText(final TextComponent one, final TextComponent two) {
-    return Component.text(one.content() + two.content(), one.style());
+    return new TextComponentImpl(two.children(), one.style(), one.content() + two.content());
   }
 }

api/src/test/java/net/kyori/adventure/text/ComponentCompactingTest.java

@@ -289,4 +289,28 @@ void testStyleMatchingGrandchild() {
 
     assertEquals(expectedCompact, notCompact.compact());
   }
+
+  // https://github.com/KyoriPowered/adventure-text-minimessage/issues/181
+  @Test
+  void testJoinTextWithChildren() {
+    final Component expectedCompact = text().append(
+      text('2', NamedTextColor.AQUA),
+      text().content("-").append(
+        text('3', NamedTextColor.BLUE),
+        text('4', NamedTextColor.DARK_BLUE)
+      ),
+      text("end")
+    ).build();
+    final Component notCompact = text().append(
+      text('2', NamedTextColor.AQUA),
+      text('-'),
+      text().append(
+        text('3', NamedTextColor.BLUE),
+        text('4', NamedTextColor.DARK_BLUE)
+      ),
+      text("end")
+    ).build();
+
+    assertEquals(expectedCompact, notCompact.compact());
+  }
 }