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

Replace deprecated join with joinToString

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt
+1 -1
View File
@@ -90,7 +90,7 @@ private object DeclarationKindDetector : KtVisitor<AnnotationHostKind?, Unit?>()
override fun visitProperty(d: KtProperty, data: Unit?) = detect(d, d.getValOrVarKeyword().getText()!!)
override fun visitMultiDeclaration(d: KtMultiDeclaration, data: Unit?) = detect(d, d.getValOrVarKeyword()?.getText() ?: "val",
name = d.getEntries().map { it.getName()!! }.join(", ", "(", ")"))
name = d.getEntries().map { it.getName()!! }.joinToString(", ", "(", ")"))
override fun visitTypeParameter(d: KtTypeParameter, data: Unit?) = detect(d, "type parameter", newLineNeeded = false)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt
+4 -4
View File
@@ -78,7 +78,7 @@ fun <D : CallableDescriptor> renderResolvedCall(resolvedCall: ResolvedCall<D>):
append("<br/>$indent<i>where</i> ")
if (!notInferredTypeParameters.isEmpty()) {
append(notInferredTypeParameters.map { typeParameter -> renderError(typeParameter.getName()) }.join())
append(notInferredTypeParameters.map { typeParameter -> renderError(typeParameter.getName()) }.joinToString())
append("<i> cannot be inferred</i>")
if (!inferredTypeParameters.isEmpty()) {
append("; ")
@@ -88,8 +88,8 @@ fun <D : CallableDescriptor> renderResolvedCall(resolvedCall: ResolvedCall<D>):
val typeParameterToTypeArgumentMap = resolvedCall.getTypeArguments()
if (!inferredTypeParameters.isEmpty()) {
append(inferredTypeParameters.map { typeParameter ->
"${typeParameter.getName()} = ${htmlRenderer.renderType(typeParameterToTypeArgumentMap[typeParameter]!!)}"
}.join())
"${typeParameter.getName()} = ${htmlRenderer.renderType(typeParameterToTypeArgumentMap[typeParameter]!!)}"
}.joinToString())
}
}
@@ -99,7 +99,7 @@ fun <D : CallableDescriptor> renderResolvedCall(resolvedCall: ResolvedCall<D>):
append(htmlRenderer.renderType(receiverParameter.getType())).append(".")
}
append(resultingDescriptor.getName()).append("(")
append(resultingDescriptor.getValueParameters().map { parameter -> renderParameter(parameter) }.join())
append(resultingDescriptor.getValueParameters().map { parameter -> renderParameter(parameter) }.joinToString())
append(if (resolvedCall.hasUnmappedArguments()) renderError(")") else ")")
if (!resolvedCall.getCandidateDescriptor().getTypeParameters().isEmpty()) {
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt
+2 -2
View File
@@ -63,9 +63,9 @@ class ParameterNameAndTypeCompletion(
val nameSuggestionPrefixes = if (prefix.isEmpty() || prefix[0].isUpperCase())
emptyList()
else
prefixWords.indices.map { index -> if (index == 0) prefix else prefixWords.drop(index).join("") }
prefixWords.indices.map { index -> if (index == 0) prefix else prefixWords.drop(index).joinToString("") }
userPrefixes = nameSuggestionPrefixes.indices.map { prefixWords.take(it).join("") }
userPrefixes = nameSuggestionPrefixes.indices.map { prefixWords.take(it).joinToString("") }
classNamePrefixMatchers = nameSuggestionPrefixes.map { CamelHumpMatcher(it.capitalize(), false) }
}
idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/ConsoleErrorRenderer.kt
+1 -1
View File
@@ -29,7 +29,7 @@ public class ConsoleErrorRenderer(private val messages: List<SeverityDetails>) :
override fun getTooltipText(): String {
val htmlTooltips = messages map { "<b>${msgType(it.severity)}</b> ${it.description}" }
return "<html>${htmlTooltips.join("<hr size=1 noshade>")}</html>"
return "<html>${htmlTooltips.joinToString("<hr size=1 noshade>")}</html>"
}
override fun getIcon() = ReplIcons.COMPILER_ERROR
idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt
+2 -2
View File
@@ -124,7 +124,7 @@ public class KotlinCoverageExtension(): JavaCoverageEngineExtension() {
if (existingClassFiles.isEmpty()) {
return null
}
LOG.debug("Classfiles: [${existingClassFiles.map { it.getName() }.join()}]")
LOG.debug("Classfiles: [${existingClassFiles.map { it.getName() }.joinToString()}]")
return existingClassFiles.map {
val relativePath = VfsUtilCore.getRelativePath(it, outputRoot!!)!!
StringUtil.trimEnd(relativePath, ".class").replace("/", ".")
@@ -159,7 +159,7 @@ public class KotlinCoverageExtension(): JavaCoverageEngineExtension() {
if (packageOutputDir == null) return listOf()
val prefixes = collectClassFilePrefixes(file)
LOG.debug("Classfile prefixes: [${prefixes.join(", ")}]")
LOG.debug("Classfile prefixes: [${prefixes.joinToString(", ")}]")
return packageOutputDir.getChildren().filter {
file -> prefixes.any {
(file.getName().startsWith(it + "$") && FileUtilRt.getExtension(file.getName()) == "class") ||
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
+1 -1
View File
@@ -61,7 +61,7 @@ object SuperDeclarationMarkerTooltip: Function<KtDeclaration, String> {
"${if (!isAbstract && isBaseAbstract) "Implements" else "Overrides"} $memberKind in '${renderer.render(declaration)}'"
}
return containingStrings.sorted().join(separator = "<br/>")
return containingStrings.sorted().joinToString(separator = "<br/>")
}
}
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt
+1 -1
View File
@@ -40,7 +40,7 @@ public class ConvertToConcatenatedStringIntention : SelfTargetingOffsetIndepende
.mapIndexed { index, entry ->
entry.toSeparateString(quote, convertExplicitly = (index == 0), isFinalEntry = (index == entries.lastIndex))
}
.join(separator = "+")
.joinToString(separator = "+")
.replace("""$quote+$quote""", "")
val replacement = KtPsiFactory(element).createExpression(text)
idea/src/org/jetbrains/kotlin/idea/j2k/IdeaDocCommentConverter.kt
+1 -1
View File
@@ -74,7 +74,7 @@ object IdeaDocCommentConverter : DocCommentConverter {
private fun convertInlineDocTag(tag: PsiInlineDocTag) = when(tag.getName()) {
"code", "literal" -> {
val text = tag.getDataElements().map { it.getText() }.join("")
val text = tag.getDataElements().joinToString("") { it.getText() }
val escaped = StringUtil.escapeXml(text.trimStart())
if (tag.getName() == "code") "<code>$escaped</code>" else escaped
}
idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
+1 -1
View File
@@ -97,7 +97,7 @@ object KDocRenderer {
// Avoid wrapping the entire converted contents in a <p> tag if it's just a single paragraph
val maybeSingleParagraph = markdownNode.children.filter { it.type != MarkdownTokenTypes.EOL }.singleOrNull()
if (maybeSingleParagraph != null && !allowSingleParagraph) {
return maybeSingleParagraph.children.map { it.toHtml() }.join("")
return maybeSingleParagraph.children.joinToString("") { it.toHtml() }
} else {
return markdownNode.toHtml()
}
idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.kt
+2 -2
View File
@@ -73,8 +73,8 @@ public class MakeOverriddenMemberOpenFix(declaration: KtDeclaration) : KotlinQui
}
Collections.sort(containingDeclarationsNames)
val declarations = containingDeclarationsNames.subList(0, containingDeclarationsNames.size()-1).join(", ") + " and " +
containingDeclarationsNames.last()
val declarations = containingDeclarationsNames.subList(0, containingDeclarationsNames.size()-1).joinToString(", ") + " and " +
containingDeclarationsNames.last()
return "Make '${element.name}' in $declarations open"
}
idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt
+1 -1
View File
@@ -41,7 +41,7 @@ public abstract class AbstractKotlinCoverageOutputFilesTest(): KotlinLightCodeIn
}
val actualClasses = KotlinCoverageExtension.collectGeneratedClassQualifiedNames(outDir, kotlinFile)
KotlinTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.txt")), actualClasses!!.join("\n"))
KotlinTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.txt")), actualClasses!!.joinToString("\n"))
}
finally {
runWriteAction {