Update clang format config to clang-format 10

This commit is contained in:
serkixenos 2022-03-23 13:32:03 -04:00
parent 4ef0163bf2
commit c0bbcca0cf
2 changed files with 17 additions and 8 deletions

View file

@ -1,6 +1,5 @@
--- ---
Language: Cpp Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -3 AccessModifierOffset: -3
AlignAfterOpenBracket: Align AlignAfterOpenBracket: Align
AlignConsecutiveMacros: false AlignConsecutiveMacros: false
@ -12,7 +11,7 @@ AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true AllowAllArgumentsOnNextLine: true
AllowAllConstructorInitializersOnNextLine: false AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None AllowShortFunctionsOnASingleLine: None
AllowShortLambdasOnASingleLine: None AllowShortLambdasOnASingleLine: None
@ -57,6 +56,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 6 ConstructorInitializerIndentWidth: 6
ContinuationIndentWidth: 6 ContinuationIndentWidth: 6
Cpp11BracedListStyle: true Cpp11BracedListStyle: true
DeriveLineEnding: true
DerivePointerAlignment: false DerivePointerAlignment: false
DisableFormat: false DisableFormat: false
ExperimentalAutoDetectBinPacking: false ExperimentalAutoDetectBinPacking: false
@ -69,12 +69,17 @@ IncludeBlocks: Preserve
IncludeCategories: IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/' - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2 Priority: 2
SortPriority: 0
- Regex: '^(<|"(gtest|gmock|isl|json)/)' - Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3 Priority: 3
SortPriority: 0
- Regex: '.*' - Regex: '.*'
Priority: 1 Priority: 1
SortPriority: 0
IncludeIsMainRegex: '(Test)?$' IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
IndentCaseLabels: false IndentCaseLabels: false
IndentGotoLabels: false
IndentPPDirectives: None IndentPPDirectives: None
IndentWidth: 3 IndentWidth: 3
IndentWrappedFunctionNames: false IndentWrappedFunctionNames: false
@ -110,18 +115,22 @@ SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1 SpacesBeforeTrailingComments: 1
SpacesInAngles: false SpacesInAngles: false
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false SpacesInCStyleCastParentheses: false
SpacesInParentheses: false SpacesInParentheses: false
SpacesInSquareBrackets: false SpacesInSquareBrackets: false
Standard: Cpp11 SpaceBeforeSquareBrackets: false
Standard: Latest
StatementMacros: StatementMacros:
- Q_UNUSED - Q_UNUSED
- QT_REQUIRE_VERSION - QT_REQUIRE_VERSION
TabWidth: 3 TabWidth: 3
UseCRLF: false
UseTab: Never UseTab: Never
... ...

View file

@ -11,11 +11,11 @@ Officially supported OS is Ubuntu 20.04.
Following dependencies are needed for a clean install of Ubuntu 20.04: Following dependencies are needed for a clean install of Ubuntu 20.04:
``` ```
sudo apt-get install \ sudo apt-get install \
apt-utils autoconf bash build-essential ca-certificates cmake dnsutils \ apt-utils autoconf bash build-essential ca-certificates clang-format cmake
doxygen expect git graphviz libboost-all-dev libbz2-dev libcurl4-openssl-dev \ dnsutils doxygen expect git graphviz libboost-all-dev libbz2-dev \
libncurses-dev libreadline-dev libsnappy-dev libssl-dev libtool libzip-dev \ libcurl4-openssl-dev libncurses-dev libreadline-dev libsnappy-dev \
libzmq3-dev locales mc nano net-tools ntp openssh-server pkg-config perl \ libssl-dev libtool libzip-dev libzmq3-dev locales mc nano net-tools ntp \
python3 python3-jinja2 sudo wget openssh-server pkg-config perl python3 python3-jinja2 sudo wget
``` ```