diff --git a/.clang-format b/.clang-format index 55dec2466..1bf3cbf6f 100644 --- a/.clang-format +++ b/.clang-format @@ -8,6 +8,7 @@ MaxEmptyLinesToKeep: 3 BreakBeforeBraces: Allman BreakConstructorInitializers: BeforeColon BreakInheritanceList: AfterColon +BreakAdjacentStringLiterals: true BreakAfterAttributes: Leave BreakBeforeConceptDeclarations: Always @@ -41,13 +42,15 @@ AlignTrailingComments: OverEmptyLines: 1 AlignEscapedNewlines: Right AllowAllArgumentsOnNextLine: true +AllowBreakBeforeNoexceptSpecifier: Always AllowShortBlocksOnASingleLine: true AllowShortCaseLabelsOnASingleLine: true +AllowShortCompoundRequirementOnASingleLine: true AllowShortEnumsOnASingleLine: false AllowShortFunctionsOnASingleLine: Inline AllowShortIfStatementsOnASingleLine: Never AllowShortLambdasOnASingleLine: All -AllowShortLoopsOnASingleLine: true +AllowShortLoopsOnASingleLine: false AlwaysBreakTemplateDeclarations: Yes BitFieldColonSpacing: Both diff --git a/premake/rythe b/premake/rythe index d37bc4d71..837b8a6d9 160000 --- a/premake/rythe +++ b/premake/rythe @@ -1 +1 @@ -Subproject commit d37bc4d7194b1f5538fab7bd07f658c33aab5e5b +Subproject commit 837b8a6d9a5d42712329ba222a3548441672fee3 diff --git a/tools/clang-format.exe b/tools/clang-format.exe index 67244de03..d39ec0125 100644 Binary files a/tools/clang-format.exe and b/tools/clang-format.exe differ