From 324e0f1dd1aa8f9cbd1c940d942e43ac31cc1ea9 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Sun, 4 Jun 2017 11:23:32 +0200
Subject: [PATCH] IG: highlight all argument problems, not just the first
 (IDEA-172286)

---
 .../siyeh/ig/bugs/MalformedFormatStringInspectionBase.java | 1 -
 .../malformed_format_string/MalformedFormatString.java     | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MalformedFormatStringInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MalformedFormatStringInspectionBase.java
index 79a7f68c2eed..907555f8a1b6 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MalformedFormatStringInspectionBase.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MalformedFormatStringInspectionBase.java
@@ -176,7 +176,6 @@ public class MalformedFormatStringInspectionBase extends BaseInspection {
         }
         if (validator != null && !validator.valid(argumentType)) {
           registerError(argument, validators, Integer.valueOf(argumentCount), argumentType, validator);
-          return;
         }
       }
     }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/malformed_format_string/MalformedFormatString.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/malformed_format_string/MalformedFormatString.java
index dd2591ad2013..383176e969b8 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/malformed_format_string/MalformedFormatString.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/malformed_format_string/MalformedFormatString.java
@@ -117,6 +117,13 @@ public class MalformedFormatString {
         System.out.printf("%c %<C", '\u00A9');
         System.out.printf("%o %<o", 15);
     }
+
+    private int count1;
+    private int count2;
+
+    public String highlightBothArguments() {
+        return String.format("count 1: %f, count 2: %f", <warning descr="Argument type 'int' does not match the type of the format specifier '%f'">count1</warning>, <warning descr="Argument type 'int' does not match the type of the format specifier '%f'">count2</warning>);
+    }
 }
 class A {
     void m(Formattable f) {