Fixed unclosed string exception

SnipMeDev · tmaxxdd · Sep 24, 2023 · Sep 24, 2023 · Sep 24, 2023 · Sep 24, 2023
commit 85d4cde9a9129ee3a498127f43e66caaee2e3eb8
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.7.1]
+
+### Fixed
+- unclosed string notation during input
+
 ## [0.7.0]
 
 ### Added

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 }
 
 group = "dev.snipme"
-version = "0.7.0"
+version = "0.7.1"
 
 kotlin {
     // Android

diff --git a/src/commonMain/kotlin/dev/snipme/highlights/internal/locator/StringLocator.kt b/src/commonMain/kotlin/dev/snipme/highlights/internal/locator/StringLocator.kt
@@ -14,16 +14,23 @@ internal object StringLocator {
 
     private fun findStrings(code: String): List<PhraseLocation> {
         val locations = mutableListOf<PhraseLocation>()
-        val textIndices = mutableListOf<Int>()
 
         // Find index of each string delimiter like " or ' or """
         STRING_DELIMITERS.forEach {
+            val textIndices = mutableListOf<Int>()
             textIndices += code.indicesOf(it)
-        }
 
-        // For given indices find words between
-        for (i in START_INDEX..textIndices.lastIndex step TWO_ELEMENTS) {
-            locations.add(PhraseLocation(textIndices[i], textIndices[i + 1] + QUOTE_ENDING_POSITION))
+            // For given indices find words between
+            for (i in START_INDEX..textIndices.lastIndex step TWO_ELEMENTS) {
+                if (textIndices.getOrNull(i + 1) != null) {
+                    locations.add(
+                        PhraseLocation(
+                            textIndices[i],
+                            textIndices[i + 1] + QUOTE_ENDING_POSITION
+                        )
+                    )
+                }
+            }
         }
 
         return locations

diff --git a/src/commonTest/kotlin/dev/snipme/highlights/internal/locator/StringLocatorTest.kt b/src/commonTest/kotlin/dev/snipme/highlights/internal/locator/StringLocatorTest.kt
@@ -1,5 +1,6 @@
 package dev.snipme.highlights.internal.locator
 
+import dev.snipme.highlights.internal.printResults
 import dev.snipme.highlights.model.PhraseLocation
 import kotlin.test.assertEquals
 import kotlin.test.Test
@@ -68,4 +69,29 @@ internal class StringLocatorTest {
         assertEquals(PhraseLocation(20, 23), result[0])
         assertEquals(PhraseLocation(8, 11), result[1])
     }
+
+    @Test
+    fun `No returns location of unclosed string phrase`() {
+        val testCode = """
+            val b = "a
+            val a = 'a
+        """.trimIndent()
+
+        val result = StringLocator.locate(testCode)
+
+        assertEquals(0, result.size)
+    }
+
+    @Test
+    fun `Returns location only of closed string phrase`() {
+        val testCode = """
+            val b = 'a
+            val a = "a"
+        """.trimIndent()
+
+        val result = StringLocator.locate(testCode)
+
+        assertEquals(1, result.size)
+        assertEquals(PhraseLocation(19, 22), result[0])
+    }
 }