From 8f45138eef44f8b69cfb88650c6f069b4e5ba059 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Thu, 24 May 2018 13:27:13 +0000 Subject: [PATCH] Revert "Update clang-format matching more of Chromium" This reverts commit 4fa5824fa2ae896670517d01c58ed4aef4a97941. Reason for revert: This is an area of Chromium's style guide that is actively error-prone, and I don't want anyone writing Skia code to think it's desirable. `goto fail`, etc. If we cannot automatically add braces, it is less error prone to keep these short statements on the same line as the condition. On the other hand, I believe clang-tidy can automate adding braces (readability-braces-around-statements). If we get that working I don't think it matters where the blocks go. Original change's description: > 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 > Reviewed-by: Brian Salomon TBR=bsalomon@google.com,weiliangc@chromium.org Change-Id: I264e0a38934aaf8059f503a64e204fd66da54769 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/129940 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- .clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 6e9702e660..90eedd8b8f 100644 --- a/.clang-format +++ b/.clang-format @@ -20,8 +20,8 @@ AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false +AllowShortIfStatementsOnASingleLine: true +AllowShortLoopsOnASingleLine: true AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: true