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

Refactoring: use when instead of if

Browse Source
This commit is contained in:
Nikolay Krasko
2016-12-06 19:52:54 +03:00
parent d5c75ae764
commit 211cae2ad2
1 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+41 -39
View File
@@ -197,50 +197,52 @@ abstract class KotlinCommonBlock(
val jetCommonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE) val jetCommonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE)
val jetSettings = settings.getCustomSettings(KotlinCodeStyleSettings::class.java) val jetSettings = settings.getCustomSettings(KotlinCodeStyleSettings::class.java)
val parentType = node.elementType val parentType = node.elementType
if (parentType === KtNodeTypes.VALUE_PARAMETER_LIST) { return when {
return getAlignmentForChildInParenthesis( parentType === KtNodeTypes.VALUE_PARAMETER_LIST ->
jetCommonSettings.ALIGN_MULTILINE_PARAMETERS, KtNodeTypes.VALUE_PARAMETER, COMMA, getAlignmentForChildInParenthesis(
jetCommonSettings.ALIGN_MULTILINE_METHOD_BRACKETS, LPAR, RPAR) jetCommonSettings.ALIGN_MULTILINE_PARAMETERS, KtNodeTypes.VALUE_PARAMETER, COMMA,
} jetCommonSettings.ALIGN_MULTILINE_METHOD_BRACKETS, LPAR, RPAR)
else if (parentType === KtNodeTypes.VALUE_ARGUMENT_LIST) {
return getAlignmentForChildInParenthesis(
jetCommonSettings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS, KtNodeTypes.VALUE_ARGUMENT, COMMA,
jetCommonSettings.ALIGN_MULTILINE_METHOD_BRACKETS, LPAR, RPAR)
}
else if (parentType === KtNodeTypes.WHEN) {
return getAlignmentForCaseBranch(jetSettings.ALIGN_IN_COLUMNS_CASE_BRANCH)
}
else if (parentType === KtNodeTypes.WHEN_ENTRY) {
return alignmentStrategy
}
else if (parentType in BINARY_EXPRESSIONS && getOperationType(node) in ALIGN_FOR_BINARY_OPERATIONS) {
return createAlignmentStrategy(jetCommonSettings.ALIGN_MULTILINE_BINARY_OPERATION, getAlignment())
}
else if (parentType === KtNodeTypes.SUPER_TYPE_LIST || parentType === KtNodeTypes.INITIALIZER_LIST) {
return createAlignmentStrategy(jetCommonSettings.ALIGN_MULTILINE_EXTENDS_LIST, getAlignment())
}
else if (parentType === KtNodeTypes.PARENTHESIZED) {
return object : CommonAlignmentStrategy() {
private var bracketsAlignment: Alignment? = if (jetCommonSettings.ALIGN_MULTILINE_BINARY_OPERATION) Alignment.createAlignment() else null
override fun getAlignment(node: ASTNode): Alignment? { parentType === KtNodeTypes.VALUE_ARGUMENT_LIST ->
val childNodeType = node.elementType getAlignmentForChildInParenthesis(
val prev = getPrevWithoutWhitespace(node) jetCommonSettings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS, KtNodeTypes.VALUE_ARGUMENT, COMMA,
jetCommonSettings.ALIGN_MULTILINE_METHOD_BRACKETS, LPAR, RPAR)
if (prev != null && prev.elementType === TokenType.ERROR_ELEMENT || childNodeType === TokenType.ERROR_ELEMENT) { parentType === KtNodeTypes.WHEN ->
return bracketsAlignment getAlignmentForCaseBranch(jetSettings.ALIGN_IN_COLUMNS_CASE_BRANCH)
parentType === KtNodeTypes.WHEN_ENTRY ->
alignmentStrategy
parentType in BINARY_EXPRESSIONS && getOperationType(node) in ALIGN_FOR_BINARY_OPERATIONS ->
createAlignmentStrategy(jetCommonSettings.ALIGN_MULTILINE_BINARY_OPERATION, getAlignment())
parentType === KtNodeTypes.SUPER_TYPE_LIST || parentType === KtNodeTypes.INITIALIZER_LIST ->
createAlignmentStrategy(jetCommonSettings.ALIGN_MULTILINE_EXTENDS_LIST, getAlignment())
parentType === KtNodeTypes.PARENTHESIZED ->
object : CommonAlignmentStrategy() {
private var bracketsAlignment: Alignment? = if (jetCommonSettings.ALIGN_MULTILINE_BINARY_OPERATION) Alignment.createAlignment() else null
override fun getAlignment(node: ASTNode): Alignment? {
val childNodeType = node.elementType
val prev = getPrevWithoutWhitespace(node)
if (prev != null && prev.elementType === TokenType.ERROR_ELEMENT || childNodeType === TokenType.ERROR_ELEMENT) {
return bracketsAlignment
}
if (childNodeType === LPAR || childNodeType === RPAR) {
return bracketsAlignment
}
return null
} }
if (childNodeType === LPAR || childNodeType === RPAR) {
return bracketsAlignment
}
return null
} }
}
}
return getNullAlignmentStrategy() else ->
getNullAlignmentStrategy()
}
} }