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

Reformat intentions/Utils

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-02-28 18:37:22 +03:00
committed by Mikhail Glukhikh
parent dd4ceb8c0f
commit a87f652591
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
+9 -5
View File
@@ -172,11 +172,13 @@ private fun KtExpression.specialNegation(reformat: Boolean): KtExpression? {
} }
is KtIsExpression -> { is KtIsExpression -> {
return factory.createExpressionByPattern("$0 $1 $2", return factory.createExpressionByPattern(
"$0 $1 $2",
leftHandSide, leftHandSide,
if (isNegated) "is" else "!is", if (isNegated) "is" else "!is",
typeReference ?: return null, typeReference ?: return null,
reformat = reformat) reformat = reformat
)
} }
is KtConstantExpression -> { is KtConstantExpression -> {
@@ -190,12 +192,14 @@ private fun KtExpression.specialNegation(reformat: Boolean): KtExpression? {
return null return null
} }
private val NEGATABLE_OPERATORS = setOf(KtTokens.EQEQ, KtTokens.EXCLEQ, KtTokens.EQEQEQ, private val NEGATABLE_OPERATORS = setOf(
KtTokens.EQEQ, KtTokens.EXCLEQ, KtTokens.EQEQEQ,
KtTokens.EXCLEQEQEQ, KtTokens.IS_KEYWORD, KtTokens.NOT_IS, KtTokens.IN_KEYWORD, KtTokens.EXCLEQEQEQ, KtTokens.IS_KEYWORD, KtTokens.NOT_IS, KtTokens.IN_KEYWORD,
KtTokens.NOT_IN, KtTokens.LT, KtTokens.LTEQ, KtTokens.GT, KtTokens.GTEQ) KtTokens.NOT_IN, KtTokens.LT, KtTokens.LTEQ, KtTokens.GT, KtTokens.GTEQ
)
private fun getNegatedOperatorText(token: IElementType): String { private fun getNegatedOperatorText(token: IElementType): String {
return when(token) { return when (token) {
KtTokens.EQEQ -> KtTokens.EXCLEQ.value KtTokens.EQEQ -> KtTokens.EXCLEQ.value
KtTokens.EXCLEQ -> KtTokens.EQEQ.value KtTokens.EXCLEQ -> KtTokens.EQEQ.value
KtTokens.EQEQEQ -> KtTokens.EXCLEQEQEQ.value KtTokens.EQEQEQ -> KtTokens.EXCLEQEQEQ.value