From ff4d693212367ebe06929fbd79385ce7d5563d9e Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <bas.leijdekkers@jetbrains.com>
Date: Fri, 26 Sep 2025 12:30:24 +0200
Subject: [PATCH] Java: introduce
 PsiArrayInitializerMemberValue.getInitializerCount() (IJ-CR-176760)

GitOrigin-RevId: d2cd802dbb3edff7218517221db96b39840e720a
---
 .../quickfix/MergeDuplicateAttributesFix.java |  6 ++--
 ...wrapArrayInitializerMemberValueAction.java |  4 +--
 .../psi/PsiArrayInitializerMemberValue.java   | 30 +++++++++----------
 .../PsiArrayInitializerMemberValueImpl.java   | 10 +++++++
 .../lang/psi/api/auxiliary/GrListOrMap.java   |  3 +-
 .../GrAnnotationArrayInitializerImpl.java     | 19 +++++++++++-
 .../java/expressions/javaUCallExpressions.kt  |  2 +-
 7 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeDuplicateAttributesFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeDuplicateAttributesFix.java
index 347fe61abc74..180ade153388 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeDuplicateAttributesFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeDuplicateAttributesFix.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.QuickFixBundle;
@@ -33,8 +33,8 @@ public class MergeDuplicateAttributesFix extends PsiUpdateModCommandAction<PsiNa
       PsiAnnotationMemberValue value = attribute.getValue();
       if (value == null) continue;
       CommentTracker ct = new CommentTracker();
-      if (value instanceof PsiArrayInitializerMemberValue) {
-        if (((PsiArrayInitializerMemberValue)value).getInitializers().length != 0) {
+      if (value instanceof PsiArrayInitializerMemberValue memberValue) {
+        if (!memberValue.isEmpty()) {
           PsiElement lBrace = value.getFirstChild();
           PsiElement rBrace = value.getLastChild();
           PsiElement maybeTrailingComma = PsiTreeUtil.skipWhitespacesAndCommentsBackward(rBrace);
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapArrayInitializerMemberValueAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapArrayInitializerMemberValueAction.java
index 9b333b7345d2..13b68fea1632 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapArrayInitializerMemberValueAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapArrayInitializerMemberValueAction.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInsight.intention.impl;
 
 import com.intellij.codeInsight.daemon.QuickFixBundle;
@@ -31,7 +31,7 @@ public class UnwrapArrayInitializerMemberValueAction extends PsiUpdateModCommand
 
   @Override
   protected @Nullable Presentation getPresentation(@NotNull ActionContext context, @NotNull PsiArrayInitializerMemberValue arrayValue) {
-    return arrayValue.getInitializers().length == 1 ? Presentation.of(CommonQuickFixBundle.message("fix.unwrap", myInitializerText)) : null;
+    return arrayValue.getInitializerCount() == 1 ? Presentation.of(CommonQuickFixBundle.message("fix.unwrap", myInitializerText)) : null;
   }
 
   @Override
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiArrayInitializerMemberValue.java b/java/java-psi-api/src/com/intellij/psi/PsiArrayInitializerMemberValue.java
index 3ab2058a721d..1217588439dd 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiArrayInitializerMemberValue.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiArrayInitializerMemberValue.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2009 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.
- */
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.psi;
 
 import org.jetbrains.annotations.NotNull;
@@ -28,4 +14,18 @@ public interface PsiArrayInitializerMemberValue extends PsiAnnotationMemberValue
    * @return the initializer array elements.
    */
   PsiAnnotationMemberValue @NotNull [] getInitializers();
+
+  /**
+   * @return the number of elements in this array initializer expression
+   */
+  default int getInitializerCount() {
+    return getInitializers().length;
+  }
+
+  /**
+   * @return {@code true} if this array initializer member value contains no elements
+   */
+  default boolean isEmpty() {
+    return getInitializerCount() == 0;
+  }
 }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerMemberValueImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerMemberValueImpl.java
index d7f68947c0d0..51658153c24d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerMemberValueImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerMemberValueImpl.java
@@ -21,6 +21,16 @@ public class PsiArrayInitializerMemberValueImpl extends CompositePsiElement impl
     return getChildrenAsPsiElements(ElementType.ANNOTATION_MEMBER_VALUE_BIT_SET, PsiAnnotationMemberValue.ARRAY_FACTORY);
   }
 
+  @Override
+  public int getInitializerCount() {
+    return countChildren(ElementType.ANNOTATION_MEMBER_VALUE_BIT_SET);
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return findChildByType(ElementType.ANNOTATION_MEMBER_VALUE_BIT_SET) == null;
+  }
+
   @Override
   public ASTNode findChildByRole(int role) {
     LOG.assertTrue(ChildRole.isUnique(role));
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/auxiliary/GrListOrMap.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/auxiliary/GrListOrMap.java
index 3aaf3fc53b2d..776da13c9c66 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/auxiliary/GrListOrMap.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/auxiliary/GrListOrMap.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.groovy.lang.psi.api.auxiliary;
 
 import com.intellij.navigation.NavigationItem;
@@ -22,6 +22,7 @@ public interface GrListOrMap extends UserDataHolderEx, Cloneable, Iconable, PsiE
 
   boolean isMap();
 
+  @Override
   boolean isEmpty();
 
   @NotNull
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationArrayInitializerImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationArrayInitializerImpl.java
index 432d7a1545b4..d339ecee0972 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationArrayInitializerImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationArrayInitializerImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.groovy.lang.psi.impl.auxiliary.annotation;
 
 import com.intellij.lang.ASTNode;
@@ -43,6 +43,23 @@ public class GrAnnotationArrayInitializerImpl extends GroovyPsiElementImpl imple
     return result.toArray(new GrAnnotationMemberValue[0]);
   }
 
+  @Override
+  public int getInitializerCount() {
+    int count = 0;
+    for (PsiElement cur = getFirstChild(); cur != null; cur = cur.getNextSibling()) {
+      if (cur instanceof GrAnnotationMemberValue) count++;
+    }
+    return count;
+  }
+
+  @Override
+  public boolean isEmpty() {
+    for (PsiElement cur = getFirstChild(); cur != null; cur = cur.getNextSibling()) {
+      if (cur instanceof GrAnnotationMemberValue) return false;
+    }
+    return true;
+  }
+
   @Override
   public ASTNode addInternal(@NotNull ASTNode first, @NotNull ASTNode last, ASTNode anchor, Boolean before) {
     final GrAnnotationMemberValue[] initializers = getInitializers();
diff --git a/uast/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt b/uast/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt
index 607de22da7a6..ea8844de62da 100644
--- a/uast/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt
+++ b/uast/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt
@@ -303,7 +303,7 @@ class JavaAnnotationArrayInitializerUCallExpression(
   override val valueArgumentCount: Int
     get() {
       if (valueArgumentCountLazy == Int.MIN_VALUE) {
-        valueArgumentCountLazy = sourcePsi.initializers.size
+        valueArgumentCountLazy = sourcePsi.initializerCount
       }
       return valueArgumentCountLazy
     }