Replace Regex.match and matchAll usages
This commit is contained in:
@@ -171,7 +171,7 @@ public object TypeIntrinsics {
|
||||
*/
|
||||
private fun getFunctionTypeArity(jetType: KotlinType): Int {
|
||||
val classFqName = getClassFqName(jetType) ?: return -1
|
||||
val match = KOTLIN_FUNCTION_INTERFACE_REGEX.match(classFqName) ?: return -1
|
||||
val match = KOTLIN_FUNCTION_INTERFACE_REGEX.find(classFqName) ?: return -1
|
||||
return Integer.valueOf(match.groups[1]!!.value)
|
||||
}
|
||||
|
||||
|
||||
@@ -254,8 +254,8 @@ public object KotlinCompilerClient {
|
||||
|
||||
|
||||
private fun String.extractPortFromRunFilename(digest: String): Int =
|
||||
makeRunFilenameString(timestamp = "[0-9TZ:\\.\\+-]+", digest = digest, port = "(\\d+)", escapeSequence = "\\").toRegex()
|
||||
.match(this)
|
||||
makeRunFilenameString(timestamp = "[0-9TZ:\\.\\+-]+", digest = digest, port = "(\\d+)", escapeSequence = "\\").toRegex()
|
||||
.find(this)
|
||||
?.groups?.get(1)
|
||||
?.value?.toInt()
|
||||
?: 0
|
||||
|
||||
@@ -42,7 +42,7 @@ internal fun Sequence<String>.ifNotContainsSequence(patternsIter: Iterator<LineP
|
||||
{ acc, line ->
|
||||
when {
|
||||
!acc.iter.isValid() -> return@fold acc
|
||||
acc.iter.value.regex.match(line)?.let { acc.iter.value.matchCheck(it) } ?: false -> acc.nextLineAndPattern()
|
||||
acc.iter.value.regex.find(line)?.let { acc.iter.value.matchCheck(it) } ?: false -> acc.nextLineAndPattern()
|
||||
else -> acc.nextLine()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ public class Regex(pattern: String, options: Set<RegexOption>) {
|
||||
* replacement for that match.
|
||||
*/
|
||||
public inline fun replace(input: CharSequence, transform: (MatchResult) -> CharSequence): String {
|
||||
var match = match(input)
|
||||
var match = find(input)
|
||||
if (match == null) return input.toString()
|
||||
|
||||
var lastStart = 0
|
||||
@@ -148,7 +148,7 @@ public class Regex(pattern: String, options: Set<RegexOption>) {
|
||||
*/
|
||||
public fun split(input: CharSequence, limit: Int = 0): List<String> {
|
||||
require(limit >= 0, { "Limit must be non-negative, but was $limit" } )
|
||||
val matches = matchAll(input).let { if (limit == 0) it else it.take(limit - 1) }
|
||||
val matches = findAll(input).let { if (limit == 0) it else it.take(limit - 1) }
|
||||
val result = ArrayList<String>()
|
||||
var lastStart = 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user