text-minimessage: Properly handle colour override depth reductions

Fixes #510
KyoriPowered · Dec 14, 2021 · f794e47 · f794e47
1 parent 04e84f1
commit f794e47
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/...a/net/kyori/adventure/text/minimessage/transformation/inbuild/GradientTransformation.java b/...a/net/kyori/adventure/text/minimessage/transformation/inbuild/GradientTransformation.java
@@ -137,7 +137,7 @@ public void visit(final ElementNode curr) {
     } else if (curr instanceof TagNode) {
       final TagNode tag = (TagNode) curr;
       if (tag.transformation() instanceof ComponentTransformation) {
-        // PlaceholderTransformation.apply() returns the value of the component placeholder
+        // ComponentTransformation.apply() returns the value of the component placeholder
         ComponentFlattener.textOnly().flatten(tag.transformation().apply(), s -> this.size += s.codePointCount(0, s.length()));
       }
     }
@@ -159,6 +159,8 @@ public Component apply() {
 
   @Override
   public Component apply(final Component current, final int depth) {
+    if (this.disableApplyingColorDepth >= depth) this.disableApplyingColorDepth = -1;
+
     if ((this.disableApplyingColorDepth != -1 && depth > this.disableApplyingColorDepth) || current.style().color() != null) {
       if (this.disableApplyingColorDepth == -1) {
         this.disableApplyingColorDepth = depth;

diff --git a/...va/net/kyori/adventure/text/minimessage/transformation/inbuild/RainbowTransformation.java b/...va/net/kyori/adventure/text/minimessage/transformation/inbuild/RainbowTransformation.java
@@ -122,6 +122,8 @@ public Component apply() {
 
   @Override
   public Component apply(final Component current, final int depth) {
+    if (this.disableApplyingColorDepth >= depth) this.disableApplyingColorDepth = -1;
+
     if ((this.disableApplyingColorDepth != -1 && depth > this.disableApplyingColorDepth) || current.style().color() != null) {
       if (this.disableApplyingColorDepth == -1) {
         this.disableApplyingColorDepth = depth;

diff --git a/...minimessage/src/test/java/net/kyori/adventure/text/minimessage/MiniMessageParserTest.java b/...minimessage/src/test/java/net/kyori/adventure/text/minimessage/MiniMessageParserTest.java
@@ -29,6 +29,7 @@
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 import net.kyori.adventure.text.minimessage.placeholder.PlaceholderResolver;
@@ -1659,11 +1660,28 @@ void testRepeatedResolvingOfStringPlaceholders() {
 
     final Component expected = text("cat makes a sound", RED);
 
-    assertParsedEquals(
+    this.assertParsedEquals(
       expected,
       input,
       miniMessage("animal", "<red><feline>"),
       component("feline", text("cat"))
     );
   }
+
+  // https://github.com/KyoriPowered/adventure/issues/510
+  @Test
+  void testNestedGradientsDontOverrideColors() {
+    final String input = "<gradient:#1985ff:#2bc7ff>a<gradient:#00fffb:#00ffc3>b</gradient> <gray>gray</gray></gradient>";
+
+    final Component expected = Component.text()
+      .append(
+        text("a", color(0x1985ff)),
+        text("b", color(0x00fffb)),
+        text(" ", color(0x1e98ff)),
+        text("gray", NamedTextColor.GRAY)
+      )
+      .build();
+
+    this.assertParsedEquals(expected, input);
+  }
 }