From 18c19457f03e42a0b74112f96c123fcd76521c87 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 26 May 2015 17:44:00 +0300 Subject: [PATCH] DeprecatedSymbolUsageFix: handling of array access expression duplication --- .../kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt index 56428c2cf0e..4cf42cc5f71 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt @@ -279,13 +279,11 @@ public abstract class DeprecatedSymbolUsageFixBase( is JetStringTemplateExpression -> getEntries().any { if (sideEffectOnly) it.getExpression().shouldKeepValue(usageCount) else it is JetStringTemplateEntryWithExpression } is JetThisExpression, is JetSuperExpression, is JetConstantExpression -> false is JetParenthesizedExpression -> getExpression().shouldKeepValue(usageCount) - - // TODO: discuss it + is JetArrayAccessExpression -> if (sideEffectOnly) getArrayExpression().shouldKeepValue(usageCount) || getIndexExpressions().any { it.shouldKeepValue(usageCount) } else true is JetBinaryExpression -> if (sideEffectOnly) getLeft().shouldKeepValue(usageCount) || getRight().shouldKeepValue(usageCount) else true is JetIfExpression -> if (sideEffectOnly) getCondition().shouldKeepValue(usageCount) || getThen().shouldKeepValue(usageCount) || getElse().shouldKeepValue(usageCount) else true is JetBinaryExpressionWithTypeRHS -> true - - else -> true // what else it can be? + else -> true } }