From 1fff737955d3e080d4e4be9ecb615c83fd3fd767 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Wed, 18 Dec 2019 14:23:43 +0900 Subject: [PATCH] clang-format-9 --- .clang-format | 16 +++++++++++----- doc/sources/contribute.rst | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.clang-format b/.clang-format index 63269ac7..97cbfbed 100644 --- a/.clang-format +++ b/.clang-format @@ -2,16 +2,20 @@ Language: Cpp AccessModifierOffset: -2 AlignAfterOpenBracket: Align +AlignConsecutiveMacros: false AlignConsecutiveAssignments: false AlignConsecutiveDeclarations: false AlignEscapedNewlines: Right AlignOperands: true AlignTrailingComments: true +AllowAllArgumentsOnNextLine: true +AllowAllConstructorInitializersOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: false +AllowShortLambdasOnASingleLine: All +AllowShortIfStatementsOnASingleLine: Never AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None @@ -19,7 +23,8 @@ AlwaysBreakBeforeMultilineStrings: false AlwaysBreakTemplateDeclarations: MultiLine BinPackArguments: true BinPackParameters: true -BraceWrapping: +BraceWrapping: + AfterCaseLabel: false AfterClass: false AfterControlStatement: false AfterEnum: false @@ -55,12 +60,12 @@ DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true -ForEachMacros: +ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH IncludeBlocks: Preserve -IncludeCategories: +IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' Priority: 2 - Regex: '^(<|"(gtest|isl|json)/)' @@ -96,6 +101,7 @@ ReflowComments: true SortIncludes: false SortUsingDeclarations: true SpaceAfterCStyleCast: false +SpaceAfterLogicalNot: false SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true SpaceBeforeCpp11BracedList: false @@ -111,7 +117,7 @@ SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false Standard: Cpp11 -StatementMacros: +StatementMacros: - Q_UNUSED - QT_REQUIRE_VERSION TabWidth: 8 diff --git a/doc/sources/contribute.rst b/doc/sources/contribute.rst index bea72b13..b2aa9d07 100644 --- a/doc/sources/contribute.rst +++ b/doc/sources/contribute.rst @@ -26,14 +26,14 @@ Coding style We use clang-format to format source code consistently. The clang-format configuration file .clang-format is located at the root directory. Since clang-format produces slightly different results -between versions, we currently use clang-format-8. +between versions, we currently use clang-format-9. To detect any violation to the coding style, we recommend to setup git pre-commit hook to check coding style of the changes you introduced. The pre-commit file is located at the root directory. Copy it under .git/hooks and make sure that it is executable. The pre-commit script uses clang-format-diff.py to detect any style errors. If it is not in -your PATH or it exists under different name (e.g., clang-format-diff-8 +your PATH or it exists under different name (e.g., clang-format-diff-9 in debian), either add it to PATH variable or add git option ``clangformatdiff.binary`` to point to the script.