From 2a36a8acacf35d07100785c1de3d28b0808d646d Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Mon, 25 May 2020 20:28:05 +0900
Subject: [PATCH] JavaMapForEachInspection: don't report if argument is not
 single

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

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/JavaMapForEachInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/JavaMapForEachInspection.kt
index 52d4e507def..0302b149e61 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/JavaMapForEachInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/JavaMapForEachInspection.kt
@@ -31,6 +31,7 @@ class JavaMapForEachInspection : AbstractApplicabilityBasedInspection<KtDotQuali
         val callExpression = element.callExpression ?: return false
         val calleeExpression = callExpression.calleeExpression ?: return false
         if (calleeExpression.text != "forEach") return false
+        if (callExpression.valueArguments.size != 1) return false
 
         val lambda = callExpression.lambda() ?: return false
         val lambdaParameters = lambda.valueParameters
diff --git a/idea/testData/inspectionsLocal/javaMapForEach/notSingleArgument.kt b/idea/testData/inspectionsLocal/javaMapForEach/notSingleArgument.kt
new file mode 100644
index 00000000000..99dd60b16be
--- /dev/null
+++ b/idea/testData/inspectionsLocal/javaMapForEach/notSingleArgument.kt
@@ -0,0 +1,11 @@
+// PROBLEM: none
+// RUNTIME_WITH_FULL_JDK
+import java.util.concurrent.ConcurrentHashMap
+
+fun test(map: ConcurrentHashMap<Int, String>) {
+    map.<caret>forEach(1) { key, value ->
+        foo(key, value)
+    }
+}
+
+fun foo(i: Int, s: String) {}
\ 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 7a6993a0892..1bde061c43a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
@@ -5160,6 +5160,11 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
         public void testKotlin2() throws Exception {
             runTest("idea/testData/inspectionsLocal/javaMapForEach/kotlin2.kt");
         }
+
+        @TestMetadata("notSingleArgument.kt")
+        public void testNotSingleArgument() throws Exception {
+            runTest("idea/testData/inspectionsLocal/javaMapForEach/notSingleArgument.kt");
+        }
     }
 
     @TestMetadata("idea/testData/inspectionsLocal/kdocMissingDocumentation")