From e4b47efd3f192b1c38b05b13bb856545b6dff7dd Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Tue, 7 Apr 2020 23:08:48 +0200
Subject: [PATCH] Fix case when the second section goes further when combining

And added a test for it
---
 pom.xml                                         |  2 +-
 .../formatter/formatting/ChatFormatter.java     | 17 ++++++++++-------
 .../chat/components/formatter/ChatFormatIT.java |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7b4fe91..fce3fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
         <dependency>
             <groupId>com.palmergames.bukkit.towny</groupId>
             <artifactId>Towny</artifactId>
-            <version>0.95.2.0</version>
+            <version>0.96.1.0</version>
             <scope>provided</scope>
         </dependency>
 		<!-- <dependency> <groupId>au.com.mineauz</groupId> <artifactId>Minigames</artifactId> 
diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java
index bee0798..2426b16 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java
@@ -120,22 +120,25 @@ public final class ChatFormatter {
 				sortSections(sections);
 				continue;
 			} else if (firstSection.End >= lastSection.Start && firstSection.Start <= lastSection.End) {
-				int firstSectEnd = firstSection.End;
-				firstSection.End = lastSection.Start - 1;
-				int lastSectEnd = lastSection.End;
-				FormattedSection section = new FormattedSection(firstSection.Settings, lastSection.Start, lastSectEnd,
+				int middleStart = lastSection.Start;
+				// |----|--    |------|
+				// --|----|    -|----|-
+				int middleEnd = Math.min(lastSection.End, firstSection.End);
+				int lastSectEnd = Math.max(lastSection.End, firstSection.End);
+				FormattedSection section = new FormattedSection(firstSection.Settings, middleStart, middleEnd,
 					firstSection.Matches);
 				section.Settings.copyFrom(lastSection.Settings);
 				section.Matches.addAll(lastSection.Matches);
 				sections.add(i, section);
 
-				if (firstSectEnd > lastSection.End) { //Copy first section info to last as the lastSection initially cuts the firstSection in half
+				if (firstSection.End > lastSection.End) { //Copy first section info to last as the lastSection initially cuts the firstSection in half
 					lastSection.Settings = FormatSettings.builder().build();
 					lastSection.Settings.copyFrom(firstSection.Settings);
 				}
 
-				lastSection.Start = lastSectEnd + 1;
-				lastSection.End = firstSectEnd;
+				firstSection.End = middleStart - 1;
+				lastSection.Start = middleEnd + 1;
+				lastSection.End = lastSectEnd;
 
 				Predicate<FormattedSection> removeIfNeeded = s -> {
 					if (s.Start < 0 || s.End < 0 || s.Start > s.End) {
diff --git a/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java b/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java
index 7d2d250..18c1873 100644
--- a/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java
+++ b/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java
@@ -85,6 +85,8 @@ public class ChatFormatIT {
 			space, new TellrawPart("rainbow").setColor(Color.Gold), space, new TellrawPart("text").setColor(Color.Yellow),
 			space, new TellrawPart("for").setColor(Color.Green), space, new TellrawPart("testing.").setColor(Color.Blue),
 			space, new TellrawPart("O").setColor(Color.DarkPurple)).setRainbowMode());
+		list.add(new ChatFormatIT(sender, "***test*** test", new TellrawPart("test").setColor(Color.White)
+			.setItalic(true).setBold(true), new TellrawPart(" test").setColor(Color.White)));
 
 		return list;
 	}