IDEA-224546 "Cannot annotate with both @NotNull and @NotNull" warning

GitOrigin-RevId: 28ff56adebd81918856c5a562cda051e52a33c32

java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java

@@ -334,7 +334,9 @@ public abstract class NullableNotNullManager {
                                : findAnnotation(owner, qualifiedNames);
     PsiType type = getOwnerType(owner);
     if (memberAnno != null) {
-      return preferTypeAnnotation(memberAnno, type);
+      PsiAnnotation annotation = preferTypeAnnotation(memberAnno, type);
+      if (annotation != memberAnno && !qualifiedNames.contains(annotation.getQualifiedName())) return null;
+      return annotation;
     }
     if (type != null) {
       return ContainerUtil.find(type.getAnnotations(), a -> qualifiedNames.contains(a.getQualifiedName()));

java/java-tests/testData/inspection/nullableProblems/AnnotatingArrayAmbiguous.java

@@ -0,0 +1,3 @@
+interface Y {
+    @withTypeUse.Nullable Object @withTypeUse.NotNull [] arr();
+}

java/java-tests/testSrc/com/intellij/java/codeInspection/NullableStuffInspectionTest.java

@@ -69,6 +69,11 @@ public class NullableStuffInspectionTest extends LightJavaCodeInsightFixtureTest
     doTest();
   }
 
+  public void testAnnotatingArrayAmbiguous() {
+    DataFlowInspection8Test.setupAmbiguousAnnotations("withTypeUse", myFixture);
+    doTest();
+  }
+
   public void testProblems2() { doTest(); }
   public void testNullableFieldNotnullParam() { doTest(); }
   public void testNotNullFieldNullableParam() { doTest(); }