From 4f829583096081071666c51abe10d884d6e8724c Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 28 Oct 2016 16:28:03 +0300
Subject: [PATCH] If then to elvis: do not report inspection if not used as
 expression

(cherry picked from commit 2adcb27)
---
 .../intentions/IfThenToElvisIntention.kt      |  7 +-
 .../ifThenToElvis/inspectionData/expected.xml | 72 -------------------
 2 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
index 42a69b1111e..05aa9378676 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
@@ -29,11 +29,16 @@ import org.jetbrains.kotlin.idea.intentions.replaceFirstReceiver
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsExpression
 import org.jetbrains.kotlin.resolve.calls.callUtil.getType
+import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 
-class IfThenToElvisInspection : IntentionBasedInspection<KtIfExpression>(IfThenToElvisIntention::class)
+class IfThenToElvisInspection : IntentionBasedInspection<KtIfExpression>(
+        IfThenToElvisIntention::class,
+        { it -> it.isUsedAsExpression(it.analyze(BodyResolveMode.PARTIAL)) }
+)
 
 class IfThenToElvisIntention : SelfTargetingOffsetIndependentIntention<KtIfExpression>(
         KtIfExpression::class.java,
diff --git a/idea/testData/intentions/branched/ifThenToElvis/inspectionData/expected.xml b/idea/testData/intentions/branched/ifThenToElvis/inspectionData/expected.xml
index c229a862e9f..9b06f6aa724 100644
--- a/idea/testData/intentions/branched/ifThenToElvis/inspectionData/expected.xml
+++ b/idea/testData/intentions/branched/ifThenToElvis/inspectionData/expected.xml
@@ -7,38 +7,6 @@
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
     <description>Replace 'if' expression with elvis expression</description>
   </problem>
-  <problem>
-    <file>rhsNotEqualsNull.kt</file>
-    <line>9</line>
-    <module>light_idea_test_case</module>
-    <entry_point TYPE="file" FQNAME="temp:///src/src/rhsNotEqualsNull.kt" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
-    <description>Replace 'if' expression with elvis expression</description>
-  </problem>
-  <problem>
-    <file>rhsEqualsNull.kt</file>
-    <line>8</line>
-    <module>light_idea_test_case</module>
-    <entry_point TYPE="file" FQNAME="temp:///src/src/rhsEqualsNull.kt" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
-    <description>Replace 'if' expression with elvis expression</description>
-  </problem>
-  <problem>
-    <file>lhsNotEqualsNull.kt</file>
-    <line>8</line>
-    <module>light_idea_test_case</module>
-    <entry_point TYPE="file" FQNAME="temp:///src/src/lhsNotEqualsNull.kt" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
-    <description>Replace 'if' expression with elvis expression</description>
-  </problem>
-  <problem>
-    <file>lhsEqualsNull.kt</file>
-    <line>8</line>
-    <module>light_idea_test_case</module>
-    <entry_point TYPE="file" FQNAME="temp:///src/src/lhsEqualsNull.kt" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
-    <description>Replace 'if' expression with elvis expression</description>
-  </problem>
   <problem>
     <file>ifAsExpression.kt</file>
     <line>8</line>
@@ -55,30 +23,6 @@
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
     <description>Replace 'if' expression with elvis expression</description>
   </problem>
-  <problem>
-    <file>ifAndElseNotInBlocks.kt</file>
-    <line>8</line>
-    <module>light_idea_test_case</module>
-    <entry_point TYPE="file" FQNAME="temp:///src/src/ifAndElseNotInBlocks.kt" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
-    <description>Replace 'if' expression with elvis expression</description>
-  </problem>
-  <problem>
-    <file>ifAndElseBothInBlocks.kt</file>
-    <line>8</line>
-    <module>light_idea_test_case</module>
-    <entry_point TYPE="file" FQNAME="temp:///src/src/ifAndElseBothInBlocks.kt" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
-    <description>Replace 'if' expression with elvis expression</description>
-  </problem>
-  <problem>
-    <file>doesNotinlineValueOutsideOfScope.kt</file>
-    <line>8</line>
-    <module>light_idea_test_case</module>
-    <entry_point TYPE="file" FQNAME="temp:///src/src/doesNotinlineValueOutsideOfScope.kt" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
-    <description>Replace 'if' expression with elvis expression</description>
-  </problem>
   <problem>
     <file>doesNotInlineVariableInMultiDeclaration.kt</file>
     <line>7</line>
@@ -87,22 +31,6 @@
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
     <description>Replace 'if' expression with elvis expression</description>
   </problem>
-  <problem>
-    <file>doesNotinlineValueIfUsedMoreThanOnce.kt</file>
-    <line>11</line>
-    <module>light_idea_test_case</module>
-    <entry_point TYPE="file" FQNAME="temp:///src/src/doesNotinlineValueIfUsedMoreThanOnce.kt" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
-    <description>Replace 'if' expression with elvis expression</description>
-  </problem>
-  <problem>
-    <file>throwsNPEwithArgument.kt</file>
-    <line>4</line>
-    <module>light_idea_test_case</module>
-    <entry_point TYPE="file" FQNAME="temp:///src/src/throwsNPEwithArgument.kt" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'</problem_class>
-    <description>Replace 'if' expression with elvis expression</description>
-  </problem>
   <problem>
     <file>notIsCheck.kt</file>
     <line>4</line>