-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8352249: Remove incidental whitespace in traditional doc comments #24032
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
Conversation
|
👋 Welcome back hannesw! A progress list of the required criteria for merging this PR into |
|
@hns This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 72 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
Webrevs
|
liach
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
|
Thanks! /integrate |
|
Going to push as commit a5d06a1.
Your commit was automatically rebased without conflicts. |
Please review a patch to remove incidental indentation from traditional doc comments, comparable to doing a
String.stripIndent()on the comment contents but without special treatment of a last blank line. This adds astripIndent()method to theTokens.Commentinterface and a newJavadocTokenizer.StrippedCommentnested class that implements indentation stripping while maintaining a map of position offsets to the original comment.While the patch changes
javadocoutput by removing leading whitespace, the change is generally not visible in the browser except in<pre>elements, which is the point of this enhancement.The change affects most tree positions in the AST checker tests in javac/doctree, but mostly does not affect the structure of the parsed trees, with the exception of
BreakIteratortests inFirstSentenceTest.java.BreakIteratordoes not recognize.\nimmediately followed by a lower case letter as sentence break, while it recognizes the break if the letter is an upper-case letter or if there is a space between the line break and the letter. I find this rule a bit peculiar but AFAICT we can't influence the behavior ofBreakIterator, so I have added tests that cover both lower and upper-case behavior.The source position lookup in the stripped comment is implemented by creating a new
OffsetMapthat translates from the stripped to the original comment, then using the original comment'sOffsetMapto translate the position to the source file.OffsetMapis relatively lightweight (usually 2int[]elements per comment paragraph), so the added overhead is not too bad.Inspired by JDK-8305688 I did various test builds with restricted jobs and memory settings, but didn't notice any change in processing or memory overhead to API docs builds.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24032/head:pull/24032$ git checkout pull/24032Update a local copy of the PR:
$ git checkout pull/24032$ git pull https://git.openjdk.org/jdk.git pull/24032/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 24032View PR using the GUI difftool:
$ git pr show -t 24032Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24032.diff
Using Webrev
Link to Webrev Comment