summaryrefslogtreecommitdiffstats
path: root/.clang-format
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2014-11-02 15:37:07 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-02 23:37:34 +0000
commit4ad85931d0517410d5dee0870e6eecae8e38136a (patch)
tree548674c43d0465584608b2d4d194aece680f4d39 /.clang-format
parent15c2942b68a2e52c881c8e45aa8e0fbe52157d3f (diff)
downloadchromium_src-4ad85931d0517410d5dee0870e6eecae8e38136a.zip
chromium_src-4ad85931d0517410d5dee0870e6eecae8e38136a.tar.gz
chromium_src-4ad85931d0517410d5dee0870e6eecae8e38136a.tar.bz2
clang-format/java: Tweak style a bit.
Based on formatting a few java files in base/ and comparing before/after. BUG=429372 NOTRY=true Review URL: https://codereview.chromium.org/697893002 Cr-Commit-Position: refs/heads/master@{#302406}
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format3
1 files changed, 3 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format
index a6cc4e3..a543137 100644
--- a/.clang-format
+++ b/.clang-format
@@ -13,4 +13,7 @@ Language: Java
IndentWidth: 4
ContinuationIndentWidth: 8
ColumnLimit: 100
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: true
+Cpp11BracedListStyle: false # but see http://llvm.org/PR21457