From 331564d43b272e4dd06e982332b73f73c0a5b602 Mon Sep 17 00:00:00 2001 From: Andrey Cherkasov Date: Tue, 21 Mar 2023 14:30:24 +0400 Subject: [PATCH] [java-inspections] Blank line should be replaced with

: ignore inside {@snippet} block IDEA-311514 GitOrigin-RevId: 4f0b12af678e8049ae02487f22827b91bfa25fe0 --- .../javaDoc/JavadocBlankLinesInspection.java | 2 ++ .../javadocBlankLines/beforeInsideSnippet.java | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocBlankLines/beforeInsideSnippet.java diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocBlankLinesInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocBlankLinesInspection.java index 779a50f62b6e..c95cb49ec0f4 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocBlankLinesInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocBlankLinesInspection.java @@ -14,6 +14,7 @@ import com.intellij.psi.*; import com.intellij.psi.javadoc.PsiDocTag; import com.intellij.psi.javadoc.PsiDocToken; import com.intellij.psi.javadoc.PsiInlineDocTag; +import com.intellij.psi.javadoc.PsiSnippetDocTagBody; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.xml.util.HtmlUtil; import org.jetbrains.annotations.NotNull; @@ -28,6 +29,7 @@ public class JavadocBlankLinesInspection extends LocalInspectionTool { @Override public void visitDocToken(@NotNull PsiDocToken token) { super.visitDocToken(token); + if (token.getParent() instanceof PsiSnippetDocTagBody) return; PsiElement nextWhitespace = token.getNextSibling(); PsiElement prevWhitespace = token.getPrevSibling(); if (token.getTokenType() == JavaDocTokenType.DOC_COMMENT_LEADING_ASTERISKS && diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocBlankLines/beforeInsideSnippet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocBlankLines/beforeInsideSnippet.java new file mode 100644 index 000000000000..d7a9bb4c33c5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocBlankLines/beforeInsideSnippet.java @@ -0,0 +1,12 @@ +// "Insert

" "false" +/** + * {@snippet : + * + * System.out.println(x); + * + * System.out.println(y); + * + * } + */ +class Main { +}