Merge 858929f0f3 into 0f550e5aae

.clang-format

@@ -2,79 +2,227 @@
 Language: Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
+AlignArrayOfStructures: None
-AlignConsecutiveDeclarations: false
+AlignConsecutiveAssignments:
-AlignOperands: true
+  Enabled: false
-AlignTrailingComments: true
+AlignConsecutiveBitFields:
+  Enabled: false
+AlignConsecutiveDeclarations:
+  Enabled: false
+AlignConsecutiveMacros:
+  Enabled: false
+AlignConsecutiveShortCaseStatements:
+  Enabled: false
+#AlignConsecutiveTableGenBreakingDAGArgColons:
+#  Enabled: false
+#AlignConsecutiveTableGenCondOperatorColons:
+#  Enabled: false
+#AlignConsecutiveTableGenDefinitionColons:
+#  Enabled: false
+AlignEscapedNewlines: Right
+AlignOperands: AlignAfterOperator
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 0
+AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
+AllowBreakBeforeNoexceptSpecifier: Never
 AllowShortBlocksOnASingleLine: Never
+#AllowShortCaseExpressionOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: false
+AllowShortCompoundRequirementOnASingleLine: true
+AllowShortEnumsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
+#AllowShortNamespacesOnASingleLine: false
-AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros: [ ]
 BinPackArguments: true
+#BinPackLongBracedList: true
 BinPackParameters: true
+BitFieldColonSpacing: Both
+BracedInitializerIndentWidth: 4 #-1
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterExternBlock: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakAdjacentStringLiterals: true
+BreakAfterAttributes: Leave
+#BreakAfterReturnType: None
+BreakArrays: true
 BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
 BreakBeforeBraces: Attach
+BreakBeforeInlineASMColon: OnlyMultiline
+#BreakBeforeTemplateCloser: false
 BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: false
+#BreakBinaryOperations: Never
+BreakConstructorInitializers: BeforeColon
+#BreakFunctionDefinitionParameters: false
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: true
+AlwaysBreakTemplateDeclarations: Yes #BreakTemplateDeclarations: Yes
 ColumnLimit: 100
 CommentPragmas: '^ (IWYU pragma:|NOLINT)'
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
+CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat: false
-ForEachMacros: [ ]
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+#EnumTrailingComma: Remove
+FixNamespaceComments: true
+ForEachMacros:
+  - FOR_EACH
+IfMacros: [ ]
+IncludeBlocks: Preserve
 IncludeCategories:
   - Regex: '^<[Ww]indows\.h>$'
     Priority: 1
+    SortPriority: 0
+    CaseSensitive: false
   - Regex: '^<'
     Priority: 2
+    SortPriority: 0
+    CaseSensitive: false
   - Regex: '^"'
     Priority: 3
+    SortPriority: 0
+    CaseSensitive: false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseBlocks: false
 IndentCaseLabels: false
+#IndentExportBlock: true
+IndentExternBlock: AfterExternBlock
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentRequiresClause: true
 IndentWidth: 4
 IndentWrappedFunctionNames: false
+InsertBraces: false
 InsertNewlineAtEOF: true
-KeepEmptyLinesAtTheStartOfBlocks: false
+InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary: 0
+  BinaryMinDigits: 0
+  Decimal: 0
+  DecimalMinDigits: 0
+  Hex: 0
+  HexMinDigits: 0
+#KeepEmptyLines:
+#  AtEndOfFile: false
+#  AtStartOfBlock: false
+#  AtStartOfFile: false
+#KeepFormFeed: false
+LambdaBodyIndentation: Signature
 LineEnding: LF
 MacroBlockBegin: ''
 MacroBlockEnd: ''
+#MacrosSkippedByRemoveParentheses:
+#  - SENSOR_MSG_WITH_DATA_CUSTOM_CTOR
+#MainIncludeChar: Quote
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
-ObjCBlockIndentWidth: 4
+#OneLineFormatOffRegex: ''
-ObjCSpaceAfterProperty: false
+PackConstructorInitializers: BinPack
-ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
+#PenaltyBreakBeforeMemberAccess: 150
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakScopeResolution: 500
 PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Left
+PPIndentWidth: -1
 QualifierAlignment: Left
-ReflowComments: true
+ReferenceAlignment: Pointer
+ReflowComments: true # Always
 RemoveBracesLLVM: true
+#RemoveEmptyLinesInUnwrappedLines: true
+RemoveParentheses: Leave #ReturnStatement
+RemoveSemicolon: true
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
 SeparateDefinitionBlocks: Always
+ShortNamespaceLines: 0
+SkipMacroDefinitionBody: false
 SortIncludes: true
+SortUsingDeclarations: Lexicographic
 SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+#SpaceAfterOperatorKeyword: false
+SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros: true
+  #AfterNot: false
+  AfterOverloadedOperator: false
+  AfterPlacementOperator: true
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+#SpaceInEmptyBraces: Never
 SpacesBeforeTrailingComments: 2
-SpacesInAngles: false
+SpacesInAngles: Never
 SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
-SpacesInParentheses: false
+  Minimum: 1
+  Maximum: -1
+SpacesInParens: Never
+SpacesInParensOptions:
+  #ExceptDoubleParentheses: false
+  InCStyleCasts: false
+  InConditionalStatements: false
+  InEmptyParentheses: false
+  Other: false
 SpacesInSquareBrackets: false
 Standard: c++17
+StatementAttributeLikeMacros: [ ]
+StatementMacros: [ ]
+#TableGenBreakInsideDAGArg: DontBreak
 TabWidth: 4
 UseTab: Never
-WhitespaceSensitiveMacros: [ "SEAD_ENUM", "SEAD_ENUM_EX", "SEAD_ENUM_EX_VALUES" ]
+WhitespaceSensitiveMacros:
+  - SEAD_ENUM
+  - SEAD_ENUM_EX
+  - SEAD_ENUM_EX_VALUES
+#WrapNamespaceBodyWithEmptyLines: Leave
 ...