X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=.clang-format;h=abee08afa43b9597671d194868187bd2dacf4cb3;hb=050d2cf5ae4bc14d05d7820dc78f6e7c16c5eee3;hp=5a899e772e1b673ab59eb2a33bf539aba1e93b12;hpb=17271bf765258adace6a5ec0d6b75c461f39bae2;p=hengbandforosx%2Fhengbandosx.git diff --git a/.clang-format b/.clang-format index 5a899e772..abee08afa 100644 --- a/.clang-format +++ b/.clang-format @@ -11,16 +11,16 @@ AlignTrailingComments: false AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: All +AllowShortFunctionsOnASingleLine: Empty AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: false +AlwaysBreakTemplateDeclarations: Yes BinPackArguments: true BinPackParameters: true -BraceWrapping: +BraceWrapping: AfterClass: false AfterControlStatement: false AfterEnum: false @@ -55,12 +55,12 @@ DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false FixNamespaceComments: false -ForEachMacros: +ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH IncludeBlocks: Preserve -IncludeCategories: +IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' Priority: 2 - Regex: '^(<|"(gtest|gmock|isl|json)/)' @@ -90,7 +90,7 @@ PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Right -RawStringFormats: +RawStringFormats: - Delimiters: [pb] Language: TextProto BasedOnStyle: google @@ -112,4 +112,3 @@ Standard: Cpp11 TabWidth: 8 UseTab: Never ... -