X-Git-Url: https://git.liburcu.org/?p=lttng-tools.git;a=blobdiff_plain;f=.clang-format;h=66b5ef4088dc7e9088f12c8ff4c7f4c298e6558b;hp=3fc5c67376509f275d4ef5f5df8b23cbda51e586;hb=HEAD;hpb=1847c92bfb9fec90cf54b711f72f04a9a723df57

diff --git a/.clang-format b/.clang-format
index 3fc5c6737..28ea69873 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,9 +1,12 @@
-AlignAfterOpenBracket: DontAlign
+AccessModifierOffset: -8
+AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: Consecutive
 AlignEscapedNewlines: Left
-AlignOperands: true
+AlignOperands: false
 AlignTrailingComments: false
+AllowAllConstructorInitializersOnNextLine: true
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
@@ -11,14 +14,17 @@ AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-BinPackArguments: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
 BinPackParameters: false
+BitFieldColonSpacing: None
 BreakBeforeBraces: Custom
+BreakConstructorInitializers: AfterColon
 BraceWrapping:
   AfterControlStatement: false
   AfterEnum: false
   AfterFunction: true
-  AfterNamespace: true
+  AfterNamespace: false
   AfterStruct: false
   AfterUnion: false
   AfterExternBlock: false
@@ -29,22 +35,40 @@ BraceWrapping:
   SplitEmptyFunction: true
 BreakBeforeBinaryOperators: None
 BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: AfterColon
 BreakStringLiterals: false
-ColumnLimit: 80
-ContinuationIndentWidth: 16
+ColumnLimit: 100
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+ContinuationIndentWidth: 8
+Cpp11BracedListStyle: false
 DerivePointerAlignment: false
 DisableFormat: false
+EmptyLineBeforeAccessModifier: LogicalBlock
+FixNamespaceComments: true
 ForEachMacros:
   - 'cds_lfht_for_each_entry'
   - 'cds_lfht_for_each_entry_safe'
   - 'cds_lfht_for_each_duplicate'
   - 'cds_list_for_each_entry'
   - 'cds_list_for_each_entry_safe'
+  - 'for_each_action_mutable'
+  - 'for_each_action_const'
+  - 'cds_wfs_for_each_blocking_safe'
 
-IncludeBlocks: Preserve
+IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: '.*'
+  - Regex: '".*"'
+    Priority: 0
+  - Regex: '<common/.*>'
     Priority: 1
+  - Regex: '<lttng/.*>'
+    Priority: 2
+  - Regex: '<vendor/.*>'
+    Priority: 3
+  - Regex: '<.*>'
+    Priority: 9
+
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
 IndentPPDirectives: None
@@ -54,6 +78,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: ''
 MacroBlockEnd: ''
 MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
 
 # Taken from git's rules
 PenaltyBreakAssignment: 10
@@ -64,6 +89,7 @@ PenaltyExcessCharacter: 100
 PenaltyReturnTypeOnItsOwnLine: 60
 
 PointerAlignment: Right
+ReferenceAlignment: Left
 ReflowComments: true
 SortIncludes: true
 SpaceAfterCStyleCast: true