Implemented excluding, added tests

Added failing tests as well as passing tests

src/main/java/buttondevteam/chat/ChatProcessing.java

@@ -39,7 +39,7 @@ public class ChatProcessing {
     private static final Pattern CONSOLE_PING_PATTERN = Pattern.compile("(?i)" + Pattern.quote("@console"));
     private static final Pattern HASHTAG_PATTERN = Pattern.compile("#(\\w+)");
     private static final Pattern URL_PATTERN = Pattern.compile("(http[\\w:/?=$\\-_.+!*'(),]+)");
-    private static final Pattern ENTIRE_MESSAGE_PATTERN = Pattern.compile(".+");
+    public static final Pattern ENTIRE_MESSAGE_PATTERN = Pattern.compile(".+");
     private static final Pattern UNDERLINED_PATTERN = Pattern.compile("_");
     private static final Pattern ITALIC_PATTERN = Pattern.compile("\\*");
     private static final Pattern BOLD_PATTERN = Pattern.compile("\\*\\*");
@@ -61,7 +61,7 @@ public class ChatProcessing {
                     .build(),
             ChatFormatter.builder().regex(STRIKETHROUGH_PATTERN).strikethrough(true).removeCharCount((short) 2).type(ChatFormatter.Type.Range)
                     .build(),
-            ESCAPE_FORMATTER, ChatFormatter.builder().regex(URL_PATTERN).underlined(true).openlink("$1").build(),
+            ESCAPE_FORMATTER, ChatFormatter.builder().regex(URL_PATTERN).underlined(true).openlink("$1").type(ChatFormatter.Type.Excluder).build(),
             ChatFormatter.builder().regex(NULL_MENTION_PATTERN).color(Color.DarkRed).build(), // Properly added a bug as a feature
             ChatFormatter.builder().regex(CONSOLE_PING_PATTERN).color(Color.Aqua).onmatch((match, builder) -> {
                 if (!pingedconsole) {

src/main/java/buttondevteam/chat/formatting/ChatFormatter.java

@@ -58,14 +58,41 @@ public final class ChatFormatter {
 		/*
 		 * This method assumes that there is always a global formatter
          */
-        header("ChatFormatter.Combine begin"); //TODO: Handle excluder formatters first
+        header("ChatFormatter.Combine begin");
 		ArrayList<FormattedSection> sections = new ArrayList<FormattedSection>();
+
         for (ChatFormatter formatter : formatters) {
+            if (formatter.type != Type.Excluder)
+                continue;
+            Matcher matcher = formatter.regex.matcher(str);
+            while (matcher.find()) {
+                DebugCommand.SendDebugMessage("Found match from " + matcher.start() + " to " + (matcher.end() - 1));
+                DebugCommand.SendDebugMessage("With excluder formatter:" + formatter);
+                sendMessageWithPointer(str, matcher.start(), matcher.end() - 1);
+                ArrayList<String> groups = new ArrayList<String>();
+                for (int i = 0; i < matcher.groupCount(); i++)
+                    groups.add(matcher.group(i + 1));
+                if (groups.size() > 0)
+                    DebugCommand.SendDebugMessage("First group: " + groups.get(0));
+                FormattedSection section = new FormattedSection(formatter, matcher.start(), matcher.end() - 1, groups,
+                        formatter.type);
+                sections.add(section);
+            }
+        }
+
+        header("Section creation (excluders done)");
+		for (ChatFormatter formatter : formatters) {
+            if (formatter.type == Type.Excluder)
+                continue;
 			Matcher matcher = formatter.regex.matcher(str);
 			while (matcher.find()) {
 				DebugCommand.SendDebugMessage("Found match from " + matcher.start() + " to " + (matcher.end() - 1));
 				DebugCommand.SendDebugMessage("With formatter:" + formatter);
 				sendMessageWithPointer(str, matcher.start(), matcher.end() - 1);
+                if (formatter.regex != ChatProcessing.ENTIRE_MESSAGE_PATTERN && sections.stream().anyMatch(fs -> fs.type == Type.Excluder && (fs.End >= matcher.start() && fs.Start <= matcher.end() - 1))) {
+                    DebugCommand.SendDebugMessage("Ignoring formatter because of an excluder");
+                    continue; //Exclude areas matched by excluders - Range sections are correctly handled afterwards
+                }
 				ArrayList<String> groups = new ArrayList<String>();
 				for (int i = 0; i < matcher.groupCount(); i++)
 					groups.add(matcher.group(i + 1));
@@ -272,8 +299,7 @@ public final class ChatFormatter {
 		}
 
 		header("Section applying");
-		for (int i = 0; i < sections.size(); i++) {
+        for (FormattedSection section : sections) {
-			FormattedSection section = sections.get(i);
 			DebugCommand.SendDebugMessage("Applying section: " + section);
 			String originaltext;
 			int start = section.Start, end = section.End;

src/test/java/buttondevteam/chat/ChatFormatIT.java

@@ -50,9 +50,20 @@ public class ChatFormatIT {
         list.add(new ChatFormatIT(sender, "**test*", new TellrawPart("*test").setItalic(true).setColor(Color.White)));
         list.add(new ChatFormatIT(sender, "***test", new TellrawPart("*test").setColor(Color.White)));
         list.add(new ChatFormatIT(sender, "Koiiev", new TellrawPart("§bKoiiev§r").setColor(Color.Aqua)));
-        list.add(new ChatFormatIT(sender, "NorbiPeti", new TellrawPart("§bNorbiPeti§r").setColor(Color.Aqua)));
+		list.add(new ChatFormatIT(sender, "norbipeti", new TellrawPart("§bNorbiPeti§r").setColor(Color.Aqua)));
         list.add(new ChatFormatIT(sender, "Arsen_Derby_FTW", new TellrawPart("§bArsen_Derby_FTW§r").setColor(Color.Aqua)));
 		list.add(new ChatFormatIT(sender, "carrot_lynx", new TellrawPart("§bcarrot_lynx§r").setColor(Color.Aqua)));
+		list.add(new ChatFormatIT(sender, "*carrot_lynx*", new TellrawPart("§bcarrot_lynx§r").setItalic(true).setColor(Color.Aqua)));
+		list.add(new ChatFormatIT(sender, "https://norbipeti.github.io/", new TellrawPart("https://norbipeti.github.io/").setUnderlined(true)
+				.setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT,
+						new TellrawPart("Click to open").setColor(Color.Blue)))
+				.setClickEvent(TellrawEvent.create(ClickAction.OPEN_URL, "https://norbipeti.github.io/"))));
+		list.add(new ChatFormatIT(sender, "*https://norbipeti.github.io/*", new TellrawPart("https://norbipeti.github.io/").setItalic(true).setUnderlined(true)
+				.setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT,
+						new TellrawPart("Click to open").setColor(Color.Blue)))
+				.setClickEvent(TellrawEvent.create(ClickAction.OPEN_URL, "https://norbipeti.github.io/"))));
+		list.add(new ChatFormatIT(sender, "*test _test_ test*", new TellrawPart("test ").setItalic(true).setColor(Color.White),
+				new TellrawPart("test").setItalic(true).setUnderlined(true).setColor(Color.White), new TellrawPart(" test").setItalic(true).setColor(Color.White)));
 
 		return list;
 	}