From 326d8507601b5407159e05e6019d9b9c4482469f Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Thu, 11 May 2017 19:59:51 +0300
Subject: [PATCH] Use "if-then to" even for 'if (arg != null) arg' removing
 'if'

---
 .../intentions/IfThenToSafeAccessIntention.kt            | 9 +++++++--
 .../ifThenToSafeAccess/inspectionData/expected.xml       | 8 ++++++++
 .../branched/ifThenToSafeAccess/nullCheckSimple.kt       | 2 --
 .../branched/ifThenToSafeAccess/nullCheckSimple.kt.after | 3 +++
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt.after

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
index 556481bb22b..224a72b95ba 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
@@ -41,7 +41,12 @@ class IfThenToSafeAccessIntention : SelfTargetingOffsetIndependentIntention<KtIf
         val ifThenToSelectData = element.buildSelectTransformationData() ?: return false
         if (!ifThenToSelectData.receiverExpression.isStableVariable(ifThenToSelectData.context)) return false
         if (ifThenToSelectData.baseClause !is KtDotQualifiedExpression) {
-            text = "Replace 'if' expression with safe cast expression"
+            if (ifThenToSelectData.condition is KtIsExpression) {
+                text = "Replace 'if' expression with safe cast expression"
+            }
+            else {
+                text = "Remove redundant 'if' expression"
+            }
         }
 
         return ifThenToSelectData.clausesReplaceableBySafeCall()
@@ -66,7 +71,7 @@ class IfThenToSafeAccessIntention : SelfTargetingOffsetIndependentIntention<KtIf
 
     private fun IfThenToSelectData.clausesReplaceableBySafeCall(): Boolean {
         if (baseClause == null || negatedClause != null && !negatedClause.isNullExpression()) return false
-        return baseClause.evaluatesTo(receiverExpression) && condition !is KtBinaryExpression ||
+        return baseClause.evaluatesTo(receiverExpression) ||
                baseClause.hasFirstReceiverOf(receiverExpression) && !baseClause.hasNullableType(context)
     }
 }
diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/expected.xml b/idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/expected.xml
index 233ae39a730..97907791cc2 100644
--- a/idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/expected.xml
+++ b/idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/expected.xml
@@ -135,4 +135,12 @@
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
     <description>Replace 'if' expression with safe cast expression</description>
   </problem>
+  <problem>
+    <file>nullCheckSimple.kt</file>
+    <line>2</line>
+    <module>light_idea_test_case</module>
+    <entry_point TYPE="file" FQNAME="temp:///src/nullCheckSimple.kt" />
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
+    <description>Remove redundant 'if' expression</description>
+  </problem>
 </problems>
diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt b/idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt
index 3072b7bb38d..801539f5d9e 100644
--- a/idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt
+++ b/idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt
@@ -1,5 +1,3 @@
-// IS_APPLICABLE: false
-
 fun foo(arg: Any?): Any? {
     return if (<caret>arg != null) arg else null
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt.after b/idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt.after
new file mode 100644
index 00000000000..5ee1caaf8ef
--- /dev/null
+++ b/idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt.after
@@ -0,0 +1,3 @@
+fun foo(arg: Any?): Any? {
+    return arg
+}
\ No newline at end of file