diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt index b5134ebbf9f..5dd464a67cb 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt @@ -145,7 +145,7 @@ public class JetChangeInfo( buffer.append(JetTokens.FUN_KEYWORD).append(' ').append(name) } - buffer.append(getNewParametersSignature(inheritedFunction, buffer.length())) + buffer.append(getNewParametersSignature(inheritedFunction)) if (newReturnType != null && !KotlinBuiltIns.isUnit(newReturnType) && !isConstructor) buffer.append(": ").append(newReturnTypeText) @@ -158,16 +158,15 @@ public class JetChangeInfo( && getMethod() == DescriptorToSourceUtils.descriptorToDeclaration(inheritedFunctionDescriptor) } - public fun getNewParametersSignature(inheritedFunction: JetFunctionDefinitionUsage, indentLength: Int): String { + public fun getNewParametersSignature(inheritedFunction: JetFunctionDefinitionUsage): String { val isLambda = inheritedFunction.getDeclaration() is JetFunctionLiteral if (isLambda && newParameters.size() == 1 && !newParameters.get(0).requiresExplicitType(inheritedFunction)) { return newParameters.get(0).getDeclarationSignature(0, inheritedFunction) } - val indent = StringUtil.repeatSymbol(' ', indentLength + 1) return newParameters.indices .map { i -> newParameters[i].getDeclarationSignature(i, inheritedFunction) } - .joinToString(prefix = "(", separator = ",$indent", postfix = ")") + .joinToString(prefix = "(", separator = ", ", postfix = ")") } public fun renderReturnType(inheritedFunction: JetFunctionDefinitionUsage): String { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java index f6e6abdd14b..7c1c778ef20 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java @@ -239,14 +239,14 @@ public class JetFunctionDefinitionUsage extends JetUsageIn } else { newParameterList = psiFactory.createFunctionLiteralParameterList(changeInfo.getNewParametersSignature( - (JetFunctionDefinitionUsage) this, 0) + (JetFunctionDefinitionUsage) this) ); canReplaceEntireList = true; } } else { newParameterList = psiFactory.createParameterList(changeInfo.getNewParametersSignature( - (JetFunctionDefinitionUsage) this, 0) + (JetFunctionDefinitionUsage) this) ); }