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

Add tabfiles to jcheck configuration #929

Closed
wants to merge 4 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Oct 29, 2020

The tabfiles setting is just like the files setting, but it lists files in which tabs are allowed.

(This is to support makefiles)


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Reviewers

Download

$ git fetch https://git.openjdk.java.net/skara pull/929/head:pull/929
$ git checkout pull/929

The tabfiles setting is just like the files setting, but it lists files in which tabs are
allowed.
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 29, 2020

👋 Welcome back ihse! 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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 29, 2020

Webrevs

@edvbld
Copy link
Member

@edvbld edvbld commented Oct 29, 2020

How about naming the configuration ignore-tabs instead? To make it a bit more clear what it does :)

@magicus
Copy link
Member Author

@magicus magicus commented Nov 3, 2020

@edvbld

How about naming the configuration ignore-tabs instead? To make it a bit more clear what it does :)

Sure. I checked for "prior art" on multiword keywords, but did not find any such instances. :) This will mean that the corresponding Java variable needs a different name, since "-" is not valid in Java identifiers.

(And if we're going this way, personally I think allow-tabs would be even better)

erikj79
erikj79 approved these changes Nov 5, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Nov 5, 2020

@magicus 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.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

After integration, the commit message for the final commit will be:

Add tabfiles to jcheck configuration

Reviewed-by: erikj, ehelin

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 22 new commits pushed to 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@erikj79, @edvbld) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Nov 5, 2020
@rwestberg
Copy link
Member

@rwestberg rwestberg commented Nov 5, 2020

Looks good in general, but would be nice with a test to see that it still flags trailing tabs (which I think it is meant to do still, right?)

@magicus
Copy link
Member Author

@magicus magicus commented Nov 11, 2020

@rwestberg @edvbld I have now added a test that verifies that trailing tabs are always rejected, and that leading tabs are accepted iff ignore-tabs is true for that file.

Ok to integrate now?

edvbld
edvbld approved these changes Nov 12, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@magicus
Copy link
Member Author

@magicus magicus commented Nov 12, 2020

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 12, 2020

@magicus
Your change (at version 0a19699) is now ready to be sponsored by a Committer.

@openjdk openjdk bot added the sponsor label Nov 12, 2020
@rwestberg
Copy link
Member

@rwestberg rwestberg commented Nov 16, 2020

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Nov 16, 2020

@rwestberg @magicus Since your change was applied there have been 22 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit d468590.

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

openjdk-notifier bot referenced this issue Nov 16, 2020
Reviewed-by: erikj, ehelin
@magicus magicus deleted the add-tabfiles-to-jcheck branch Sep 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants