Skip to content

Commit

Permalink
clang-format: Split C++/ObjC sections
Browse files Browse the repository at this point in the history
Fixes the lint error that an objective-C section is missing from the config when a .mm file is modified.
  • Loading branch information
stenzek committed Oct 6, 2018
1 parent 7e741f7 commit 0647659
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions Source/.clang-format
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
Language: Cpp
# Global config for all languages
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
Expand All @@ -25,7 +25,6 @@ BraceWrapping:
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
Expand Down Expand Up @@ -59,9 +58,6 @@ MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
Expand All @@ -84,5 +80,16 @@ SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 2
UseTab: Never
---
# C++ Specific Config
Language: Cpp
---
# Objective-C Specific Config
Language: ObjC
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
BraceWrapping:
AfterObjCDeclaration: true
...

0 comments on commit 0647659

Please sign in to comment.