Skip to content

Enforce braces on control statements with clang-format #1599

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.

Sign up for GitHub

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
brminich merged 5 commits into from
May 5, 2026
Merged

Enforce braces on control statements with clang-format #1599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd41747
Enforce braces after control statements in new line
guy-ealey-morag Apr 29, 2026
e7497b3
Added malformed blocks to test clang-format
guy-ealey-morag Apr 29, 2026
8f7e5a0
Revert "Added malformed blocks to test clang-format"
guy-ealey-morag Apr 29, 2026
8b19200
Merge branch 'main' into clang-format-braces
guy-ealey-morag Apr 29, 2026
b39ceba
Update CodeStyle
guy-ealey-morag Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
# Requires clang-format-15+
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
Expand All @@ -10,7 +11,7 @@ AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: All
AlwaysBreakBeforeMultilineStrings: false
Expand Down Expand Up @@ -46,6 +47,7 @@ DerivePointerAlignment: false
IndentCaseLabels: false
IndentPPDirectives: None
IndentWidth: 4
InsertBraces: true
Comment thread
coderabbitai[bot] marked this conversation as resolved.
IndentWrappedFunctionNames: false
MaxEmptyLinesToKeep: 2
NamespaceIndentation: Inner
Expand Down
4 changes: 2 additions & 2 deletions docs/CodeStyle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ limitations under the License.
}
```

* Short if-statements without else can be on single line when appropriate
* Empty functions/blocks can be on single line: `void empty() {}`
* Braces are **required** around every control statement (`if`/`else`/`for`/`while`/`do`).
* Empty functions/blocks can be on single line: `void empty() {}` / `while (poll()) {}`

### Switch Statements

Expand Down
Loading