Revert clang-format to align with openbmc/docs
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
Change-Id: I64dc504d06769fabfe3c8835341f5603a36d8677
diff --git a/.clang-format b/.clang-format
index 706a17c..1313ec8 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,38 +1,28 @@
---
-# Using clang-format-14
-# https://releases.llvm.org/14.0.0/tools/clang/docs/ClangFormatStyleOptions.html
Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
-AlignArrayOfStructures: None
-AlignConsecutiveAssignments: Consecutive
-AlignConsecutiveBitFields: Consecutive
-AlignConsecutiveDeclarations: None
-AlignConsecutiveMacros: None
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Right
-AlignOperands: Align
+AlignOperands: true
AlignTrailingComments: true
-AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: Never
+AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
-AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: Yes
-AttributeMacros: []
BinPackArguments: true
BinPackParameters: true
-BitFieldColonSpacing: Both
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
- AfterControlStatement: Always
+ AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
@@ -42,23 +32,20 @@
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
- BeforeLambdaBody: false
- BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
-BreakAfterJavaFieldAnnotations: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Custom
-BreakBeforeConceptDeclarations: true
BreakBeforeTernaryOperators: true
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
-BreakStringLiterals: false
+BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
@@ -66,12 +53,9 @@
DerivePointerAlignment: false
PointerAlignment: Left
DisableFormat: false
-EmptyLineAfterAccessModifier: Never
-EmptyLineBeforeAccessModifier: Always
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IfMacros: []
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^[<"](gtest|gmock)'
@@ -90,101 +74,44 @@
Priority: 5
- Regex: '.*'
Priority: 6
-IncludeIsMainRegex: ''
-IncludeIsMainSourceRegex: ''
-IndentAccessModifiers: false
-IndentCaseBlocks: false
IndentCaseLabels: true
-IndentExternBlock: NoIndent
-IndentGotoLabels: false
-IndentPPDirectives: None
-IndentRequires: false
IndentWidth: 4
IndentWrappedFunctionNames: true
-InsertTrailingCommas: None
-JavaImportGroups: []
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
-LambdaBodyIndentation: Signature
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
-NamespaceMacros: []
-ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 2
-ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
-PPIndentWidth: -1
-PackConstructorInitializers: BinPack
-PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
-PenaltyBreakOpenParenthesis: 0
PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
-PenaltyIndentedWhitespace: 0
-QualifierAlignment: Leave
-# Only used when QualifierAlignment is 'Custom'
-# QualifierOrder: []
-RawStringFormats: []
-ReferenceAlignment: Pointer
ReflowComments: true
-RemoveBracesLLVM: false
-SeparateDefinitionBlocks: Leave
-ShortNamespaceLines: 1
-SortIncludes: CaseSensitive
-SortJavaStaticImport: Before
+SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
-SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
-SpaceAroundPointerQualifiers: Default
SpaceBeforeAssignmentOperators: true
-SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
-SpaceBeforeParensOptions:
- AfterControlStatements: true
- AfterForeachMacros: true
- AfterFunctionDefinitionName: false
- AfterFunctionDeclarationName: false
- AfterIfMacros: true
- AfterOverloadedOperator: false
- BeforeNonEmptyParentheses: false
SpaceBeforeRangeBasedForLoopColon: true
-SpaceBeforeSquareBrackets: false
-SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
-SpacesInAngles: Never
-SpacesInConditionalStatement: false
+SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
-SpacesInLineCommentPrefix:
- Minimum: 1
- Maximum: -1
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Latest
-StatementAttributeLikeMacros: []
-StatementMacros: []
TabWidth: 4
-TypenameMacros: []
UseCRLF: false
UseTab: Never
-WhitespaceSensitiveMacros:
- - STRINGIZE
- - PP_STRINGIZE
- - BOOST_PP_STRINGIZE
- - NS_SWIFT_NAME
- - CF_SWIFT_NAME
...