From afc680d5c94ccb0425821ae25f21c7f0f0592a90 Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Fri, 29 Nov 2019 14:04:43 +0900
Subject: [PATCH] JavaMapForEachInspection: do not report when lambda parameter
 is destructuring declaration

#KT-34511 Fixed
---
 .../idea/inspections/JavaMapForEachInspection.kt       |  3 ++-
 .../javaMapForEach/destructuringDeclaration.kt         | 10 ++++++++++
 .../idea/inspections/LocalInspectionTestGenerated.java |  5 +++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/inspectionsLocal/javaMapForEach/destructuringDeclaration.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/JavaMapForEachInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/JavaMapForEachInspection.kt
index 1e211b781f4..1c71c979eeb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/JavaMapForEachInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/JavaMapForEachInspection.kt
@@ -32,7 +32,8 @@ class JavaMapForEachInspection : AbstractApplicabilityBasedInspection<KtDotQuali
         if (calleeExpression.text != "forEach") return false
 
         val lambda = callExpression.lambda() ?: return false
-        if (lambda.valueParameters.size != 2) return false
+        val lambdaParameters = lambda.valueParameters
+        if (lambdaParameters.size != 2 || lambdaParameters.any { it.destructuringDeclaration != null }) return false
 
         val context = element.analyze(BodyResolveMode.PARTIAL)
         if (!element.receiverExpression.getType(context).isMap(DefaultBuiltIns.Instance)) return false
diff --git a/idea/testData/inspectionsLocal/javaMapForEach/destructuringDeclaration.kt b/idea/testData/inspectionsLocal/javaMapForEach/destructuringDeclaration.kt
new file mode 100644
index 00000000000..649141527ff
--- /dev/null
+++ b/idea/testData/inspectionsLocal/javaMapForEach/destructuringDeclaration.kt
@@ -0,0 +1,10 @@
+// PROBLEM: none
+// RUNTIME_WITH_FULL_JDK
+fun test(map: Map<Int, String>) {
+    val mapOfPairs = mapOf<Pair<Int, Int>, Int>()
+    mapOfPairs.<caret>forEach { (first, second), value ->
+        println(first)
+        println(second)
+        println(value)
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
index da20465094f..2dbfaf32f28 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
@@ -5066,6 +5066,11 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/inspectionsLocal/javaMapForEach"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), null, true);
         }
 
+        @TestMetadata("destructuringDeclaration.kt")
+        public void testDestructuringDeclaration() throws Exception {
+            runTest("idea/testData/inspectionsLocal/javaMapForEach/destructuringDeclaration.kt");
+        }
+
         @TestMetadata("java.kt")
         public void testJava() throws Exception {
             runTest("idea/testData/inspectionsLocal/javaMapForEach/java.kt");