From 35166f44ae10ca35a9e778d9ff4e1be25118ead8 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 25 Jun 2015 22:28:29 +0300 Subject: [PATCH] StdLib deprecations cleanup: string operations. --- .../test/kotlin/test/kotlin/jdbc/JdbcTest.kt | 4 ++-- libraries/stdlib/src/kotlin/dom/Dom.kt | 2 +- .../jetbrains/kotlin/doc/model/KotlinModel.kt | 22 +++++++++---------- .../kotlin/doc/templates/KDocTemplate.kt | 2 +- .../doc/templates/PackageTemplateSupport.kt | 2 +- .../jetbrains/kotlin/gradle/tasks/Tasks.kt | 2 +- .../kotlin/gradle/plugin/KotlinPlugin.kt | 5 +++-- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTest.kt b/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTest.kt index 26eb3631629..2371469dd97 100644 --- a/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTest.kt +++ b/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTest.kt @@ -85,10 +85,10 @@ class JdbcTest { test fun formatCursor() { dataSource.query("select * from foo") { - println(it.getColumnNames().toList().makeString("\t")) + println(it.getColumnNames().toList().joinToString("\t")) for (row in it) { - println(it.getValues().makeString("\t")) + println(it.getValues().joinToString("\t")) } } } diff --git a/libraries/stdlib/src/kotlin/dom/Dom.kt b/libraries/stdlib/src/kotlin/dom/Dom.kt index 3defb5fa65c..5503ee8f511 100644 --- a/libraries/stdlib/src/kotlin/dom/Dom.kt +++ b/libraries/stdlib/src/kotlin/dom/Dom.kt @@ -53,7 +53,7 @@ public var Element.classes: String } /** Returns true if the element has the given CSS class style in its 'class' attribute */ -public fun Element.hasClass(cssClass: String): Boolean = classes.matches("""(^|.*\s+)$cssClass($|\s+.*)""") +public fun Element.hasClass(cssClass: String): Boolean = classes.matches("""(^|.*\s+)$cssClass($|\s+.*)""".toRegex()) /** Returns the children of the element as a list */ diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index 76c9b90a785..b03fb24ee93 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -144,7 +144,7 @@ abstract class KClassOrPackage(model: KModel, descriptor: DeclarationDescriptor) fun findFunction(expression: String): KFunction? { val idx = expression.indexOf('(') val name = if (idx > 0) expression.substring(0, idx) else expression - val postfix = if (idx > 0) expression.substring(idx).trimTrailing("()") else "" + val postfix = if (idx > 0) expression.substring(idx).removeSuffix("()") else "" return functions.find{ it.name == name && it.parameterTypeText == postfix } } } @@ -342,8 +342,8 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs canonicalFile.substring(rootDir.length()) else canonicalFile - val cleanRoot = root.trimTrailing("/") - val cleanPath = relativeFile.trimLeading("/") + val cleanRoot = root.removeSuffix("/") + val cleanPath = relativeFile.removePrefix("/") return "$cleanRoot/$cleanPath$lineLinkText$sourceLine" } return null @@ -488,14 +488,14 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs var text = lines[i] text = text.trim() if (i == 0) { - text = text.trimLeading("/**").trimLeading("/*") + text = text.removePrefix("/**").removePrefix("/*") } else { buffer.append("\n") } if (i >= last) { - text = text.trimTrailing("*/") + text = text.removeSuffix("*/") } else if (i > 0) { - text = text.trimLeading("* ") + text = text.removePrefix("* ") if (text == "*") text = "" } text = processMacros(text, psiElement) @@ -830,7 +830,7 @@ abstract class KAnnotated(val model: KModel, val declarationDescriptor: Declarat val detailedText = detailedDescription(template) val idx = detailedText.indexOf("

") return if (idx > 0) { - detailedText.substring(0, idx).trimLeading("

") + detailedText.substring(0, idx).removePrefix("

") } else { detailedText } @@ -950,7 +950,7 @@ class KPackage( /** Returns a relative path like ../.. for each path in the name */ val nameAsRelativePath: String get() { - val answer = namePaths.map{ ".." }.makeString("/") + val answer = namePaths.map{ ".." }.joinToString("/") return if (answer.length() == 0) "" else answer + "/" } @@ -958,7 +958,7 @@ class KPackage( // lets see if we can find a custom summary val text = model.config.packageSummaryText[name] return if (text != null) - wikiConvert(text, template).trimLeading("

").trimTrailing("

") + wikiConvert(text, template).removePrefix("

").removeSuffix("

") else super.description(template) } @@ -1104,7 +1104,7 @@ class KFunction(val descriptor: CallableDescriptor, val owner: KClassOrPackage, var exceptions: List = listOf(), var annotations: List = listOf()): KAnnotated(owner.model, descriptor), Comparable { - val parameterTypeText: String = parameters.map{ it.aType.name }.makeString(", ") + val parameterTypeText: String = parameters.map{ it.aType.name }.joinToString(", ") override fun compareTo(other: KFunction): Int { var answer = name.compareTo(other.name) @@ -1128,7 +1128,7 @@ class KFunction(val descriptor: CallableDescriptor, val owner: KClassOrPackage, /** Returns a list of generic type parameter names kinds like "A, I" */ val typeParametersText: String - get() = typeParameters.map{ it.name }.makeString(", ") + get() = typeParameters.map{ it.name }.joinToString(", ") } class KProperty(val owner: KClassOrPackage, val descriptor: PropertyDescriptor, val name: String, diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt index 5f9eea4b621..c12985a152a 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt @@ -149,7 +149,7 @@ abstract class KDocTemplate() : TextTemplate() { } open fun typeArguments(arguments: List, prefix: String = "<", postfix: String = ">", empty: String = ""): String { - val text = arguments.map() { link(it) }.makeString(", ") + val text = arguments.map() { link(it) }.joinToString(", ") return if (text.length() == 0) empty else "$prefix$text$postfix" } diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt index fae302fae54..a9431c4df74 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt @@ -119,7 +119,7 @@ abstract class PackageTemplateSupport(open val pkg: KPackage) : KDocTemplate() { println("""
""")
         println("""""")
         printAnnotations(function.annotations)
-        print("""${function.modifiers.makeString(" ")} $funKeyword""")
+        print("""${function.modifiers.joinToString(" ")} $funKeyword""")
 
         printTypeParameters(function, " ")
         printReceiverType(function, " ", ".", " ")
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index e6d7c6d764e..a82506ecb22 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -169,7 +169,7 @@ public open class KotlinCompile() : AbstractKotlinCompile