Merge pull request #1292 from Hannah-Sten/1290

1290
Hannah-Sten · Mar 7, 2020 · 04a384c · 04a384c
2 parents 3e9a13d + 9fa16b7
commit 04a384c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/nl/hannahsten/texifyidea/psi/LatexCommandsImplUtil.kt b/src/nl/hannahsten/texifyidea/psi/LatexCommandsImplUtil.kt
@@ -68,6 +68,7 @@ fun splitToRanges(text: String, pattern: Pattern): List<TextRange> {
 }
 
 fun stripGroup(text: String): String {
+    if (text.length < 2) return ""
     return text.substring(1, text.length - 1)
 }
 

diff --git a/src/nl/hannahsten/texifyidea/util/Strings.kt b/src/nl/hannahsten/texifyidea/util/Strings.kt
@@ -54,7 +54,10 @@ fun String.substringEnd(range: IntRange): String = substringEnd(range.first, ran
 /**
  * Trims `startTrim` characters from the front, and `endTrim` characters from the end.
  */
-fun String.trimRange(startTrim: Int, endTrim: Int): String = substring(startTrim).substringEnd(endTrim)
+fun String.trimRange(startTrim: Int, endTrim: Int): String {
+    if (startTrim + endTrim > length) return ""
+    return substring(startTrim).substringEnd(endTrim)
+}
 
 /**
  * Returns the leading whitespace of a string.
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     fun stripGroup(text: String): String {
+        if (text.length < 2) return ""
         return text.substring(1, text.length - 1)
     }
@@ Expand Down @@