Merge pull request #1324 from vl4ds4m/bugfix-1318

Fix MultilineJavadocTagsCheck failing on block comments

Author: yegor256

qulice-checkstyle/src/main/java/com/qulice/checkstyle/MultilineJavadocTagsCheck.java

@@ -113,7 +113,9 @@ private void checkJavaDoc(final String[] lines, final int start,
      * @return Line number with found starting comment or -1 otherwise.
      */
     private static int findCommentStart(final String[] lines, final int start) {
-        return MultilineJavadocTagsCheck.findTrimmedTextUp(lines, start, "/**");
+        final int doc = MultilineJavadocTagsCheck.findTrimmedTextUp(lines, start, "/**");
+        final int comment = MultilineJavadocTagsCheck.findTrimmedTextUp(lines, start, "/*");
+        return Math.max(doc, comment);
     }
 
     /**

qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java

@@ -723,6 +723,17 @@ void allowsStringLiteralsOnBothSideInComparisons()
         this.runValidation("ValidLiteralComparisonCheck.java", true);
     }
 
+    /**
+     * {@link MultilineJavadocTagsCheck} mustn't throw an internal exception,
+     * if it meets a block comment instead of javadoc.
+     * @throws Exception If an internal exception occurs
+     */
+    @Test
+    void rejectsInvalidMethodDocWithoutInternalException()
+        throws Exception {
+        this.runValidation("InvalidMethodDoc.java", false);
+    }
+
     /**
      * Convert file name to URL.
      * @param file The file

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/InvalidMethodDoc.java

@@ -0,0 +1,17 @@
+/*
+ * Hello
+ */
+package foo;
+
+/**
+ * The {@code InvalidMethodDoc#method} comment isn't javadoc, but it's not a reason
+ * to fail {@code MultilineJavadocTagsCheck} validation with an unhandled exception.
+ * @foo bar
+ */
+class InvalidMethodDoc {
+    /*
+     * Run method.
+     */
+    void method() {
+    }
+}