Fix deprecated replaceAll and replaceFirst usages in stdlib tests and tools.
This commit is contained in:
@@ -305,31 +305,31 @@ class StringJVMTest {
|
|||||||
|
|
||||||
test fun testReplaceAllClosure() {
|
test fun testReplaceAllClosure() {
|
||||||
val s = "test123zzz"
|
val s = "test123zzz"
|
||||||
val result = s.replaceAll("\\d+") { mr ->
|
val result = s.replace("\\d+".toRegex()) { mr ->
|
||||||
"[" + mr.group() + "]"
|
"[" + mr.value + "]"
|
||||||
}
|
}
|
||||||
assertEquals("test[123]zzz", result)
|
assertEquals("test[123]zzz", result)
|
||||||
}
|
}
|
||||||
|
|
||||||
test fun testReplaceAllClosureAtStart() {
|
test fun testReplaceAllClosureAtStart() {
|
||||||
val s = "123zzz"
|
val s = "123zzz"
|
||||||
val result = s.replaceAll("\\d+") { mr ->
|
val result = s.replace("\\d+".toRegex()) { mr ->
|
||||||
"[" + mr.group() + "]"
|
"[" + mr.value + "]"
|
||||||
}
|
}
|
||||||
assertEquals("[123]zzz", result)
|
assertEquals("[123]zzz", result)
|
||||||
}
|
}
|
||||||
|
|
||||||
test fun testReplaceAllClosureAtEnd() {
|
test fun testReplaceAllClosureAtEnd() {
|
||||||
val s = "test123"
|
val s = "test123"
|
||||||
val result = s.replaceAll("\\d+") { mr ->
|
val result = s.replace("\\d+".toRegex()) { mr ->
|
||||||
"[" + mr.group() + "]"
|
"[" + mr.value + "]"
|
||||||
}
|
}
|
||||||
assertEquals("test[123]", result)
|
assertEquals("test[123]", result)
|
||||||
}
|
}
|
||||||
|
|
||||||
test fun testReplaceAllClosureEmpty() {
|
test fun testReplaceAllClosureEmpty() {
|
||||||
val s = ""
|
val s = ""
|
||||||
val result = s.replaceAll("\\d+") { mr ->
|
val result = s.replace("\\d+".toRegex()) { mr ->
|
||||||
"x"
|
"x"
|
||||||
}
|
}
|
||||||
assertEquals("", result)
|
assertEquals("", result)
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ class SyntaxHighlighter() {
|
|||||||
lexer.advance()
|
lexer.advance()
|
||||||
val token = lexer.getTokenType()
|
val token = lexer.getTokenType()
|
||||||
if (token == null) break
|
if (token == null) break
|
||||||
val tokenText = lexer.getTokenSequence().toString().replaceAll("\n", "\r\n")
|
val tokenText = lexer.getTokenSequence().toString().replace("\n", "\r\n")
|
||||||
var style: String? = null
|
var style: String? = null
|
||||||
if (token is JetKeywordToken) {
|
if (token is JetKeywordToken) {
|
||||||
style = "keyword"
|
style = "keyword"
|
||||||
|
|||||||
@@ -204,7 +204,7 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs
|
|||||||
|
|
||||||
sourcesInfo = sources.map { source ->
|
sourcesInfo = sources.map { source ->
|
||||||
val relativePath = relativePath(source)
|
val relativePath = relativePath(source)
|
||||||
val htmlPath = relativePath.replaceFirst("\\.kt$", "") + ".html"
|
val htmlPath = relativePath.replaceFirst("\\.kt$".toRegex(), "") + ".html"
|
||||||
SourceInfo(source, relativePath, htmlPath)
|
SourceInfo(source, relativePath, htmlPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -105,7 +105,7 @@ abstract class BaseGradleIT {
|
|||||||
listOf("/bin/bash", "./gradlew") + tailParameters
|
listOf("/bin/bash", "./gradlew") + tailParameters
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun String.normalize() = this.replaceAll("\r\n", "\n").replaceAll("\n", SYSTEM_LINE_SEPARATOR)
|
private fun String.normalize() = this.lineSequence().join(SYSTEM_LINE_SEPARATOR)
|
||||||
|
|
||||||
private fun isWindows(): Boolean {
|
private fun isWindows(): Boolean {
|
||||||
return System.getProperty("os.name")!!.contains("Windows")
|
return System.getProperty("os.name")!!.contains("Windows")
|
||||||
|
|||||||
Reference in New Issue
Block a user