Simplify for now works even if no variables are declared inside loop #KT-12145 Fixed

idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyForIntention.kt

@@ -26,12 +26,13 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
 import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
+import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
-import kotlin.collections.forEach as forEachStdLib
+import kotlin.collections.forEach
 
 class SimplifyForInspection : IntentionBasedInspection<KtForExpression>(SimplifyForIntention())
 
@@ -41,13 +42,19 @@ class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
         "Simplify 'for'"
 ) {
     override fun applyTo(element: KtForExpression, editor: Editor?) {
-        val (propertiesToRemove, removeSelectorInLoopRange) = collectPropertiesToRemove(element) ?: return
+        val (usagesToRemove, removeSelectorInLoopRange) = collectUsagesToRemove(element) ?: return
 
         val loopRange = element.loopRange ?: return
         val loopParameter = element.loopParameter ?: return
 
-        loopParameter.replace(KtPsiFactory(element).createDestructuringDeclarationInFor("(${propertiesToRemove.joinToString { it.name!! }})"))
+        val factory = KtPsiFactory(element)
-        propertiesToRemove.forEachStdLib { p -> p.delete() }
+        loopParameter.replace(factory.createDestructuringDeclarationInFor("(${usagesToRemove.joinToString { it.name!! }})"))
+        usagesToRemove.forEach { p ->
+            p.property?.delete()
+            p.usersToReplace.forEach {
+                it.replace(factory.createExpression(p.name!!))
+            }
+        }
 
         if (removeSelectorInLoopRange && loopRange is KtDotQualifiedExpression) {
             loopRange.replace(loopRange.receiverExpression)
@@ -57,15 +64,15 @@ class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
     override fun applicabilityRange(element: KtForExpression): TextRange? {
         if (element.destructuringParameter != null) return null
 
-        val propertiesToRemove = collectPropertiesToRemove(element)
+        val usagesToRemove = collectUsagesToRemove(element)
-        if (propertiesToRemove != null && propertiesToRemove.first.isNotEmpty()) {
+        if (usagesToRemove != null && usagesToRemove.first.isNotEmpty()) {
             return element.loopParameter!!.textRange
         }
         return null
     }
 
     // Note: list should contains properties in order to create destructing declaration
-    private fun collectPropertiesToRemove(element: KtForExpression): Pair<List<KtProperty>, Boolean>? {
+    private fun collectUsagesToRemove(element: KtForExpression): Pair<List<UsageData>, Boolean>? {
         val loopParameter = element.loopParameter ?: return null
 
         val context = element.analyzeFullyAndGetResult().bindingContext
@@ -74,45 +81,41 @@ class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
         val classDescriptor = loopParameterDescriptor.type.constructor.declarationDescriptor as? ClassDescriptor ?: return null
 
         var otherUsages = false
-        var removeSelectorInLoopRange = false
+        val usagesToRemove : Array<UsageData?>
-        val propertiesToRemove: Array<KtProperty?>
 
         if (DescriptorUtils.isSubclass(classDescriptor, classDescriptor.builtIns.mapEntry)) {
             val loopRangeDescriptorName = element.loopRange.getResolvedCall(context)?.resultingDescriptor?.name
-            if (loopRangeDescriptorName != null &&
+            val removeSelectorInLoopRange = loopRangeDescriptorName?.asString().let { it == "entries" || it == "entrySet" }
-                (loopRangeDescriptorName.asString().equals("entries") || loopRangeDescriptorName.asString().equals("entrySet"))) {
-                removeSelectorInLoopRange = true
-            }
 
-            propertiesToRemove = arrayOfNulls<KtProperty>(2)
+            usagesToRemove = arrayOfNulls(2)
 
             ReferencesSearch.search(loopParameter).iterateOverMapEntryPropertiesUsages(
                     context,
-                    { index, property -> propertiesToRemove[index] = property },
+                    { index, usageData -> usagesToRemove[index] += usageData.named(if (index == 0) "key" else "value") },
                     { otherUsages = true }
             )
 
-            if (!otherUsages && propertiesToRemove.all { it != null }) {
+            if (!otherUsages && usagesToRemove.all { it != null && it.name != null}) {
-                return propertiesToRemove.mapNotNull { it } to removeSelectorInLoopRange
+                return usagesToRemove.mapNotNull { it } to removeSelectorInLoopRange
             }
         }
         else if (classDescriptor.isData) {
             val valueParameters = classDescriptor.unsubstitutedPrimaryConstructor?.valueParameters ?: return null
-            propertiesToRemove = arrayOfNulls<KtProperty>(valueParameters.size)
+            usagesToRemove = arrayOfNulls(valueParameters.size)
 
             ReferencesSearch.search(loopParameter).iterateOverDataClassPropertiesUsagesWithIndex(
                     context,
                     classDescriptor,
-                    { index, property -> propertiesToRemove[index] = property },
+                    { index, usageData -> usagesToRemove[index] += usageData.named(valueParameters[index].name.asString()) },
                     { otherUsages = true }
             )
 
             if (otherUsages) return null
 
-            val notNullProperties = propertiesToRemove.filterNotNull()
+            val notNullUsages = usagesToRemove.filterNotNull().filter { it.name != null }
-            val droppedLastUnused = propertiesToRemove.dropLastWhile { it == null }
+            val droppedLastUnused = usagesToRemove.dropLastWhile { it == null }
-            if (droppedLastUnused.size == notNullProperties.size) {
+            if (droppedLastUnused.size == notNullUsages.size) {
-                return notNullProperties to removeSelectorInLoopRange
+                return notNullUsages to false
             }
         }
 
@@ -121,20 +124,20 @@ class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
 
     private fun Query<PsiReference>.iterateOverMapEntryPropertiesUsages(
             context: BindingContext,
-            process: (Int, KtProperty) -> Unit,
+            process: (Int, UsageData) -> Unit,
             cancel: () -> Unit
     ) {
         // TODO: Remove SAM-constructor when KT-11265 will be fixed
         forEach(Processor forEach@{
             val applicableUsage = getDataIfUsageIsApplicable(it, context)
             if (applicableUsage != null) {
-                val (property, descriptor) = applicableUsage
+                val descriptorName = applicableUsage.descriptor.name.asString()
-                if (descriptor.name.asString().equals("key") || descriptor.name.asString().equals("getKey")) {
+                if (descriptorName.equals("key") || descriptorName.equals("getKey")) {
-                    process(0, property)
+                    process(0, applicableUsage)
                     return@forEach true
                 }
-                else if (descriptor.name.asString().equals("value") || descriptor.name.asString().equals("getValue")) {
+                else if (descriptorName.equals("value") || descriptorName.equals("getValue")) {
-                    process(1, property)
+                    process(1, applicableUsage)
                     return@forEach true
                 }
             }
@@ -147,7 +150,7 @@ class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
     private fun Query<PsiReference>.iterateOverDataClassPropertiesUsagesWithIndex(
             context: BindingContext,
             dataClass: ClassDescriptor,
-            process: (Int, KtProperty) -> Unit,
+            process: (Int, UsageData) -> Unit,
             cancel: () -> Unit
     ) {
         val valueParameters = dataClass.unsubstitutedPrimaryConstructor?.valueParameters ?: return
@@ -155,10 +158,9 @@ class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
         forEach(Processor forEach@{
             val applicableUsage = getDataIfUsageIsApplicable(it, context)
             if (applicableUsage != null) {
-                val (property, descriptor) = applicableUsage
                 for (valueParameter in valueParameters) {
-                    if (context.get(BindingContext.VALUE_PARAMETER_AS_PROPERTY, valueParameter) == descriptor) {
+                    if (context.get(BindingContext.VALUE_PARAMETER_AS_PROPERTY, valueParameter) == applicableUsage.descriptor) {
-                        process(valueParameter.index, property)
+                        process(valueParameter.index, applicableUsage)
                         return@forEach true
                     }
                 }
@@ -171,12 +173,37 @@ class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
 
     private fun getDataIfUsageIsApplicable(usage: PsiReference, context: BindingContext): UsageData? {
         val parentCall = usage.element.parent as? KtExpression ?: return null
-        val property = parentCall.parent as? KtProperty ?: return null
+        val userParent = parentCall.parent
+        if (userParent is KtBinaryExpression) {
+            if (userParent.operationToken in KtTokens.ALL_ASSIGNMENTS &&
+                userParent.left === parentCall) return null
+        }
+        if (userParent is KtUnaryExpression) {
+            if (userParent.operationToken === KtTokens.PLUSPLUS || userParent.operationToken === KtTokens.MINUSMINUS) return null
+        }
+
+        val property = parentCall.parent as? KtProperty
         val resolvedCall = parentCall.getResolvedCall(context) ?: return null
 
         val descriptor = resolvedCall.resultingDescriptor
-        return UsageData(property, descriptor)
+        return UsageData(property, parentCall, descriptor)
     }
 
-    private data class UsageData(val property: KtProperty, val descriptor: CallableDescriptor)
+    private data class UsageData(val property: KtProperty?,
+                                 val usersToReplace: List<KtExpression>,
+                                 val descriptor: CallableDescriptor,
+                                 val name: String? = property?.name
+    ) {
+        constructor(property: KtProperty?, user: KtExpression, descriptor: CallableDescriptor):
+                this(property, if (property != null) emptyList() else listOf(user), descriptor)
+
+        fun named(suggested: String) = if (name != null) this else copy(name = suggested)
+    }
+
+    private operator fun UsageData?.plus(newData: UsageData): UsageData {
+        if (this == null) return newData
+        val allUsersToReplace = usersToReplace + newData.usersToReplace
+        if (property != null) return copy(usersToReplace = allUsersToReplace)
+        else return newData.copy(usersToReplace = allUsersToReplace)
+    }
 }

idea/testData/intentions/iterationOverMap/DataClassDependentLocal.kt

@@ -0,0 +1,12 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+
+data class XY(val x: Int, val y: Int)
+fun test(xys: Array<XY>) {
+    for (xy in xys) {
+        val x = xy.x
+        println(x)
+        val y = xy.y + x
+        println(y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassFirstVariable.kt

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for (<caret>xy in xys) {
+        val xx = xy.x
+        println(xx + xy.y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassFirstVariable.kt.after

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for ((xx, y) in xys) {
+        println(xx + y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassNoVariablesInside.kt

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for (<caret>xy in xys) {
+        println(xy.x + xy.y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassNoVariablesInside.kt.after

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for ((x, y) in xys) {
+        println(x + y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassNoVariablesMultiUsages.kt

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for (<caret>xy in xys) {
+        println(xy.x + xy.y + xy?.x + xy?.y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassNoVariablesMultiUsages.kt.after

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for ((x, y) in xys) {
+        println(x + y + x + y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassPropertyBetweenUsages.kt

@@ -0,0 +1,10 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for (<caret>xy in xys) {
+        println(xy.x + xy.y)
+        val xyx = xy.x
+        println(xyx + xy.y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassPropertyBetweenUsages.kt.after

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for ((xyx, y) in xys) {
+        println(xyx + y)
+        println(xyx + y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassSecondVariable.kt

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for (<caret>xy in xys) {
+        val y = xy.y
+        println(xy.x + y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassSecondVariable.kt.after

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for ((x, y) in xys) {
+        println(x + y)
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassWithAssignmentInside.kt

@@ -0,0 +1,9 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+
+data class XY(var x: String, val y: String)
+fun test(xys: Array<XY>) {
+    for (<caret>xy in xys) {
+        xy.x = xy.y
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassWithExternalUsage.kt

@@ -0,0 +1,10 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>, base: XY) {
+    for (<caret>xy in xys) {
+        if (xy.x == base.x) {
+            println(xy.y)
+        }
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassWithExternalUsage.kt.after

@@ -0,0 +1,10 @@
+// WITH_RUNTIME
+
+data class XY(val x: String, val y: String)
+fun test(xys: Array<XY>, base: XY) {
+    for ((x, y) in xys) {
+        if (x == base.x) {
+            println(y)
+        }
+    }
+}

idea/testData/intentions/iterationOverMap/DataClassWithIncrementInside.kt

@@ -0,0 +1,10 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+
+data class XY(var x: Int, var y: Int)
+fun test(xys: Array<XY>) {
+    for (<caret>xy in xys) {
+        xy.x++
+        xy.y--
+    }
+}

idea/testData/intentions/iterationOverMap/MapNoProperties.kt

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun test(map: Map<String, Int>) {
+    for (<caret>entry in map.entries) {
+        if (entry.key == "my_name") println("My index is ${entry.value}")
+    }
+}

idea/testData/intentions/iterationOverMap/MapNoProperties.kt.after

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun test(map: Map<String, Int>) {
+    for ((key, value) in map) {
+        if (key == "my_name") println("My index is ${value}")
+    }
+}

idea/testData/intentions/iterationOverMap/inspectionData/expected.xml

@@ -71,4 +71,68 @@
         <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify 'for' using destructing declaration</problem_class>
         <description>Simplify 'for' using destructing 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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
 </problems>

idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java

@@ -6519,12 +6519,36 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("DataClassDependentLocal.kt")
+        public void testDataClassDependentLocal() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassDependentLocal.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("DataClassFirstNPropertiesUsed.kt")
         public void testDataClassFirstNPropertiesUsed() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassFirstNPropertiesUsed.kt");
             doTest(fileName);
         }
 
+        @TestMetadata("DataClassFirstVariable.kt")
+        public void testDataClassFirstVariable() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassFirstVariable.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("DataClassNoVariablesInside.kt")
+        public void testDataClassNoVariablesInside() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassNoVariablesInside.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("DataClassNoVariablesMultiUsages.kt")
+        public void testDataClassNoVariablesMultiUsages() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassNoVariablesMultiUsages.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("DataClassNotAllPropertiesUsed.kt")
         public void testDataClassNotAllPropertiesUsed() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassNotAllPropertiesUsed.kt");
@@ -6537,12 +6561,42 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("DataClassPropertyBetweenUsages.kt")
+        public void testDataClassPropertyBetweenUsages() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassPropertyBetweenUsages.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("DataClassSecondVariable.kt")
+        public void testDataClassSecondVariable() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassSecondVariable.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("DataClassUnused.kt")
         public void testDataClassUnused() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassUnused.kt");
             doTest(fileName);
         }
 
+        @TestMetadata("DataClassWithAssignmentInside.kt")
+        public void testDataClassWithAssignmentInside() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassWithAssignmentInside.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("DataClassWithExternalUsage.kt")
+        public void testDataClassWithExternalUsage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassWithExternalUsage.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("DataClassWithIncrementInside.kt")
+        public void testDataClassWithIncrementInside() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/DataClassWithIncrementInside.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("EntriesCallIsMissing.kt")
         public void testEntriesCallIsMissing() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/EntriesCallIsMissing.kt");
@@ -6555,6 +6609,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("MapNoProperties.kt")
+        public void testMapNoProperties() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/MapNoProperties.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("OnlyKeyUsed.kt")
         public void testOnlyKeyUsed() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/OnlyKeyUsed.kt");