Skip to content

8312093: Incorrect javadoc comment text #14890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8312093: Incorrect javadoc comment text #14890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,10 @@ protected void scanDocComment() {
return;
}

skip('*');
if (skip('*') != 0 && is('/')) {
return ;
}

skipWhitespace();

if (isEOLN()) {
Expand Down
30 changes: 29 additions & 1 deletion test/langtools/tools/javac/parser/JavacParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*
* @test
* @bug 7073631 7159445 7156633 8028235 8065753 8205418 8205913 8228451 8237041 8253584 8246774 8256411 8256149 8259050 8266436 8267221 8271928 8275097 8293897 8295401 8304671 8310326
* @bug 7073631 7159445 7156633 8028235 8065753 8205418 8205913 8228451 8237041 8253584 8246774 8256411 8256149 8259050 8266436 8267221 8271928 8275097 8293897 8295401 8304671 8310326 8312093
* @summary tests error and diagnostics positions
* @author Jan Lahoda
* @modules jdk.compiler/com.sun.tools.javac.api
Expand Down Expand Up @@ -2420,6 +2420,34 @@ public Void visitClass(ClassTree node, Void p) {
}.scan(cut, null);
}

@Test //JDK-8312093
void testJavadoc() throws IOException {
String code = """
public class Test {
/***/
void main() {
}
}
""";
DiagnosticCollector<JavaFileObject> coll =
new DiagnosticCollector<>();
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, null,
null, Arrays.asList(new MyFileObject(code)));
Trees trees = Trees.instance(ct);
CompilationUnitTree cut = ct.parse().iterator().next();
new TreePathScanner<Void, Void>() {
@Override
public Void visitMethod(MethodTree node, Void p) {
if (!node.getName().contentEquals("main")) {
return null;
}
String comment = trees.getDocComment(getCurrentPath());
assertEquals("Expecting empty comment", "", comment);
return null;
}
}.scan(cut, null);
}

void run(String[] args) throws Exception {
int passed = 0, failed = 0;
final Pattern p = (args != null && args.length > 0)
Expand Down