fix some bugs

Author: LukynkaCZE

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "io.github.dockyardmc"
-version = "2.1"
+version = "2.2"
 
 repositories {
     mavenCentral()
@@ -34,6 +34,10 @@ tasks.withType<Test> {
     })
 }
 
+tasks.withType<PublishToMavenRepository> {
+    dependsOn("test")
+}
+
 tasks {
     compileKotlin {
         kotlinOptions.jvmTarget = "21"

src/main/kotlin/io/github/dockyardmc/scroll/Component.kt

@@ -64,13 +64,14 @@ open class Component(
         }
     }
 
-    fun resetFormatting(includingFont: Boolean = true) {
+    fun resetFormatting(includingFont: Boolean) {
         this.color = null
         this.strikethrough = null
         this.underlined = null
         this.font = null
         this.italic = null
         this.bold = null
+
         if(includingFont) {
             this.font = null
             this.hoverEvent = null

src/main/kotlin/io/github/dockyardmc/scroll/Main.kt

@@ -0,0 +1,5 @@
+package io.github.dockyardmc.scroll
+
+fun main() {
+    println("Args: ${ScrollUtil.getArguments("<hover:show_text:'<red><bold><i>bucket o' fish'>")}")
+}

src/main/kotlin/io/github/dockyardmc/scroll/ScrollUtil.kt

@@ -88,15 +88,49 @@ object ScrollUtil {
         return value
     }
 
+    fun getCharacterAfterNew(string: String, currentIndex: Int): Char? {
+        val index = currentIndex + 1
+        val value = if (index >= string.toMutableList().size) null else string[index]
+        return value
+    }
+
     fun getArguments(input: String): List<String> {
-        val pattern = Pattern.compile("<(.*?):(.*)>")
-        val matcher = pattern.matcher(input)
+        val split = mutableListOf<String>()
 
-        return if (matcher.matches()) {
-            matcher.group(2).split(":").map { it.removePrefix("'").removeSuffix("'") }
-        } else {
-            emptyList()
+        var current = ""
+        var isInsideQuotes = false
+
+        val validQuotesEndChars = listOf<Char>('>', ':')
+
+        input.forEachIndexed { index, char ->
+            val nextChar = getCharacterAfterNew(input, index)
+
+            if(char == '\'') {
+                if(!isInsideQuotes) {
+                    isInsideQuotes = true
+                }
+                else if(validQuotesEndChars.contains(nextChar)) {
+                    isInsideQuotes = false
+                } else {
+                    current += char
+                }
+            } else if(char == ':') {
+                if(!isInsideQuotes) {
+                    split.add(current)
+                    current = ""
+                } else {
+                    current += char
+                }
+            } else {
+                current += char
+            }
         }
-    }
 
+        if(current.endsWith(">")) {
+            split.add((if(!isInsideQuotes) current else current.removePrefix("<")).removeSuffix(">"))
+            current = ""
+        }
+
+        return split.subList(1, split.size)
+    }
 }

src/main/kotlin/io/github/dockyardmc/scroll/providers/default/NamedColorProvider.kt

@@ -10,7 +10,7 @@ class NamedColorProvider :
     ClosingNamedFormatProvider("red", ScrollUtil.colorTags.keys.toList().map { it.replaceMultiple(listOf("<", ">"), "") }) {
 
     override fun formatNormal(context: FormatProviderContext, component: Component) {
-        component.resetFormatting()
+        component.resetFormatting(false)
         val color = ScrollUtil.colorTags[context.token] ?: throw IllegalStateException("Invalid legacy text color: ${context.token}")
         component.color = color
     }

src/main/kotlin/io/github/dockyardmc/scroll/providers/default/ResetProvider.kt

@@ -7,6 +7,6 @@ import io.github.dockyardmc.scroll.providers.NamedFormatProvider
 class ResetProvider: NamedFormatProvider("reset", listOf("r")) {
 
     override fun format(context: FormatProviderContext, component: Component) {
-        component.resetFormatting()
+        component.resetFormatting(true)
     }
 }

src/test/kotlin/StringSerializationTests.kt

@@ -1,6 +1,7 @@
 import io.github.dockyardmc.scroll.*
 import io.github.dockyardmc.scroll.extensions.scrollSanitized
 import io.github.dockyardmc.scroll.extensions.toComponent
+import kotlin.math.exp
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -16,6 +17,16 @@ class StringSerializationTests {
         assertEquals(expected.toJson(), Scroll.parse(input).toJson())
     }
 
+    @Test
+    fun testFontResettingColor() {
+        val input = "<#ff54aa><font:ranyth>testing testing <r>testing2"
+        val expected = Component.compound(mutableListOf(
+            Component(text = "testing testing ", color = "#ff54aa", font = "ranyth"),
+            Component(text = "testing2")
+        ))
+        assertEquals(expected.toJson(), input.toComponent().toJson())
+    }
+
     @Test
     fun testCustomColorSerialization() {
         val input = "<#ff54aa>This text should be cute pink color :3"
@@ -138,6 +149,22 @@ class StringSerializationTests {
         assertEquals(expected.toJson(), Scroll.parse(input).toJson())
     }
 
+    @Test
+    fun testClickWithLink() {
+        val input = "<click:open_url:'https://lukynka.cloud'><aqua><underline>https://lukynka.cloud"
+
+        val expected = Component.compound(mutableListOf(
+            Component(
+                text = "https://lukynka.cloud",
+                clickEvent = ClickEvent(ClickAction.OPEN_URL, "https://lukynka.cloud"),
+                color = "#55FFFF",
+                underlined = true
+            ),
+        ))
+
+        assertEquals(expected.toJson(), input.toComponent().toJson())
+    }
+
 //    @Test
 //    fun testGay() {
 //        val input = "<rainbow>gayyyy"