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

Change Signature: Remove useless indentation

Browse Source
This commit is contained in:
Alexey Sedunov
2014-12-17 13:09:09 +03:00
parent ec608c5db2
commit 6df91fdda7
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt
+3 -4
View File
@@ -145,7 +145,7 @@ public class JetChangeInfo(
buffer.append(JetTokens.FUN_KEYWORD).append(' ').append(name) 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) if (newReturnType != null && !KotlinBuiltIns.isUnit(newReturnType) && !isConstructor)
buffer.append(": ").append(newReturnTypeText) buffer.append(": ").append(newReturnTypeText)
@@ -158,16 +158,15 @@ public class JetChangeInfo(
&& getMethod() == DescriptorToSourceUtils.descriptorToDeclaration(inheritedFunctionDescriptor) && getMethod() == DescriptorToSourceUtils.descriptorToDeclaration(inheritedFunctionDescriptor)
} }
public fun getNewParametersSignature(inheritedFunction: JetFunctionDefinitionUsage<PsiElement>, indentLength: Int): String { public fun getNewParametersSignature(inheritedFunction: JetFunctionDefinitionUsage<PsiElement>): String {
val isLambda = inheritedFunction.getDeclaration() is JetFunctionLiteral val isLambda = inheritedFunction.getDeclaration() is JetFunctionLiteral
if (isLambda && newParameters.size() == 1 && !newParameters.get(0).requiresExplicitType(inheritedFunction)) { if (isLambda && newParameters.size() == 1 && !newParameters.get(0).requiresExplicitType(inheritedFunction)) {
return newParameters.get(0).getDeclarationSignature(0, inheritedFunction) return newParameters.get(0).getDeclarationSignature(0, inheritedFunction)
} }
val indent = StringUtil.repeatSymbol(' ', indentLength + 1)
return newParameters.indices return newParameters.indices
.map { i -> newParameters[i].getDeclarationSignature(i, inheritedFunction) } .map { i -> newParameters[i].getDeclarationSignature(i, inheritedFunction) }
.joinToString(prefix = "(", separator = ",$indent", postfix = ")") .joinToString(prefix = "(", separator = ", ", postfix = ")")
} }
public fun renderReturnType(inheritedFunction: JetFunctionDefinitionUsage<PsiElement>): String { public fun renderReturnType(inheritedFunction: JetFunctionDefinitionUsage<PsiElement>): String {
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java
+2 -2
View File
@@ -239,14 +239,14 @@ public class JetFunctionDefinitionUsage<T extends PsiElement> extends JetUsageIn
} }
else { else {
newParameterList = psiFactory.createFunctionLiteralParameterList(changeInfo.getNewParametersSignature( newParameterList = psiFactory.createFunctionLiteralParameterList(changeInfo.getNewParametersSignature(
(JetFunctionDefinitionUsage<PsiElement>) this, 0) (JetFunctionDefinitionUsage<PsiElement>) this)
); );
canReplaceEntireList = true; canReplaceEntireList = true;
} }
} }
else { else {
newParameterList = psiFactory.createParameterList(changeInfo.getNewParametersSignature( newParameterList = psiFactory.createParameterList(changeInfo.getNewParametersSignature(
(JetFunctionDefinitionUsage<PsiElement>) this, 0) (JetFunctionDefinitionUsage<PsiElement>) this)
); );
} }