From e89621e5a3a54fc2703cc0b7dfcca3b410aad349 Mon Sep 17 00:00:00 2001 From: Ivan Babushkin Date: Sat, 30 Nov 2024 00:03:16 +0300 Subject: [PATCH] Issue #13213: Remove //ok comments from javadoctagcontinuationindentation --- config/checkstyle-input-suppressions.xml | 18 ------------------ ...InputJavadocTagContinuationIndentation.java | 2 +- ...adocTagContinuationIndentationBlockTag.java | 14 +++++++------- ...tinuationIndentationGuavaFalsePositive.java | 2 +- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/config/checkstyle-input-suppressions.xml b/config/checkstyle-input-suppressions.xml index 31ec1a72fe4..27b6dd173b9 100644 --- a/config/checkstyle-input-suppressions.xml +++ b/config/checkstyle-input-suppressions.xml @@ -433,24 +433,6 @@ files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/> - - - - - - - - - Testing javadoc with spanning tag {@linkplain #DEFAULT default mapping - * factory}.

// ok + * factory}.

*/ interface FooIn2 {} class ShortNextLine { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationBlockTag.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationBlockTag.java index 153db76826c..a36ff0d4a84 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationBlockTag.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationBlockTag.java @@ -50,7 +50,7 @@ public void partialIndent(int x) { * * @param x input * @return itself - * */ // ok + * */ public int identity(int x) { return x; } @@ -58,9 +58,9 @@ public int identity(int x) { /** * Javadoc. * - * @param args // ok + * @param args * {@code this} line is not correctly indented // violation - * {@code this} // ok + * {@code this} *
this line is not correctly indented
// violation */ public void multipleLines1(String args) { @@ -70,7 +70,7 @@ public void multipleLines1(String args) { /** * Javadoc. * - * @return false always // ok + * @return false always * {@code this} line is not correctly indented // violation * {@code this} line is not correctly indented // violation *
this line is not correctly indented
// violation @@ -98,12 +98,12 @@ public boolean isMultipleLines2() { *
  • cvsroot
  • // violation *
  • noexec
  • // violation *
  • - * another item // ok + * another item *
  • - *
  • yet another item
  • // ok + *
  • yet another item
  • * // violation * some text word more text. // violation - * some text word more text. // ok + * some text word more text. */ public String regressionNestedHtml(CharSequence c) { return ""; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationGuavaFalsePositive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationGuavaFalsePositive.java index 6006ca3266c..f2b72951710 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationGuavaFalsePositive.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationGuavaFalsePositive.java @@ -13,7 +13,7 @@ class InputJavadocTagContinuationIndentationGuavaFalsePositive { /** - * This class implements the GWT serialization of {@link HashMultimap}. // ok + * This class implements the GWT serialization of {@link HashMultimap}. * * @author Jord Sonneveld *