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

8240499: Enforce whitespace checking for additional source files #301

Closed

Conversation

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Sep 11, 2020

The .jcheck/conf file is configured to check the same set of files as the old HG jcheck, namely files with the following extensions:

.java, .c, .h, .cpp, .hpp

The Skara git jcheck allows us to evolve the rules for white space checking compatibly.

This PR adds the following additional file extensions to the list of source files that need to be kept whitespace-clean:

.cc, .css, .frag, .fxml, .g4, .gradle, .groovy, .hlsl, .jsl, .m, .metal, .mm, .stg, .vert

For ease of review, I have done the initial push as 2 commits. The first modifies the .jcheck/conf file and tools/scripts/checkWhiteSpace script to add the additional extensions. The second fixes the whitespace errors in the (39) files among those with the newly added extensions.


Progress

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

Issue

  • JDK-8240499: Enforce whitespace checking for additional source files

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jfx pull/301/head:pull/301
$ git checkout pull/301

Part 1: update the .jcheck/conf file and checkWhiteSpace script
Part 2: Fix files as of 2020-09-11
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 11, 2020

👋 Welcome back kcr! 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 Sep 11, 2020
@kevinrushforth kevinrushforth self-assigned this Sep 11, 2020
@kevinrushforth kevinrushforth requested a review from arapte Sep 11, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 11, 2020

Webrevs

@johanvos johanvos self-requested a review Sep 11, 2020
@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Sep 12, 2020

/reviewers 2

@openjdk
Copy link

@openjdk openjdk bot commented Sep 12, 2020

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

Copy link
Collaborator

@johanvos johanvos left a comment

Tested this with before/after tests, and it works as expected.

@arapte
arapte approved these changes Sep 15, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 15, 2020

@kevinrushforth This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

8240499: Enforce whitespace checking for additional source files

Reviewed-by: jvos, arapte
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch:

  • d6dee34: 8252547: Correct transformations docs in Node

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate d6dee348a56a655f03a712da5b9716ea1054a4ec.

➡️ 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 Sep 15, 2020
@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Sep 15, 2020

/integrate

@openjdk openjdk bot closed this Sep 15, 2020
@openjdk openjdk bot added integrated and removed ready labels Sep 15, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 15, 2020

@kevinrushforth Since your change was applied there has been 1 commit pushed to the master branch:

  • d6dee34: 8252547: Correct transformations docs in Node

Your commit was automatically rebased without conflicts.

Pushed as commit 976a763.

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

@openjdk openjdk bot removed the rfr label Sep 15, 2020
@kevinrushforth kevinrushforth deleted the kevinrushforth:8240499-jcheck-extra branch Sep 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.