IDEA-121784 (Add on demand static import intention not available when single-member static import present)

java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java

@@ -78,6 +78,7 @@ public class AddOnDemandStaticImportAction extends BaseElementAtCaretIntentionAc
     PsiImportList importList = ((PsiJavaFile)file).getImportList();
     if (importList == null) return null;
     for (PsiImportStaticStatement statement : importList.getImportStaticStatements()) {
+      if (!statement.isOnDemand()) continue;
       PsiClass staticResolve = statement.resolveTargetClass();
       if (psiClass == staticResolve) return null; //already imported
     }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/afterImportPresent.java

@@ -0,0 +1,10 @@
+// "Add on demand static import for 'java.lang.Math'" "true"
+package test;
+
+import static java.lang.Math.*;
+import static java.lang.Math.abs;
+
+public class C {{
+  abs(1.0);
+  max(1, 2);
+}}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/beforeImportPresent.java

@@ -0,0 +1,9 @@
+// "Add on demand static import for 'java.lang.Math'" "true"
+package test;
+
+import static java.lang.Math.abs;
+
+public class C {{
+  abs(1.0);
+  <caret>Math.max(1, 2);
+}}