From 20364ea36aa275e8b3f6dc9931e1be31f1c605af Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Tue, 8 Nov 2022 15:55:58 -0500
Subject: [PATCH] Update .clang-format to match existing style
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I082446af8267dbd6c8b7eca3a35388722b804d8d
---
 .clang-format | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/.clang-format b/.clang-format
index 66b5ef408..1d38b796e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,8 @@
 AccessModifierOffset: -8
-AlignAfterOpenBracket: DontAlign
+AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: Consecutive
 AlignEscapedNewlines: Left
 AlignOperands: false
 AlignTrailingComments: false
@@ -14,7 +15,7 @@ AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: true
+BinPackArguments: false
 BinPackParameters: false
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: AfterColon
@@ -38,10 +39,12 @@ BreakStringLiterals: false
 ColumnLimit: 100
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 8
-ContinuationIndentWidth: 16
+ContinuationIndentWidth: 8
+Cpp11BracedListStyle: false
 DerivePointerAlignment: false
 DisableFormat: false
 EmptyLineBeforeAccessModifier: LogicalBlock
+FixNamespaceComments: true
 ForEachMacros:
   - 'cds_lfht_for_each_entry'
   - 'cds_lfht_for_each_entry_safe'
@@ -49,10 +52,19 @@ ForEachMacros:
   - 'cds_list_for_each_entry'
   - 'cds_list_for_each_entry_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
-- 
2.34.1