Skip to content

Disable clang format for java #5069

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

owen-mc-diffblue
Copy link
Contributor

This PR should disable clang-format for java. I don't think we are particularly prescriptive about our java style, and it's annoying when PRs fail because of a java formatting issue. I've cherry-picked #5068 which is currently failing for this reason to check that it works. I've marked it "Do not merge" until those two commits have been removed.

  • Each commit message has a non-empty body, explaining why the change was made.
  • Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
  • Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
  • My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • White-space or formatting changes outside the feature-related changed lines are in commits of their own.

@owen-mc-diffblue
Copy link
Contributor Author

owen-mc-diffblue commented Aug 30, 2019

The clang-format job passed with #5068 cherry-picked (https://travis-ci.org/diffblue/cbmc/jobs/578725706), which confirms that this works. I stopped CI and removed those commits.

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️
This PR failed Diffblue compatibility checks (cbmc commit: 0d46406).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/125208912
Status will be re-evaluated on next push.
Common spurious failures include: the cbmc commit has disappeared in the mean time (e.g. in a force-push); the author is not in the list of contributors (e.g. first-time contributors); compatibility was already broken by an earlier merge.

@codecov-io
Copy link

Codecov Report

Merging #5069 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #5069   +/-   ##
========================================
  Coverage    69.54%   69.54%           
========================================
  Files         1315     1315           
  Lines       108959   108959           
========================================
  Hits         75775    75775           
  Misses       33184    33184

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8c7ee00...0d46406. Read the comment docs.

@owen-mc-diffblue owen-mc-diffblue force-pushed the disable-clang-format-for-java branch from 0d46406 to 74d1d6f Compare August 30, 2019 14:35
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️
Passed Diffblue compatibility checks (cbmc commit: 74d1d6f).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/125419472

@owen-mc-diffblue
Copy link
Contributor Author

Running clang-format on java was turned on in #4926, to stop clang-format from silently aborting. This PR makes it ignore java, rather than applying any reformatting to it, which is closer to what we were doing before (but without the problem of silently aborting).

Copy link
Contributor

@antlechner antlechner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I keep forgetting to run clang-format on .java files and don't really like the current result of running it.
👍

@owen-mc-diffblue owen-mc-diffblue merged commit 3ea03e4 into diffblue:develop Sep 19, 2019
@owen-mc-diffblue owen-mc-diffblue deleted the disable-clang-format-for-java branch September 19, 2019 09:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants