ensure inserted single-static-import when conflicting on-demand imports are presented (IDEA-155031)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/AllowSingleStaticImportWhenOnDemandImportOverloadedMethod.java

@@ -0,0 +1,12 @@
+package use;
+
+import foo.Bar;
+
+import static foo.Foo.*;
+
+public class Test {
+  void test() {
+    foo(1);
+    Bar.<caret>foo("1");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/AllowSingleStaticImportWhenOnDemandImportOverloadedMethod_after.java

@@ -0,0 +1,14 @@
+package use;
+
+import foo.Bar;
+import foo.Foo;
+
+import static foo.Bar.foo;
+import static foo.Foo.*;
+
+public class Test {
+  void test() {
+    Foo.foo(1);
+    foo("1");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/ProhibitWhenMethodWithIdenticalSignatureAlreadyImportedFromAnotherClass.java

@@ -0,0 +1,12 @@
+package use;
+
+import foo.Bar;
+
+import static foo.Foo.foo;
+
+public class Test {
+  void test() {
+    foo(1);
+    Bar.<caret>foo("1");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/SingleImportWhenConflictingWithOnDemand.java

@@ -0,0 +1,11 @@
+
+import foo.Foo;
+
+import static foo.Bar.foo;
+import static foo.Foo.*;
+class Test {
+  void test() {
+    Foo.f<caret>oo(1);
+    foo("1");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/SingleImportWhenConflictingWithOnDemand_after.java

@@ -0,0 +1,13 @@
+
+import foo.Foo;
+
+import static foo.Bar.foo;
+import static foo.Foo.*;
+import static foo.Foo.foo;
+
+class Test {
+  void test() {
+    foo(1);
+    foo("1");
+  }
+}