From 3ff5c95419e0aa7a123899f445fcf6632ea95067 Mon Sep 17 00:00:00 2001
From: Kirill Rakhman <kirill.rakhman@gmail.com>
Date: Fri, 21 Jul 2017 16:17:43 +0300
Subject: [PATCH] Improve inspection message for NullableBooleanElvisInspection

Also report as "should" or "can" depending on severity
So #KT-19006 Fixed
---
 idea/src/META-INF/plugin.xml                  |  2 +-
 .../NullableBooleanElvisInspection.kt         |  8 ++++---
 .../inspectionData/expected.xml               | 24 +++++++++----------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index ed583973293..775d0fb9b93 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -2305,7 +2305,7 @@
     />
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.NullableBooleanElvisInspection"
-                     displayName="Equality check can be used instead of elvis"
+                     displayName="Equality check can be used instead of elvis for nullable boolean check"
                      groupPath="Kotlin"
                      groupName="Style issues"
                      enabledByDefault="true"
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/NullableBooleanElvisInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/NullableBooleanElvisInspection.kt
index ec8aab57b8c..bebf323fec4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/NullableBooleanElvisInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/NullableBooleanElvisInspection.kt
@@ -50,11 +50,13 @@ class NullableBooleanElvisInspection : AbstractKotlinInspection(), CleanupLocalI
                             is KtWhileExpressionBase -> parentIfOrWhile.condition
                             else -> null
                         }
-                        val highlightType =
-                                if (condition != null && condition in expression.parentsWithSelf) GENERIC_ERROR_OR_WARNING else INFORMATION
+                        val (highlightType, verb) = if (condition != null && condition in expression.parentsWithSelf)
+                            GENERIC_ERROR_OR_WARNING to "should"
+                        else
+                            INFORMATION to "can"
 
                         holder.registerProblem(expression,
-                                               "Equality check can be used instead of elvis",
+                                               "Equality check $verb be used instead of elvis for nullable boolean check",
                                                highlightType,
                                                ReplaceWithEqualityCheckFix())
                     }
diff --git a/idea/testData/inspections/nullableBooleanElvis/inspectionData/expected.xml b/idea/testData/inspections/nullableBooleanElvis/inspectionData/expected.xml
index ed949048701..a02ffb07bb0 100644
--- a/idea/testData/inspections/nullableBooleanElvis/inspectionData/expected.xml
+++ b/idea/testData/inspections/nullableBooleanElvis/inspectionData/expected.xml
@@ -4,48 +4,48 @@
         <line>4</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="test.kt"/>
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis</problem_class>
-        <description>Equality check can be used instead of elvis</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis for nullable boolean check</problem_class>
+        <description>Equality check should be used instead of elvis for nullable boolean check</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>7</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="test.kt"/>
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis</problem_class>
-        <description>Equality check can be used instead of elvis</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis for nullable boolean check</problem_class>
+        <description>Equality check should be used instead of elvis for nullable boolean check</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>10</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="test.kt"/>
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis</problem_class>
-        <description>Equality check can be used instead of elvis</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis for nullable boolean check</problem_class>
+        <description>Equality check should be used instead of elvis for nullable boolean check</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>10</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="test.kt"/>
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis</problem_class>
-        <description>Equality check can be used instead of elvis</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis for nullable boolean check</problem_class>
+        <description>Equality check should be used instead of elvis for nullable boolean check</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>13</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="test.kt"/>
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis</problem_class>
-        <description>Equality check can be used instead of elvis</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis for nullable boolean check</problem_class>
+        <description>Equality check can be used instead of elvis for nullable boolean check</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>14</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="test.kt"/>
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis</problem_class>
-        <description>Equality check can be used instead of elvis</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Equality check can be used instead of elvis for nullable boolean check</problem_class>
+        <description>Equality check can be used instead of elvis for nullable boolean check</description>
     </problem>
 
 </problems>
\ No newline at end of file