azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-16661 Simplify String.split a bit more

Browse Source 
Check that limit is reached only once in a loop, move nextIndex check to the end of loop.
This commit is contained in:
Ilya Gorbunov
2018-01-19 18:54:33 +03:00
parent 510e17246f
commit 6b9520ec73
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/text/Strings.kt
+5 -4
View File
@@ -1212,18 +1212,19 @@ private fun CharSequence.split(delimiter: String, ignoreCase: Boolean, limit: In
var currentOffset = 0 var currentOffset = 0
var nextIndex = indexOf(delimiter, currentOffset, ignoreCase) var nextIndex = indexOf(delimiter, currentOffset, ignoreCase)
if (nextIndex == -1) { if (nextIndex == -1 || limit == 1) {
return listOf(this.toString()) return listOf(this.toString())
} }
val isLimited = limit > 0 val isLimited = limit > 0
val result = ArrayList<String>(if (isLimited) limit.coerceAtMost(10) else 10) val result = ArrayList<String>(if (isLimited) limit.coerceAtMost(10) else 10)
while (nextIndex != -1 && (!isLimited || result.size < limit - 1)) { do {
result.add(substring(currentOffset, nextIndex)) result.add(substring(currentOffset, nextIndex))
currentOffset = nextIndex + delimiter.length currentOffset = nextIndex + delimiter.length
// Do not search for next occurrence if we're reaching limit // Do not search for next occurrence if we're reaching limit
nextIndex = if (result.size == limit - 1) break else indexOf(delimiter, currentOffset, ignoreCase) if (isLimited && result.size == limit - 1) break
} nextIndex = indexOf(delimiter, currentOffset, ignoreCase)
} while (nextIndex != -1)
result.add(substring(currentOffset, length)) result.add(substring(currentOffset, length))
return result return result