Replace deprecated join with joinToString

This commit is contained in:
Ilya Gorbunov
2015-10-30 16:50:27 +03:00
parent 183523cf24
commit f3ff2e2e76
31 changed files with 54 additions and 59 deletions
@@ -283,12 +283,12 @@ private object DebugTextBuildingVisitor : KtVisitor<String, Unit>() {
fun renderChildren(element: KtElementImplStub<*>, separator: String, prefix: String = "", postfix: String = ""): String? {
val childrenTexts = element.getStub()?.getChildrenStubs()?.map { (it?.getPsi() as? KtElement)?.getDebugText() }
return childrenTexts?.filterNotNull()?.join(separator, prefix, postfix) ?: element.getText()
return childrenTexts?.filterNotNull()?.joinToString(separator, prefix, postfix) ?: element.getText()
}
fun render(element: KtElementImplStub<*>, vararg relevantChildren: KtElement?): String? {
if (element.getStub() == null) return element.getText()
return relevantChildren.filterNotNull().map { it.getDebugText() }.join("", "", "")
return relevantChildren.filterNotNull().map { it.getDebugText() }.joinToString("", "", "")
}
}
@@ -97,7 +97,7 @@ public abstract class KtCodeFragment(
}
override fun importsToString(): String {
return myImports.join(IMPORT_SEPARATOR)
return myImports.joinToString(IMPORT_SEPARATOR)
}
override fun addImportsFromString(imports: String?) {
@@ -110,7 +110,7 @@ public abstract class KtCodeFragment(
}
public fun importsAsImportList(): KtImportList? {
return KtPsiFactory(this).createFile(myImports.join("\n")).getImportList()
return KtPsiFactory(this).createFile(myImports.joinToString("\n")).getImportList()
}
override fun setVisibilityChecker(checker: JavaCodeFragment.VisibilityChecker?) { }
@@ -36,7 +36,7 @@ public open class KotlinStubBaseImpl<T : KtElementImplStub<*>>(parent: StubEleme
if (propertiesValues.isEmpty()) {
return ""
}
return propertiesValues.join(separator = ", ", prefix = "[", postfix = "]")
return propertiesValues.joinToString(separator = ", ", prefix = "[", postfix = "]")
}
private fun renderPropertyValues(stubInterface: Class<out Any?>): List<String> {