IDEA-71244 (NPE at single-type/single-static import conflict fixed)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImportConflict/UsageMixed.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import x.Base1.D;
+import static <error descr="'D' is already defined in a single-type import">x.Base2.D</error>;
+
+class UsageMixed {
+  void use() {
+    <error descr="Reference to 'D' is ambiguous, both 'x.Base1.D' and 'x.Base2.D' match">D</error>.class.getName();
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImportConflict/x/Base1.java

@@ -19,6 +19,7 @@ public class Base1 {
   public static final int F = 1;
   public static void m(int i) { }
   public static class F { }
+  public static class D { }
   public interface I1 {
     int IF = 1;
   }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImportConflict/x/Base2.java

@@ -19,6 +19,7 @@ public class Base2 extends Base1 {
   public static final float F = 2.0f;
   public static void m(float f) { }
   public static class F { }
+  public static class D { }
   public interface II extends I1, I2 { }
   public enum E { }
 }