diff options
| author | Ilya Grechuhin <i.grechuhin@gmail.com> | 2017-10-04 10:54:05 +0300 |
|---|---|---|
| committer | Sergey Yershov <syershov@maps.me> | 2017-10-04 10:56:22 +0300 |
| commit | ac6f8677b38d60499031e2dcf3296c453e163852 (patch) | |
| tree | a3d49390d5ef29edeca90dd1f6b4b1ffdd5e8c38 /.clang-format | |
| parent | 6669301c759d9d2b0593604a72798dbb52048411 (diff) | |
[clang-format] Updated clang-format rules for ObjC.
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/.clang-format b/.clang-format index e6faeccc14..7a0efad6ce 100644 --- a/.clang-format +++ b/.clang-format @@ -3,6 +3,16 @@ --- BasedOnStyle: Google IndentWidth: 2 +BreakBeforeBraces: Allman +ColumnLimit: 100 + +--- +Language: ObjC +ObjCBlockIndentWidth: 2 +SpacesInContainerLiterals: false +AfterObjCDeclaration: true +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: false --- Language: Cpp @@ -12,9 +22,7 @@ AllowShortCaseLabelsOnASingleLine: true AllowShortFunctionsOnASingleLine: true AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false -BreakBeforeBraces: Allman BreakConstructorInitializersBeforeComma: true -ColumnLimit: 100 ConstructorInitializerIndentWidth: 2 DerivePointerAlignment: false IndentCaseLabels: false @@ -26,5 +34,3 @@ Standard: Cpp11 --- Language: Java BreakAfterJavaFieldAnnotations: true -BreakBeforeBraces: Allman -ColumnLimit: 100 |