From 4fa5824fa2ae896670517d01c58ed4aef4a97941 Mon Sep 17 00:00:00 2001 From: Weiliang Chen Date: Tue, 22 May 2018 09:03:43 -0400 Subject: 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 --- .clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.clang-format') 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 -- cgit v1.2.3