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

8278068: Fix next-line modifier (snippet markup) #6739

Closed
wants to merge 3 commits into from

Conversation

pavelrappo
Copy link
Member

@pavelrappo pavelrappo commented Dec 7, 2021

This PR fixes three interrelated issues:


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issues

  • JDK-8278068: Fix next-line modifier (snippet markup)
  • JDK-8277027: Treat unrecognized markup as snippet text, but warn about it

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6739/head:pull/6739
$ git checkout pull/6739

Update a local copy of the PR:
$ git checkout pull/6739
$ git pull https://git.openjdk.java.net/jdk pull/6739/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6739

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6739.diff

pavelrappo added 2 commits Dec 7, 2021
This fixes misplaced "unterminated attribute value" diagnostics. (Accidentally found while fixing the surrounding code.)
@pavelrappo
Copy link
Member Author

@pavelrappo pavelrappo commented Dec 7, 2021

/issue add JDK-8277027

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 7, 2021

👋 Welcome back prappo! 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 label Dec 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2021

@pavelrappo
Adding additional issue to issue list: 8277027: Treat unrecognized markup as snippet text, but warn about it.

@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2021

@pavelrappo The following label will be automatically applied to this pull request:

  • javadoc

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

@openjdk openjdk bot added the javadoc label Dec 7, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 7, 2021

Webrevs

Copy link
Contributor

@jonathan-gibbons jonathan-gibbons left a comment

Primary quibble is the use of the is singular Diag to name the interface used for generating diagnostic warnings. Diagnostic is too much like a noun that might be used for an instance of a diagnostic.

Copy link
Contributor

@jonathan-gibbons jonathan-gibbons left a comment

I like the simplicity of the fix ;-)

@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2021

@pavelrappo 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:

8278068: Fix next-line modifier (snippet markup)
8277027: Treat unrecognized markup as snippet text, but warn about it

Reviewed-by: jjg

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

  • 5a036ac: 8277990: NMT: Remove NMT shutdown capability
  • 7217cb7: 8274883: (se) Selector.open throws IAE when the default file system provider is changed to a custom provider
  • 7ea4b19: 8278166: java/nio/channels/Channels/TransferTo.java timed out
  • 543d1a8: 8275721: Name of UTC timezone in a locale changes depending on previous code
  • bd7c54a: 8278341: Liveness check for global scope is not as fast as it could be
  • c609b5d: 8277628: Spec for InetAddressResolverProvider::get() throwing error or exception could be clearer
  • bb50b92: 8277536: Use String.blank in jdk.javadoc where applicable
  • 5b81d5e: 8276901: Implement UseHeavyMonitors consistently
  • 69d8669: 8278339: ServerSocket::isClosed may return false after accept throws
  • 56ca66e: 8277863: Deprecate sun.misc.Unsafe methods that return offsets
  • ... and 3 more: https://git.openjdk.java.net/jdk/compare/07669e3bc65b1728d784e21ec83b437374f9fa19...master

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 label Dec 7, 2021
@pavelrappo
Copy link
Member Author

@pavelrappo pavelrappo commented Dec 7, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2021

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

  • 061017a: 8273175: Add @SInCE tags to the DocTree.Kind enum constants
  • d7c283a: 8275233: Incorrect line number reported in exception stack trace thrown from a lambda expression
  • 3955b03: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
  • 5a036ac: 8277990: NMT: Remove NMT shutdown capability
  • 7217cb7: 8274883: (se) Selector.open throws IAE when the default file system provider is changed to a custom provider
  • 7ea4b19: 8278166: java/nio/channels/Channels/TransferTo.java timed out
  • 543d1a8: 8275721: Name of UTC timezone in a locale changes depending on previous code
  • bd7c54a: 8278341: Liveness check for global scope is not as fast as it could be
  • c609b5d: 8277628: Spec for InetAddressResolverProvider::get() throwing error or exception could be clearer
  • bb50b92: 8277536: Use String.blank in jdk.javadoc where applicable
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/07669e3bc65b1728d784e21ec83b437374f9fa19...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 7, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2021

@pavelrappo Pushed as commit a8a1fbc.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated javadoc
2 participants