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

trailingComma: cleanup code

Browse Source
This commit is contained in:
Dmitry Gridin
2020-05-26 21:32:09 +07:00
parent 052d06be3f
commit 3643b7b0ca
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/trailingComma/TrailingCommaState.kt
-6
View File
@@ -59,12 +59,6 @@ enum class TrailingCommaState {
} }
} }
val TrailingCommaState.existsOrMissing: Boolean
get() = when (this) {
TrailingCommaState.EXISTS, TrailingCommaState.MISSING -> true
else -> false
}
private fun isMultiline(ktElement: KtElement): Boolean = when { private fun isMultiline(ktElement: KtElement): Boolean = when {
ktElement.parent is KtFunctionLiteral -> isMultiline(ktElement.parent as KtElement) ktElement.parent is KtFunctionLiteral -> isMultiline(ktElement.parent as KtElement)
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/trailingComma/util.kt
+12 -17
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.idea.formatter.trailingComma package org.jetbrains.kotlin.idea.formatter.trailingComma
import com.intellij.lang.ASTNode import com.intellij.lang.ASTNode
import com.intellij.openapi.util.UserDataHolder
import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.util.registry.Registry
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.IElementType
@@ -42,30 +41,26 @@ private val TYPES_WITH_TRAILING_COMMA = TokenSet.orSet(
) )
fun PsiElement.canAddTrailingCommaWithRegistryCheck(): Boolean { fun PsiElement.canAddTrailingCommaWithRegistryCheck(): Boolean {
val type = elementType(this) ?: return false val type = PsiUtilCore.getElementType(this) ?: return false
return type in TYPES_WITH_TRAILING_COMMA_ON_DECLARATION_SITE || return type in TYPES_WITH_TRAILING_COMMA_ON_DECLARATION_SITE ||
trailingCommaIsAllowedOnCallSite() && type in TYPES_WITH_TRAILING_COMMA_ON_CALL_SITE trailingCommaIsAllowedOnCallSite() && type in TYPES_WITH_TRAILING_COMMA_ON_CALL_SITE
} }
fun KotlinCodeStyleSettings.addTrailingCommaIsAllowedFor(element: UserDataHolder): Boolean = when (elementType(element)) { fun KotlinCodeStyleSettings.addTrailingCommaIsAllowedFor(node: ASTNode): Boolean =
addTrailingCommaIsAllowedFor(PsiUtilCore.getElementType(node))
fun KotlinCodeStyleSettings.addTrailingCommaIsAllowedFor(element: PsiElement): Boolean =
addTrailingCommaIsAllowedFor(PsiUtilCore.getElementType(element))
private fun KotlinCodeStyleSettings.addTrailingCommaIsAllowedFor(type: IElementType?): Boolean = when (type) {
null -> false null -> false
in TYPES_WITH_TRAILING_COMMA_ON_DECLARATION_SITE -> ALLOW_TRAILING_COMMA in TYPES_WITH_TRAILING_COMMA_ON_DECLARATION_SITE -> ALLOW_TRAILING_COMMA
in TYPES_WITH_TRAILING_COMMA_ON_CALL_SITE -> ALLOW_TRAILING_COMMA_ON_CALL_SITE || trailingCommaIsAllowedOnCallSite() in TYPES_WITH_TRAILING_COMMA_ON_CALL_SITE -> ALLOW_TRAILING_COMMA_ON_CALL_SITE || trailingCommaIsAllowedOnCallSite()
else -> false else -> false
} }
private fun elementType(userDataHolder: UserDataHolder): IElementType? = when (userDataHolder) { fun PsiElement.canAddTrailingComma(): Boolean = when {
is ASTNode -> PsiUtilCore.getElementType(userDataHolder) this is KtWhenEntry && (isElse || parent.cast<KtWhenExpression>().leftParenthesis == null) -> false
is PsiElement -> PsiUtilCore.getElementType(userDataHolder) this is KtFunctionLiteral && arrow == null -> false
else -> null else -> PsiUtilCore.getElementType(this) in TYPES_WITH_TRAILING_COMMA
} }
fun ASTNode.canAddTrailingComma(): Boolean = psi?.canAddTrailingComma() == true
fun PsiElement.canAddTrailingComma(): Boolean =
when {
this is KtWhenEntry && (isElse || parent.cast<KtWhenExpression>().leftParenthesis == null) -> false
this is KtFunctionLiteral && arrow == null -> false
else -> canAddTrailingComma(this)
}
private fun canAddTrailingComma(userDataHolder: UserDataHolder): Boolean = elementType(userDataHolder) in TYPES_WITH_TRAILING_COMMA