From dd7d7a5fc717e84b9b2141673b588f22c729b247 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Thu, 6 Oct 2016 14:22:09 +0300
Subject: [PATCH] Destructure inspection: do not apply on variable declarations
 or function literals without explicit parameters + name & severity changed

---
 idea/src/META-INF/plugin.xml                  |  4 +-
 .../idea/intentions/DestructureIntention.kt   |  9 +-
 .../inspectionData/expected.xml               | 88 +++++++++----------
 3 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 0bd9fe2a37d..b3a8e1ea4ec 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1639,11 +1639,11 @@
     />
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.DestructureInspection"
-                     displayName="Can be simplified using destructing declaration"
+                     displayName="Use destructuring declaration"
                      groupName="Kotlin"
                      enabledByDefault="true"
                      cleanupTool="false"
-                     level="WEAK WARNING"
+                     level="INFO"
                      language="kotlin"
     />
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/DestructureIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/DestructureIntention.kt
index d23a70b2f43..e3ece836981 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/DestructureIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/DestructureIntention.kt
@@ -39,11 +39,16 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
 import java.util.*
 
-class DestructureInspection : IntentionBasedInspection<KtDeclaration>(DestructureIntention::class)
+class DestructureInspection : IntentionBasedInspection<KtDeclaration>(
+        DestructureIntention::class,
+        additionalChecker = { declaration ->
+            declaration !is KtVariableDeclaration && declaration !is KtFunctionLiteral
+        }
+)
 
 class DestructureIntention : SelfTargetingRangeIntention<KtDeclaration>(
         KtDeclaration::class.java,
-        "Simplify using destructuring declaration"
+        "Use destructuring declaration"
 ) {
     override fun applyTo(element: KtDeclaration, editor: Editor?) {
         val forLoop = element.parent as? KtForExpression
diff --git a/idea/testData/intentions/iterationOverMap/inspectionData/expected.xml b/idea/testData/intentions/iterationOverMap/inspectionData/expected.xml
index 72952d43106..0bbd043e2c2 100644
--- a/idea/testData/intentions/iterationOverMap/inspectionData/expected.xml
+++ b/idea/testData/intentions/iterationOverMap/inspectionData/expected.xml
@@ -4,175 +4,175 @@
         <line>4</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="SomeQualifiedExpressionInRange.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>Simple.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="Simple.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>PropertiesNames.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="PropertiesNames.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>Getters.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="Getters.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassParametersOrder.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="DataClassParametersOrder.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClass.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="DataClass.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>EntriesCallIsMissing.kt</file>
         <line>6</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="EntriesCallIsMissing.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassFirstNPropertiesUsed.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="DataClassFirstNPropertiesUsed.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>CaretOffset.kt</file>
         <line>6</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="CaretOffset.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassNoVariablesInside.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassNoVariablesInside.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassNoVariablesMultiUsages.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassNoVariablesMultiUsages.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassPropertyBetweenUsages.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassPropertyBetweenUsages.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassSecondVariable.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassSecondVariable.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassWithExternalUsage.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassWithExternalUsage.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassDependentLocal.kt</file>
         <line>6</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassDependentLocal.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassFirstVariable.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassFirstVariable.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>MapNoProperties.kt</file>
         <line>4</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/MapNoProperties.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>ValueOnly.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/ValueOnly.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>KeyOnly.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/KeyOnly.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassNotAllPropertiesUsed.kt</file>
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassNotAllPropertiesUsed.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassLast.kt</file>
         <line>6</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassLast.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
     <problem>
         <file>DataClassNameConflict.kt</file>
         <line>7</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="temp:///src/DataClassNameConflict.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class>
-        <description>Simplify using destructuring declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
+        <description>Use destructuring declaration</description>
     </problem>
 </problems>
\ No newline at end of file