Skip to content
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.

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

8341907: javac -Xlint should ignore /// on first line of source file #21923

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public enum LintCategory {
CLASSFILE("classfile"),

/**
* Warn about"dangling" documentation comments,
* Warn about "dangling" documentation comments,
* not attached to any declaration.
*/
DANGLING_DOC_COMMENTS("dangling-doc-comments"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -667,14 +667,23 @@ void reportDanglingDocComment(Comment c) {
var pos = c.getPos();
if (pos != null) {
deferredLintHandler.report(lint -> {
if (lint.isEnabled(Lint.LintCategory.DANGLING_DOC_COMMENTS)) {
if (lint.isEnabled(Lint.LintCategory.DANGLING_DOC_COMMENTS) &&
!shebang(c, pos)) {
log.warning(Lint.LintCategory.DANGLING_DOC_COMMENTS,
pos, Warnings.DanglingDocComment);
}
});
}
}

/** Returns true for a comment that acts similarly to shebang in UNIX */
private boolean shebang(Comment c, JCDiagnostic.DiagnosticPosition pos) {
var src = log.currentSource();
return c.getStyle() == Comment.CommentStyle.JAVADOC_LINE &&
c.getPos().getStartPosition() == 0 &&
src.getLineNumber(pos.getEndPosition(src.getEndPosTable())) == 1;
}

/**
* Ignores any recent documentation comments found by the scanner,
* such as those that cannot be associated with a nearby declaration.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
///usr/bin/env jbang "$0" "$@" ; exit $?
// /nodynamiccopyright/

/** A class comment */
public class JBangException1 {

/**
* A method comment
*
* @param args a parameter comment
*/
public static void main(String[] args) {
if (args.length == 0) {
System.out.println("Hello World!");
} else {
System.out.println("Hello " + args[0]);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
JBangException2.java:1:1: compiler.warn.dangling.doc.comment
1 warning
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/** /usr/bin/env jbang "$0" "$@" ; exit $? */
// /nodynamiccopyright/

/** A class comment */
public class JBangException2 {

/**
* A method comment
*
* @param args a parameter comment
*/
public static void main(String[] args) {
if (args.length == 0) {
System.out.println("Hello World!");
} else {
System.out.println("Hello " + args[0]);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
JBangException3.java:1:1: compiler.warn.dangling.doc.comment
1 warning
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/// A
/// multiline
/// dangling
/// comment
// /nodynamiccopyright/

/** A class comment */
public class JBangException3 {

/**
* A method comment
*
* @param args a parameter comment
*/
public static void main(String[] args) {
if (args.length == 0) {
System.out.println("Hello World!");
} else {
System.out.println("Hello " + args[0]);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

/*
* @test
*
* @compile/ref=empty.out -XDrawDiagnostics JBangException1.java
* @compile/ref=empty.out -XDrawDiagnostics -Xlint:dangling-doc-comments JBangException1.java
*
* @compile/ref=empty.out -XDrawDiagnostics JBangException2.java
* @compile/ref=JBangException2.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments JBangException2.java
*
* @compile/ref=empty.out -XDrawDiagnostics JBangException3.java
* @compile/ref=JBangException3.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments JBangException3.java
*/

// The classes being tested reside in files separate from this one because
// the classes need to provide the initial dangling comment, which would
// otherwise interfere with the JTReg test comment. For similar reasons,
// the files with test classes do __NOT__ have a copyright header.
Comment on lines +39 to +40
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, the normal guidance for source files that cannot follow standard stylistic guidance (such as files with tabs etc) is to dynamically generate the files, which is medium easy these days using text blocks. That being said, that advice does not work well in this case because the jtreg infrastructure for @compile tags does not work for generated files.

In this case, I would recommend working the text string nodynamiccopyright into the head of the two JBang files. There are two or three possibilities.

  1. Just put the word nodynamiccopyright at the end of the first line. Syntactically, it would be a command name, but such a command would never be executed after the exit statement.
  2. Put a comment #nodynamiccopyright at the end of the first line.
  3. Put a separate Java comment on the second line, using either an end-of-line comment or traditional comment. It might then be reasonably detected and taken into account by any automated scripts that ensure copyright headers are present unless that keyword is present.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Number 3 seems to be the cleanest. I'll try it; thanks.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, but since we're not testing the files here with JBang, all that matters is the recognition of the overall comment, regardless of its content. But #3 is OK too. The main thing is to have the keyword present so that any checkers scripts have explicit evidence that no comment is intended in these files.