Merge pull request #1012 from KyoriPowered/fix/mm-single-quote

minimessage: Fix exception with single quote as tag part
KyoriPowered · Dec 19, 2023 · 87fc5dc · 87fc5dc
2 parents ee89b80 + 3e0b4eb
commit 87fc5dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/...sage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagPart.java b/...sage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagPart.java
@@ -106,6 +106,11 @@ public TagPart(
       endIndex--;
     }
 
+    if (startIndex > endIndex) {
+      // We were given only a single quote that doesn't terminate, we can't unescape it
+      return text.substring(start, end);
+    }
+
     return TokenParser.unescape(text, startIndex, endIndex, i -> i == firstChar || i == TokenParser.ESCAPE);
   }
 

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
@@ -544,4 +544,13 @@ public boolean has(final @NotNull String name) {
 
     this.assertParsedEquals(expected, input, alwaysMatchingResolver);
   }
+
+  // https://github.com/KyoriPowered/adventure/issues/1011
+  @Test
+  void testNonTerminatingQuoteArgument() {
+    final String input = "<hover:show_text_:\">";
+    final Component expected = Component.text(input);
+
+    this.assertParsedEquals(expected, input);
+  }
 }