diff options
| author |  Weiliang Chen <weiliangc@chromium.org> | 2018-05-22 09:03:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-23 18:04:41 +0000 |
| commit | 4fa5824fa2ae896670517d01c58ed4aef4a97941 (patch) | |
| tree | 910c8b33d5a77c074e35b3c30d51e12d204998dc /.clang-format | |
| parent | 499afea43c56581a382441c4dc53fde0eff6ffbe (diff) | |
Update clang-format matching more of Chromium
This CL does one thing: disallow short if/loop becoming a single
line.
Skia style guide prefers to always have braces. Though always
have braces isn't achievable by clang-format, always breaking into
multiple lines can be set.
Bug: skia:
Change-Id: I70b504dea01b4c916901ea2247ac0e052d468051
Reviewed-on: https://skia-review.googlesource.com/128688
Commit-Queue: Weiliang Chen <weiliangc@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.clang-format b/.clang-format index 90eedd8b8f..6e9702e660 100644 --- a/.clang-format +++ b/.clang-format @@ -20,8 +20,8 @@ AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: true -AllowShortLoopsOnASingleLine: true +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: true |