--- a/.clang-format Mon Feb 10 21:43:50 2020 -0600
+++ b/.clang-format Thu Feb 13 23:52:27 2020 -0600
@@ -1,31 +1,31 @@
-# TODO: Consider changing to AlwaysBreak for shorter lines.
-# TODO: This would also be more consistent with the manual formatting of
-# TODO: functions like g_object_get(). If we use that, we could remove
-# TODO: the "clang-format off" for gtk_widget_class_bind_template_child
-# TODO: in gplugin-gtk/gplugin-gtk-plugin-info.c.
+AccessModifierOffset: -2 AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
-#AlignConsecutiveMacros: true
AlignEscapedNewlines: DontAlign
+AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: false AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: TopLevel AlwaysBreakAfterReturnType: All
+AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: true
+BinPackParameters: false AfterControlStatement: false
- # TODO: There are quite a few "true" here.
AfterObjCDeclaration: false
- # TODO: There are some "true" here. If changed, change Enum and Union.
@@ -35,31 +35,80 @@
SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: true +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: BeforeComma +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +CommentPragmas: '^ IWYU pragma:' +CompactNamespaces: false +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 2 ContinuationIndentWidth: 4
-#DeriveLineEnding: false
+Cpp11BracedListStyle: false DerivePointerAlignment: false
-#IndentCaseBlocks: false
+ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: false + - Regex: '^"(llvm|llvm-c|clang|clang-c)/' + - Regex: '^(<|"(gtest|gmock|isl|json)/)' +IncludeIsMainRegex: '(Test)?$' -#IndentGotoLabels: false
+IndentPPDirectives: None IndentWrappedFunctionNames: false
+JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: true +NamespaceIndentation: None +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: false +PenaltyBreakAssignment: 2 +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 200
+SortUsingDeclarations: true SpaceAfterCStyleCast: false
-# TODO: This is roughly 50/50 with ControlStatements
+SpaceAfterTemplateKeyword: false +SpaceBeforeAssignmentOperators: true -#SpaceBeforeSquareBrackets: false
-#SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1 +SpacesInContainerLiterals: false SpacesInCStyleCastParentheses: false
-#SpacesInConditionalStatement: false
-SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false