From 6be8ea5b19e2855071695b1c62819ffaa18c3aed Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 20 Jun 2014 17:36:38 +0400 Subject: [PATCH] Minor: Replace deprecated function call --- .../refactoring/extractFunction/extractFunctionUtils.kt | 2 +- .../introduceVariable/AbstractJetExtractionTest.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt index 5e732b9d507..2d276e5abea 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt @@ -880,7 +880,7 @@ fun ExtractionDescriptor.generateFunction( val callText = parameters .map { it.argumentText } - .makeString(separator = ", ", prefix = "$name(", postfix = ")") + .joinToString(separator = ", ", prefix = "$name(", postfix = ")") val wrappedCall = when (controlFlow) { is ExpressionEvaluationWithCallSiteReturn -> JetPsiFactory.createReturn(project, callText) diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt index 8e9e8feb446..46f1298e74a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt @@ -75,7 +75,7 @@ public abstract class AbstractJetExtractionTest() : LightCodeInsightFixtureTestC val expectedTypes = InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "// PARAM_TYPES: ") .mapTo(expectedParameterTypes) { "[$it]" } - .makeString() + .joinToString() val renderer = DescriptorRenderer.DEBUG_TEXT @@ -83,8 +83,8 @@ public abstract class AbstractJetExtractionTest() : LightCodeInsightFixtureTestC selectElements(editor, file) { (elements, previousSibling) -> ExtractKotlinFunctionHandler().doInvoke(editor, file, elements, explicitPreviousSibling ?: previousSibling) { val actualTypes = (ContainerUtil.createMaybeSingletonList(it.receiverParameter) + it.parameters).map { - it.parameterTypeCandidates.map { renderer.renderType(it) }. makeString(", ", "[", "]") - }.makeString() + it.parameterTypeCandidates.map { renderer.renderType(it) }. joinToString(", ", "[", "]") + }.joinToString() assertEquals(expectedTypes, actualTypes, "Expected types mismatch.") } @@ -108,7 +108,7 @@ public abstract class AbstractJetExtractionTest() : LightCodeInsightFixtureTestC JetTestUtils.assertEqualsToFile(afterFile, file.getText()!!) } catch(e: Exception) { - val message = if (e is ConflictsInTestsException) e.getMessages().sort().makeString(" ") else e.getMessage() + val message = if (e is ConflictsInTestsException) e.getMessages().sort().joinToString(" ") else e.getMessage() JetTestUtils.assertEqualsToFile(conflictFile, message?.replace("\n", " ") ?: e.javaClass.getName()) } }