Add options for clang-format 15. (#1480)

This commit is contained in:
Andreas Süßenbach 2023-01-16 17:38:34 +01:00 committed by GitHub
parent f82746d6ff
commit 68512e6702
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 122 additions and 2 deletions

View File

@ -54,12 +54,14 @@ ConstructorInitializerAllOnOneLineOrOnePerLine : true
ConstructorInitializerIndentWidth : 2
ContinuationIndentWidth : 2
Cpp11BracedListStyle : false
EmptyLineBeforeAccessModifier : LogicalBlock
FixNamespaceComments : true
IncludeBlocks : Regroup
IndentCaseBlocks : true
IndentCaseLabels : true
IndentExternBlock : true
IndentPPDirectives : AfterHash
IndentRequires : false
IndentWidth : 2
IndentWrappedFunctionNames : true
KeepEmptyLinesAtTheStartOfBlocks : false

View File

@ -56,6 +56,7 @@ ConstructorInitializerIndentWidth : 2
ContinuationIndentWidth : 2
Cpp11BracedListStyle : false
EmptyLineAfterAccessModifier : Never
EmptyLineBeforeAccessModifier : LogicalBlock
FixNamespaceComments : true
IncludeBlocks : Regroup
IndentAccessModifiers : false
@ -63,6 +64,7 @@ IndentCaseBlocks : true
IndentCaseLabels : true
IndentExternBlock : true
IndentPPDirectives : AfterHash
IndentRequires : false
IndentWidth : 2
IndentWrappedFunctionNames : true
KeepEmptyLinesAtTheStartOfBlocks : false

View File

@ -54,6 +54,7 @@ ConstructorInitializerIndentWidth : 2
ContinuationIndentWidth : 2
Cpp11BracedListStyle : false
EmptyLineAfterAccessModifier : Never
EmptyLineBeforeAccessModifier : LogicalBlock
FixNamespaceComments : true
IncludeBlocks : Regroup
IndentAccessModifiers : false
@ -61,6 +62,7 @@ IndentCaseBlocks : true
IndentCaseLabels : true
IndentExternBlock : true
IndentPPDirectives : AfterHash
IndentRequires : false
IndentWidth : 2
IndentWrappedFunctionNames : true
KeepEmptyLinesAtTheStartOfBlocks : false

111
.clang-format_15 Normal file
View File

@ -0,0 +1,111 @@
---
AccessModifierOffset : -2
AlignAfterOpenBracket : Align
AlignArrayOfStructures : None
AlignConsecutiveAssignments : Consecutive
AlignConsecutiveBitFields : Consecutive
AlignConsecutiveDeclarations : Consecutive
AlignConsecutiveMacros : Consecutive
AlignEscapedNewlines : Left
AlignOperands : AlignAfterOperator
AlignTrailingComments : true
AllowAllArgumentsOnNextLine : true
AllowAllParametersOfDeclarationOnNextLine : true
AllowShortBlocksOnASingleLine : Empty
AllowShortCaseLabelsOnASingleLine : true
AllowShortEnumsOnASingleLine : true
AllowShortFunctionsOnASingleLine : Empty
AllowShortIfStatementsOnASingleLine : Never
AllowShortLambdasOnASingleLine : All
AllowShortLoopsOnASingleLine : false
AlwaysBreakAfterReturnType : None
AlwaysBreakBeforeMultilineStrings : true
AlwaysBreakTemplateDeclarations : Yes
BinPackArguments : false
BinPackParameters : false
BitFieldColonSpacing : Both
BraceWrapping :
AfterCaseLabel : true
AfterClass : true
AfterControlStatement : Always
AfterEnum : true
AfterFunction : true
AfterNamespace : true
AfterStruct : true
AfterUnion : true
AfterExternBlock : true
BeforeCatch : true
BeforeElse : true
BeforeLambdaBody : true
BeforeWhile : false
IndentBraces : false
SplitEmptyFunction : true
SplitEmptyRecord : true
SplitEmptyNamespace : true
BreakBeforeBinaryOperators : None
BreakBeforeBraces : Custom
BreakBeforeTernaryOperators : true
BreakConstructorInitializers : BeforeComma
BreakInheritanceList : BeforeComma
BreakStringLiterals : false
ColumnLimit : 160
CompactNamespaces : false
ConstructorInitializerIndentWidth : 2
ContinuationIndentWidth : 2
Cpp11BracedListStyle : false
EmptyLineAfterAccessModifier : Never
EmptyLineBeforeAccessModifier : LogicalBlock
FixNamespaceComments : true
IncludeBlocks : Regroup
IndentAccessModifiers : false
IndentCaseBlocks : true
IndentCaseLabels : true
IndentExternBlock : true
IndentPPDirectives : AfterHash
IndentRequiresClause : false
IndentWidth : 2
IndentWrappedFunctionNames : true
InsertBraces : false
KeepEmptyLinesAtTheStartOfBlocks : false
LambdaBodyIndentation : Signature
MaxEmptyLinesToKeep : 1
NamespaceIndentation : All
PackConstructorInitializers : NextLine
PPIndentWidth : -1
PointerAlignment : Middle
ReferenceAlignment : Pointer
ReflowComments : true
RemoveBracesLLVM : false
RequiresClausePosition : OwnLine
SeparateDefinitionBlocks : Always
ShortNamespaceLines : 0
SortIncludes : true
SortUsingDeclarations : true
SpaceAfterCStyleCast : false
SpaceAfterLogicalNot : false
SpaceAfterTemplateKeyword : true
SpaceAroundPointerQualifiers : Both
SpaceBeforeAssignmentOperators : true
SpaceBeforeCaseColon : false
SpaceBeforeCpp11BracedList : false
SpaceBeforeCtorInitializerColon : true
SpaceBeforeInheritanceColon : true
SpaceBeforeParens : ControlStatements
SpaceBeforeRangeBasedForLoopColon : true
SpaceBeforeSquareBrackets : false
SpaceInEmptyBlock : false
SpaceInEmptyParentheses : false
SpacesBeforeTrailingComments : 2
SpacesInAngles : false
SpacesInCStyleCastParentheses : false
SpacesInConditionalStatement : true
SpacesInContainerLiterals : false
SpacesInLineCommentPrefix :
Minimum : 1
Maximum : -1
SpacesInParentheses : true
SpacesInSquareBrackets : false
Standard : Latest
UseCRLF : true
UseTab : Never
...

View File

@ -55,9 +55,12 @@ if(CLANG_FORMAT_EXECUTABLE)
elseif ( clangFormatVersion VERSION_LESS 14.0.0)
message(STATUS " Using .clang-format version 13." )
file(READ ".clang-format_13" clangFormat)
else ()
elseif ( clangFormatVersion VERSION_LESS 15.0.0)
message(STATUS " Using .clang-format version 14." )
file(READ ".clang-format_14" clangFormat)
else ()
message(STATUS " Using .clang-format version 15." )
file(READ ".clang-format_15" clangFormat)
endif ()
file(WRITE ".clang-format" ${clangFormat})
endif()

View File

@ -12918,7 +12918,7 @@ namespace VULKAN_HPP_NAMESPACE
# elif defined( __APPLE__ )
m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
# elif defined( _WIN32 )
m_library = ::LoadLibraryA( "vulkan-1.dll" );
m_library = ::LoadLibraryA( "vulkan-1.dll" );
# else
# error unsupported platform
# endif