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

Minor: Replace deprecated function call

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-20 17:36:38 +04:00
parent 64a2fde80a
commit 6be8ea5b19
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
+1 -1
View File
@@ -880,7 +880,7 @@ fun ExtractionDescriptor.generateFunction(
val callText = parameters val callText = parameters
.map { it.argumentText } .map { it.argumentText }
.makeString(separator = ", ", prefix = "$name(", postfix = ")") .joinToString(separator = ", ", prefix = "$name(", postfix = ")")
val wrappedCall = when (controlFlow) { val wrappedCall = when (controlFlow) {
is ExpressionEvaluationWithCallSiteReturn -> is ExpressionEvaluationWithCallSiteReturn ->
JetPsiFactory.createReturn(project, callText) JetPsiFactory.createReturn(project, callText)
idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
+4 -4
View File
@@ -75,7 +75,7 @@ public abstract class AbstractJetExtractionTest() : LightCodeInsightFixtureTestC
val expectedTypes = val expectedTypes =
InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "// PARAM_TYPES: ") InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "// PARAM_TYPES: ")
.mapTo(expectedParameterTypes) { "[$it]" } .mapTo(expectedParameterTypes) { "[$it]" }
.makeString() .joinToString()
val renderer = DescriptorRenderer.DEBUG_TEXT val renderer = DescriptorRenderer.DEBUG_TEXT
@@ -83,8 +83,8 @@ public abstract class AbstractJetExtractionTest() : LightCodeInsightFixtureTestC
selectElements(editor, file) { (elements, previousSibling) -> selectElements(editor, file) { (elements, previousSibling) ->
ExtractKotlinFunctionHandler().doInvoke(editor, file, elements, explicitPreviousSibling ?: previousSibling) { ExtractKotlinFunctionHandler().doInvoke(editor, file, elements, explicitPreviousSibling ?: previousSibling) {
val actualTypes = (ContainerUtil.createMaybeSingletonList(it.receiverParameter) + it.parameters).map { val actualTypes = (ContainerUtil.createMaybeSingletonList(it.receiverParameter) + it.parameters).map {
it.parameterTypeCandidates.map { renderer.renderType(it) }. makeString(", ", "[", "]") it.parameterTypeCandidates.map { renderer.renderType(it) }. joinToString(", ", "[", "]")
}.makeString() }.joinToString()
assertEquals(expectedTypes, actualTypes, "Expected types mismatch.") assertEquals(expectedTypes, actualTypes, "Expected types mismatch.")
} }
@@ -108,7 +108,7 @@ public abstract class AbstractJetExtractionTest() : LightCodeInsightFixtureTestC
JetTestUtils.assertEqualsToFile(afterFile, file.getText()!!) JetTestUtils.assertEqualsToFile(afterFile, file.getText()!!)
} }
catch(e: Exception) { 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()) JetTestUtils.assertEqualsToFile(conflictFile, message?.replace("\n", " ") ?: e.javaClass.getName())
} }
} }