--- a/.clang-format Thu Feb 13 23:52:27 2020 -0600
+++ b/.clang-format Thu Feb 13 23:53:18 2020 -0600
@@ -14,7 +14,7 @@
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: TopLevel
-AlwaysBreakAfterReturnType: All
+AlwaysBreakAfterReturnType: TopLevelDefinitions AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
@@ -33,14 +33,14 @@
- SplitEmptyRecord: false
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Custom
-BreakBeforeInheritanceComma: true
+BreakBeforeInheritanceComma: false BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeComma
+BreakConstructorInitializers: BeforeColon BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
@@ -49,7 +49,7 @@
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 2
ContinuationIndentWidth: 4
-Cpp11BracedListStyle: false
+Cpp11BracedListStyle: true DerivePointerAlignment: false
ExperimentalAutoDetectBinPacking: false
@@ -74,13 +74,13 @@
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: '^G_STMT_START$' +MacroBlockEnd: '^G_STMT_END$' NamespaceIndentation: None
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: false
+ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
@@ -94,7 +94,7 @@
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: false