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

JDK-8305620: Missing break in DocCommentParser inlineWord() #13343

Conversation

jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented Apr 4, 2023

Please review a fix for the depth counting in DocCommentParser inlineWord.
There was a missing break that caused the count to go high, and because of that the code for the down count needed to be adjusted as well.

The test is modified to be stylistically more like the others with abc and def surrounding the {@index...} tag. This looks like it may have been a typo, and helped hide the counting issue.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8305620: Missing break in DocCommentParser inlineWord()

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13343/head:pull/13343
$ git checkout pull/13343

Update a local copy of the PR:
$ git checkout pull/13343
$ git pull https://git.openjdk.org/jdk.git pull/13343/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13343

View PR using the GUI difftool:
$ git pr show -t 13343

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13343.diff

Webrev

Link to Webrev Comment

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 4, 2023

👋 Welcome back jjg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 5, 2023
@openjdk
Copy link

openjdk bot commented Apr 5, 2023

@jonathan-gibbons The following labels will be automatically applied to this pull request:

  • compiler
  • javadoc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added javadoc javadoc-dev@openjdk.org compiler compiler-dev@openjdk.org labels Apr 5, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 5, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 5, 2023

@jonathan-gibbons 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:

8305620: Missing `break` in DocCommentParser `inlineWord()`

Reviewed-by: iris

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 2 new commits pushed to the master branch:

  • ed9592c: 8305113: (tz) Update Timezone Data to 2023c
  • 15fa78e: 8305237: CompilerDirectives DCmds permissions correction

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 5, 2023
@jonathan-gibbons
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 5, 2023

Going to push as commit 022290b.
Since your change was applied there have been 13 commits pushed to the master branch:

  • 2e59d21: 8305659: ProblemList com/sun/jdi/PopAndInvokeTest.java with virtual threads
  • f69d88c: 8301616: Drag & maximize to another monitor places window incorrectly (Windows)
  • a3137c7: 8305646: compile error on Alpine with gcc12 after 8298619 in libGetXSpace.c
  • 78ff454: 8305490: CommandProcessor command "dumpclass" produces classes with invalid field descriptors
  • 9f587d2: 8305644: IGV: Node text not updated when switching from/to CFG view
  • 4bf1987: 8296454: System.console() shouldn't return null in jshell
  • 2aec910: 8304883: Record Deconstruction causes bytecode error
  • 0e0c022: 8305356: Fix ignored bad CompileCommands in tests
  • b659c35: 8068824: Exception thrown in JTableHeader after clicking on popupmenu opened with right-click on header
  • 83a924a: 8304042: C2 SuperWord: schedule must remove packs with cyclic dependencies
  • ... and 3 more: https://git.openjdk.org/jdk/compare/7cf24d1c06142a3bab9cce5cd0ba34b8bbccf00f...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 5, 2023
@openjdk openjdk bot closed this Apr 5, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 5, 2023
@openjdk
Copy link

openjdk bot commented Apr 5, 2023

@jonathan-gibbons Pushed as commit 022290b.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@jonathan-gibbons jonathan-gibbons deleted the 8305620.dcp-inlineWord branch April 5, 2023 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org integrated Pull request has been integrated javadoc javadoc-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

None yet

2 participants