Stephan's review comment

eclipse-jdt · Sep 30, 2024 · d716f1e · d716f1e
1 parent d7262c8
commit d716f1e
Show file tree

Hide file tree

Showing 2 changed files with 100 additions and 6 deletions.
diff --git a/...re.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java b/...re.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java
@@ -180,13 +180,9 @@ protected boolean commentParse() {
 			int lastStarPosition = -1;
 
 			// Init scanner position
-			this.markdown = this.source[this.javadocStart + 1] == '/';
 			this.linePtr = getLineNumber(this.firstTagPosition);
-			int realStart = this.javadocStart;
-			if (!this.markdown) {
-				realStart = this.linePtr==1 ? this.javadocStart : this.scanner.getLineEnd(this.linePtr-1)+1;
-				if (realStart < this.javadocStart) realStart = this.javadocStart;
-			}
+			int realStart = this.linePtr==1 ? this.javadocStart : this.scanner.getLineEnd(this.linePtr-1)+1;
+			if (realStart < this.javadocStart) realStart = this.javadocStart;
 			this.scanner.resetTo(realStart, this.javadocEnd);
 			this.index = realStart;
 			if (realStart == this.javadocStart) {
@@ -195,6 +191,7 @@ protected boolean commentParse() {
 			}
 			int previousPosition = this.index;
 			char nextCharacter = 0;
+			this.markdown = this.source[this.javadocStart + 1] == '/';
 			this.markdownHelper = IMarkdownCommentHelper.create(this);
 			if (realStart == this.javadocStart) {
 				nextCharacter = readChar(); // second '*' or '/'

diff --git a/...sts.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MarkdownCommentsTest.java b/...sts.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MarkdownCommentsTest.java
@@ -56,6 +56,7 @@ protected Map getCompilerOptions() {
 		options.put(CompilerOptions.OPTION_EnablePreviews, CompilerOptions.ENABLED);
 		options.put(CompilerOptions.OPTION_DocCommentSupport, this.docCommentSupport);
 		options.put(CompilerOptions.OPTION_ReportInvalidJavadoc, this.reportInvalidJavadoc);
+		options.put(CompilerOptions.OPTION_ReportUnusedImport, CompilerOptions.ERROR);
 		if (!CompilerOptions.IGNORE.equals(this.reportInvalidJavadoc)) {
 			options.put(CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility, this.reportInvalidJavadocVisibility);
 		}
@@ -612,4 +613,100 @@ public static void main(String[] args) {
 			this.reportMissingJavadocTags = bkup;
 		}
 	}
+	public void test022() {
+		String bkup = this.reportMissingJavadocTags;
+		try {
+			this.reportMissingJavadocTags = CompilerOptions.IGNORE;
+			this.runConformTest(new String[] {
+					"X.java",
+					"""
+					import java.lang.annotation.Documented;
+					/**
+					 * Reference type {@link Documented}:
+					 */
+					public class X {
+						public static void main(String[] args) {
+							System.out.println("Hello");
+						}
+					}
+					"""},
+					"Hello");
+		} finally {
+			this.reportMissingJavadocTags = bkup;
+		}
+	}
+	public void test023() {
+		String bkup = this.reportMissingJavadocTags;
+		try {
+			this.reportMissingJavadocTags = CompilerOptions.IGNORE;
+			this.runNegativeTest(new String[] {
+					"X.java",
+					"""
+					import java.lang.annotation.Documented;
+					/**
+					 * Reference type but no reference here - :
+					 */
+					public class X {
+						public static void main(String[] args) {
+							System.out.println("Hello");
+						}
+					}
+					"""},
+					"----------\n" +
+					"1. ERROR in X.java (at line 1)\n" +
+					"	import java.lang.annotation.Documented;\n" +
+					"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
+					"The import java.lang.annotation.Documented is never used\n" +
+					"----------\n");
+		} finally {
+			this.reportMissingJavadocTags = bkup;
+		}
+	}
+	public void test024() {
+		String bkup = this.reportMissingJavadocTags;
+		try {
+			this.reportMissingJavadocTags = CompilerOptions.IGNORE;
+			this.runConformTest(new String[] { "X.java",
+					"""
+					import java.lang.annotation.Documented;
+					///
+					/// Reference type {@link Documented}:
+					///
+					public class X {
+						public static void main(String[] args) {
+							System.out.println("Hello");
+						}
+					}
+					"""},
+					"Hello");
+		} finally {
+			this.reportMissingJavadocTags = bkup;
+		}
+	}
+	public void test025() {
+		String bkup = this.reportMissingJavadocTags;
+		try {
+			this.reportMissingJavadocTags = CompilerOptions.IGNORE;
+			this.runNegativeTest(new String[] { "X.java",
+					"""
+					import java.lang.annotation.Documented;
+					///
+					/// Reference type but no reference here:
+					///
+					public class X {
+						public static void main(String[] args) {
+							System.out.println("Hello");
+						}
+					}
+					"""},
+					"----------\n" +
+					"1. ERROR in X.java (at line 1)\n" +
+					"	import java.lang.annotation.Documented;\n" +
+					"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
+					"The import java.lang.annotation.Documented is never used\n" +
+					"----------\n");
+		} finally {
+			this.reportMissingJavadocTags = bkup;
+		}
+	}
 }