Skip to content

Make clang-format indent nested preprocessor directives #4461

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

Merged

Conversation

tautschnig
Copy link
Collaborator

Since clang-format 6 there is support to indent preprocessor directives,
enabling formatting like

 #if foo
 #  define bar
 #endif
  • Each commit message has a non-empty body, explaining why the change was made.
  • n/a Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • n/a The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
  • n/a 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).
  • n/a My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • n/a White-space or formatting changes outside the feature-related changed lines are in commits of their own.

Since clang-format 6 there is support to indent preprocessor directives,
enabling formatting like

```
 #if foo
 #  define bar
 #endif
```
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: 98f619f).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/106430068

@tautschnig tautschnig merged commit bfc11dc into diffblue:develop Mar 30, 2019
@tautschnig tautschnig deleted the indent-preprocessor-directives branch March 30, 2019 14:37
@martin-cs
Copy link
Collaborator

Does this mean we are going to have to reformat all of the includes inside header guards?

@tautschnig
Copy link
Collaborator Author

Does this mean we are going to have to reformat all of the includes inside header guards?

No, clang-format is able to tell apart header guards from other #if. What you've seen in #4458 is just because that entire file is, in addition to the header guard, also #if guarded for Linux-only.

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.

7 participants