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

Use unaryPlus() and unaryMinus() instead of plus() and minus() + no identityEquals()

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-22 14:51:08 +03:00
parent c5e13ebc68
commit 34298190b3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+4 -4
View File
@@ -90,8 +90,8 @@ public class OperatorToFunctionIntention : JetSelfTargetingIntention<KtExpressio
private fun convertPrefix(element: KtPrefixExpression): KtExpression { private fun convertPrefix(element: KtPrefixExpression): KtExpression {
val op = element.operationReference.getReferencedNameElementType() val op = element.operationReference.getReferencedNameElementType()
val operatorName = when (op) { val operatorName = when (op) {
KtTokens.PLUS -> OperatorNameConventions.PLUS KtTokens.PLUS -> OperatorNameConventions.UNARY_PLUS
KtTokens.MINUS -> OperatorNameConventions.MINUS KtTokens.MINUS -> OperatorNameConventions.UNARY_MINUS
KtTokens.PLUSPLUS -> OperatorNameConventions.INC KtTokens.PLUSPLUS -> OperatorNameConventions.INC
KtTokens.MINUSMINUS -> OperatorNameConventions.DEC KtTokens.MINUSMINUS -> OperatorNameConventions.DEC
KtTokens.EXCL -> OperatorNameConventions.NOT KtTokens.EXCL -> OperatorNameConventions.NOT
@@ -146,8 +146,8 @@ public class OperatorToFunctionIntention : JetSelfTargetingIntention<KtExpressio
KtTokens.MULTEQ -> if (functionName == "multAssign") "$0.multAssign($1)" else "$0 = $0.mult($1)" KtTokens.MULTEQ -> if (functionName == "multAssign") "$0.multAssign($1)" else "$0 = $0.mult($1)"
KtTokens.DIVEQ -> if (functionName == "divAssign") "$0.divAssign($1)" else "$0 = $0.div($1)" KtTokens.DIVEQ -> if (functionName == "divAssign") "$0.divAssign($1)" else "$0 = $0.div($1)"
KtTokens.PERCEQ -> if (functionName == "modAssign") "$0.modAssign($1)" else "$0 = $0.mod($1)" KtTokens.PERCEQ -> if (functionName == "modAssign") "$0.modAssign($1)" else "$0 = $0.mod($1)"
KtTokens.EQEQ -> if (elemType?.isMarkedNullable() ?: true) "$0?.equals($1) ?: $1.identityEquals(null)" else "$0.equals($1)" KtTokens.EQEQ -> if (elemType?.isMarkedNullable() ?: true) "$0?.equals($1) ?: $1 == null" else "$0.equals($1)"
KtTokens.EXCLEQ -> if (elemType?.isMarkedNullable() ?: true) "!($0?.equals($1) ?: $1.identityEquals(null))" else "!$0.equals($1)" KtTokens.EXCLEQ -> if (elemType?.isMarkedNullable() ?: true) "!($0?.equals($1) ?: $1 == null)" else "!$0.equals($1)"
KtTokens.GT -> "$0.compareTo($1) > 0" KtTokens.GT -> "$0.compareTo($1) > 0"
KtTokens.LT -> "$0.compareTo($1) < 0" KtTokens.LT -> "$0.compareTo($1) < 0"
KtTokens.GTEQ -> "$0.compareTo($1) >= 0" KtTokens.GTEQ -> "$0.compareTo($1) >= 0"
idea/testData/intentions/operatorToFunction/binaryEqualsEqualsNullableOperands.kt.after
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun foo(a: String?, b: String?) { fun foo(a: String?, b: String?) {
a?.equals(b) ?: b.identityEquals(null) a?.equals(b) ?: b == null
} }
idea/testData/intentions/operatorToFunction/prefixPlus.kt.after
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun foo(a: Int) { fun foo(a: Int) {
a.plus() a.unaryPlus()
} }