From 0a8006a3951055805ae349da50512c248f1c40f2 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 30 Sep 2016 18:26:01 +0300
Subject: [PATCH] Minor: destructing --> destructuring in SimplifyForIntention

---
 .../idea/intentions/SimplifyForIntention.kt   |  4 +-
 .../inspectionData/expected.xml               | 88 +++++++++----------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyForIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyForIntention.kt
index 4feae149846..94df5896676 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyForIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyForIntention.kt
@@ -42,7 +42,7 @@ class SimplifyForInspection : IntentionBasedInspection<KtForExpression>(Simplify
 
 class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
         KtForExpression::class.java,
-        "Simplify 'for' using destructing declaration",
+        "Simplify 'for' using destructuring declaration",
         "Simplify 'for'"
 ) {
     override fun applyTo(element: KtForExpression, editor: Editor?) {
@@ -80,7 +80,7 @@ class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
         return null
     }
 
-    // Note: list should contains properties in order to create destructing declaration
+    // Note: list should contains properties in order to create destructuring declaration
     private fun collectUsagesToRemove(element: KtForExpression): Pair<List<UsageData>, Boolean>? {
         val loopParameter = element.loopParameter ?: return null
 
diff --git a/idea/testData/intentions/iterationOverMap/inspectionData/expected.xml b/idea/testData/intentions/iterationOverMap/inspectionData/expected.xml
index dacd983c223..6d786761c89 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">Simplify 'for' using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">Simplify 'for' using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">Simplify 'for' using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">Simplify 'for' using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">Simplify 'for' using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">Simplify 'for' using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">Simplify 'for' using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">Simplify 'for' using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">Simplify 'for' using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using 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">'for' that can be simplified using destructing declaration</problem_class>
-        <description>Simplify 'for' using destructing declaration</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'for' that can be simplified using destructuring declaration</problem_class>
+        <description>Simplify 'for' using destructuring declaration</description>
     </problem>
 </problems>
\ No newline at end of file