[java-inspections] Blank line should be replaced with <p>: false positive when multiple blank lines before block tag

IDEA-315871

GitOrigin-RevId: 40520ca3deae8894318cd7ef0fde19c9935a4f64

java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocBlankLinesInspection.java

@@ -74,10 +74,7 @@ public class JavadocBlankLinesInspection extends LocalInspectionTool {
   }
 
   private static boolean isBeforeParagraphOrBlockTag(PsiElement element) {
-    PsiElement nextSibling = element.getNextSibling();
-    if (!(nextSibling instanceof PsiDocToken)) return true;
-    if (((PsiDocToken)nextSibling).getTokenType() != JavaDocTokenType.DOC_COMMENT_LEADING_ASTERISKS) return true;
-    nextSibling = nextSibling.getNextSibling();
+    PsiElement nextSibling = skipWhitespacesAndLeadingAsterisksForward(element);
     if (nextSibling == null) return true;
     String text = nextSibling.getText();
     return isNullOrBlockTag(nextSibling) ||
@@ -85,6 +82,16 @@ public class JavadocBlankLinesInspection extends LocalInspectionTool {
            isNullOrBlockTag(nextSibling.getNextSibling());
   }
 
+  private static PsiElement skipWhitespacesAndLeadingAsterisksForward(PsiElement element) {
+    for (PsiElement e = element.getNextSibling(); e != null; e = e.getNextSibling()) {
+      if (!(e instanceof PsiWhiteSpace ||
+            e instanceof PsiDocToken docToken && docToken.getTokenType() == JavaDocTokenType.DOC_COMMENT_LEADING_ASTERISKS)) {
+        return e;
+      }
+    }
+    return null;
+  }
+
   private static boolean startsWithHtmlBlockTag(String text) {
     String startTag = HtmlUtil.getStartTag(text);
     if (startTag == null) return false;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocBlankLines/beforeMultipleBlankLinesBeforeBlockTag.java

@@ -0,0 +1,12 @@
+// "Insert <p>" "false"
+class Test {
+  /**
+   * Answer to the ultimate question of life, the universe, and everything
+   *<caret>
+   *
+   * @return The number 42
+   */
+  int answer() {
+    return 42;
+  }
+}