Skip to content

Commit

Permalink
Update clang format
Browse files Browse the repository at this point in the history
  • Loading branch information
fdrmrc committed Apr 20, 2024
1 parent 8994155 commit 2917772
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# The clang-format (Clang 6) style file used by deal.II.
# The clang-format (Clang 16) style file used by deal.II.
#

AccessModifierOffset: -2
Expand All @@ -26,8 +26,9 @@ BinPackArguments: false
BinPackParameters: false

BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterControlStatement: Always
AfterEnum: true
AfterExternBlock: true
AfterFunction: true
Expand All @@ -36,6 +37,8 @@ BraceWrapping:
AfterUnion: true
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: false
BeforeWhile: true
IndentBraces: true
SplitEmptyFunction: false
SplitEmptyRecord: false
Expand Down Expand Up @@ -69,6 +72,8 @@ IncludeCategories:
Priority: -1
# deal.II folders in sorted order:
- Regex: "deal.II/algorithms/.*\\.h"
Priority: 100
- Regex: "deal.II/arborx/.*\\.h"
Priority: 110
- Regex: "deal.II/base/.*\\.h"
Priority: 120
Expand Down Expand Up @@ -112,6 +117,8 @@ IncludeCategories:
Priority: 300
- Regex: "deal.II/sundials/.*\\.h"
Priority: 310
- Regex: "deal.II/trilinos/.*\\.h"
Priority: 320
# put boost right after deal:
- Regex: "<boost.*>"
Priority: 500
Expand Down Expand Up @@ -153,6 +160,8 @@ PointerAlignment: Right
ReflowComments: true
CommentPragmas: '( \| |\*--|<li>|@ref | @p |@param |@name |@returns |@warning |@ingroup |@author |@date |@related |@relates |@relatesalso |@deprecated |@image |@return |@brief |@attention |@copydoc |@addtogroup |@todo |@tparam |@see |@note |@skip |@skipline |@until |@line |@dontinclude |@include)'

QualifierAlignment: Left

SortIncludes: true
SortUsingDeclarations: true

Expand All @@ -168,7 +177,7 @@ SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false

Standard: Cpp11
Standard: c++20

TabWidth: 2

Expand Down

0 comments on commit 2917772

Please sign in to comment.