Fix several additional formatting bugs (#8627)

Author: APickledWalrus

src/main/java/ch/njol/skript/log/LogEntry.java

@@ -147,8 +147,8 @@ public String toFormattedString() {
 
 		return
 			String.format(lineInfoMsg, node.getLine(), c.getFileName()) +
-			String.format(detailsMsg, TextComponentParser.instance().escape(message.replaceAll("§", "&"))) + from +
-			String.format(lineDetailsMsg, TextComponentParser.instance().escape(node.save().trim().replaceAll("§", "&")));
+			String.format(detailsMsg, TextComponentParser.instance().escape(message)) + from +
+			String.format(lineDetailsMsg, TextComponentParser.instance().escape(node.save().trim()));
 	}
 
 	private String replaceNewline(String s) {

src/main/java/org/skriptlang/skript/bukkit/text/TextComponentParser.java

@@ -1,5 +1,6 @@
 package org.skriptlang.skript.bukkit.text;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.util.coll.CollectionUtils;
 import net.kyori.adventure.text.Component;
@@ -121,13 +122,13 @@ public TextReplacementConfig textReplacementConfig() {
 	 * A pattern for matching double hashtag hex color tags ({@code <##123456>}).
 	 * It also matches all preceding backslashes to determine whether the supposed tag is escaped.
 	 */
-	private static final Pattern LEGACY_DOUBLE_HASHTAG_PATTERN = Pattern.compile("(\\\\*)<(##[a-f0-9]{6})>");
+	private static final Pattern LEGACY_DOUBLE_HASHTAG_PATTERN = Pattern.compile("(\\\\*)<(##[a-fA-F0-9]{6})>");
 
 	/**
 	 * A pattern for matching legacy hex codes ({@code &x&1&2&3&4&5&6}).
 	 * It also matches all preceding backslashes to determine whether the supposed tag is escaped.
 	 */
-	static final Pattern LEGACY_CODE_PATTERN = Pattern.compile("(\\\\*)([&§][a-f0-9klomnr])");
+	static final Pattern LEGACY_CODE_PATTERN = Pattern.compile("(\\\\*)([&§][a-fA-F0-9kKlLoOmMnNrR])");
 
 	static {
 		INSTANCE = new TextComponentParser();
@@ -436,7 +437,14 @@ private Component parse(Object message, boolean safe) {
 		realMessage = reformatText(realMessage);
 
 		// parse as component
-		Component component = safe ? safeParser.deserialize(realMessage) : parser.deserialize(realMessage);
+		Component component;
+		try {
+			component = safe ? safeParser.deserialize(realMessage) : parser.deserialize(realMessage);
+		} catch (ParsingException e) {
+			Skript.exception(e, "An error occurred while trying to parse formatting for '" + realMessage + "'." +
+				" This is likely caused by the presence of legacy formatting characters (such as '§') that Skript could not handle.");
+			return Component.text(message instanceof String ? (String) message : Classes.toString(message));
+		}
 
 		// replace links based on configuration setting
 		if (linkParseMode != LinkParseMode.DISABLED) {
@@ -492,10 +500,12 @@ public String escape(String string) {
 		// legacy compatibility, escape color codes
 		if (string.contains("&") || string.contains("§")) {
 			string = LEGACY_CODE_PATTERN.matcher(string).replaceAll(result -> {
+				// Even if escaped, MiniMessage will throw an exception for legacy section codes
+				String group = result.group().replace('§', '&');
 				if (result.group(1).length() % 2 == 1) { // tag is already escaped
-					return Matcher.quoteReplacement(result.group());
+					return Matcher.quoteReplacement(group);
 				}
-				return Matcher.quoteReplacement('\\' + result.group());
+				return Matcher.quoteReplacement('\\' + group);
 			});
 		}
 		string = LEGACY_DOUBLE_HASHTAG_PATTERN.matcher(string).replaceAll(result -> {

src/main/java/org/skriptlang/skript/bukkit/text/TextComponentUtils.java

@@ -77,7 +77,7 @@ private static Component appendToLastChild(Component base, Component appendee) {
 	 * A pattern for matching standard legacy codes ({@code &1}).
 	 * It also matches all preceding backslashes to determine whether the supposed tag is escaped.
 	 */
-	private static final Pattern LEGACY_HEX_PATTERN = Pattern.compile("[&§]x(?:[&§][a-f0-9]){6}");
+	private static final Pattern LEGACY_HEX_PATTERN = Pattern.compile("[&§]x(?:[&§][a-fA-F0-9]){6}");
 
 	/**
 	 * Replaces all legacy formatting codes in a string with {@link net.kyori.adventure.text.minimessage.MiniMessage} equivalents.
@@ -93,7 +93,7 @@ public static String replaceLegacyFormattingCodes(String text) {
 			String hex = result.group();
 			StringBuilder replacement = new StringBuilder();
 			replacement.append("<#");
-			for (int i = 3; i <= 13; i += 2) { // isolate the specific numbers
+			for (int i = 3; i <= 13; i += 2) { // isolate the specific numbers/letters
 				replacement.append(hex.charAt(i));
 			}
 			replacement.append('>');
@@ -108,7 +108,7 @@ public static String replaceLegacyFormattingCodes(String text) {
 				backslashes = backslashes.substring(1);
 			}
 			StringBuilder replacement = new StringBuilder(backslashes);
-			ChatColor color = ChatColor.getByChar(result.group(2).charAt(1));
+			ChatColor color = ChatColor.getByChar(Character.toLowerCase(result.group(2).charAt(1)));
 			assert color != null;
 			replacement.append('<').append(color.asBungee().getName()).append('>');
 			return Matcher.quoteReplacement(replacement.toString());

src/main/java/org/skriptlang/skript/bukkit/text/TextModule.java

@@ -36,7 +36,7 @@ public void initSelf(SkriptAddon addon) {
 		Comparators.registerComparator(Component.class, String.class, (component, string) -> {
 			TextComponentParser parser = TextComponentParser.instance();
 			String string1 = parser.toString(component);
-			String string2 = parser.toString(parser.parseSafe(string));
+			String string2 = parser.toString(parser.parse(string));
 			return Comparators.compare(string1, string2);
 		});
 		Comparators.registerComparator(Component.class, Component.class, (component1, component2) -> {

src/main/java/org/skriptlang/skript/bukkit/text/types/TextComponentClassInfo.java

@@ -11,7 +11,6 @@
 import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
 import org.jetbrains.annotations.ApiStatus;
 import org.skriptlang.skript.addon.SkriptAddon;
-import org.skriptlang.skript.bukkit.text.TextComponentParser;
 import org.skriptlang.skript.lang.properties.Property;
 import org.skriptlang.skript.lang.properties.handlers.ContainsHandler;
 
@@ -33,19 +32,7 @@ public TextComponentClassInfo(SkriptAddon addon) {
 			.property(Property.CONTAINS,
 				"Components can contain other components.",
 				addon,
-				new ContainsHandler<Component, Component>() {
-					@Override
-					public boolean contains(Component container, Component element) {
-						var parser = org.skriptlang.skript.bukkit.text.TextComponentParser.instance();
-						return StringUtils.contains(parser.toString(container), parser.toString(element), SkriptConfig.caseSensitive.value());
-					}
-
-					@Override
-					public Class<? extends Component>[] elementTypes() {
-						//noinspection unchecked
-						return new Class[]{Component.class};
-					}
-				}
+				new TextComponentContainsHandler()
 			);
 	}
 
@@ -96,4 +83,27 @@ protected boolean canBeInstantiated() {
 
 	}
 
+	private static final class TextComponentContainsHandler implements ContainsHandler<Component, Object> {
+
+		@Override
+		public boolean contains(Component container, Object element) {
+			var parser = org.skriptlang.skript.bukkit.text.TextComponentParser.instance();
+			String haystack = parser.toString(container);
+			String needle;
+			if (element instanceof Component component) {
+				needle = parser.toString(component);
+			} else { // String
+				needle = parser.toString(parser.parse(element));
+			}
+			return StringUtils.contains(haystack, needle, SkriptConfig.caseSensitive.value());
+		}
+
+		@Override
+		public Class<? extends Component>[] elementTypes() {
+			//noinspection unchecked
+			return new Class[]{Component.class, String.class};
+		}
+
+	}
+
 }

src/test/java/org/skriptlang/skript/bukkit/text/TextComponentParserTest.java

@@ -65,6 +65,8 @@ public void testLegacy() {
 		for (ChatColor color : ChatColor.values()) {
 			String message = "&" + color.getChar() + "hello";
 			assertEquals(LegacyComponentSerializer.legacyAmpersand().deserialize(message), parser.parse(message));
+			message = "&" + Character.toUpperCase(color.getChar()) + "hello";
+			assertEquals(LegacyComponentSerializer.legacyAmpersand().deserialize(message), parser.parse(message));
 		}
 	}
 
@@ -80,6 +82,10 @@ public void testLegacyDoubleHashtag() {
 		TextComponentParser parser = new TextComponentParser();
 		assertEquals(parser.parse("<#123456>hello"), parser.parse("<##123456>hello"));
 		assertEquals("\\<##123456>hello", parser.escape("<##123456>hello"));
+		// test letters in tag
+		assertEquals(parser.parse("<#ffff11>hello"), parser.parse("<#ffff11>hello"));
+		assertEquals(parser.parse("<#FFFF11>hello"), parser.parse("<##FFFF11>hello"));
+		assertEquals(parser.parse("<#ffff11>hello"), parser.parse("<##FFFF11>hello"));
 	}
 
 }

src/test/java/org/skriptlang/skript/bukkit/text/TextComponentUtilsTest.java

@@ -17,6 +17,7 @@ public void testReplaceLegacyFormattingCodes() {
 		assertEquals("\\\\&cHello!", replaceLegacyFormattingCodes("\\\\\\&cHello!"));
 		assertEquals("<#123456>Hello!", replaceLegacyFormattingCodes("&x&1&2&3&4&5&6Hello!"));
 		assertEquals("<#123456><red>Hello!", replaceLegacyFormattingCodes("&x&1&2&3&4&5&6&cHello!"));
+		assertEquals("<#FFFF11>Hello!", replaceLegacyFormattingCodes("&x&F&F&F&F&1&1Hello!"));
 		// validate internal metacharacter escaping
 		assertEquals("<red>You have $10", replaceLegacyFormattingCodes("&cYou have $10"));
 	}