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

Fix IfThenToSafeAccessIntention broken by refactoring

Browse Source 
Broken in 66c5717adc
This commit is contained in:
Simon Ogorodnik
2017-05-24 18:25:15 +03:00
parent 87e3725306
commit d617b1d869
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
+5 -6
View File
@@ -69,11 +69,10 @@ class IfThenToSafeAccessIntention : SelfTargetingOffsetIndependentIntention<KtIf
}
}
private fun IfThenToSelectData.clausesReplaceableBySafeCall(): Boolean {
if (baseClause == null) return false
if (negatedClause == null && baseClause.isUsedAsExpression(context)) return false
if (negatedClause != null && !negatedClause.isNullExpression()) return false
return baseClause.evaluatesTo(receiverExpression) ||
baseClause.hasFirstReceiverOf(receiverExpression) && !baseClause.hasNullableType(context)
private fun IfThenToSelectData.clausesReplaceableBySafeCall(): Boolean = when {
baseClause == null -> false
negatedClause == null && baseClause.isUsedAsExpression(context) -> false
negatedClause != null && !negatedClause.isNullExpression() -> false
else -> baseClause.evaluatesTo(receiverExpression) || baseClause.hasFirstReceiverOf(receiverExpression)
}
}