From 4a972db089344bc60d65173c2e2f3a0193a719af Mon Sep 17 00:00:00 2001
From: John Wellbelove <jwellbelove@users.noreply.github.com>
Date: Sat, 2 Oct 2021 17:54:20 +0100
Subject: [PATCH] Updated to closely match ETL formatting

---
 .clang-format                   | 36 ++++++++++++++++++++++++++++-----
 test/vs2019/etl.vcxproj         |  4 ++++
 test/vs2019/etl.vcxproj.filters | 15 ++++++++++++++
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/.clang-format b/.clang-format
index 8e7ff44e..8a409985 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,25 +1,51 @@
 ---
+#------------------------------------
+# Configuration for clang-format v12
+#------------------------------------
+
 Language: Cpp
 
-SortIncludes: false
+SortIncludes: true
 
 BasedOnStyle: Chromium
 
-BreakBeforeBraces: Stroustrup
+BinPackParameters: false
+BitFieldColonSpacing: Both
 
-AllowShortBlocksOnASingleLine: true
+BreakBeforeBraces: Allman
+BreakConstructorInitializers: BeforeComma
+
+AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: Inline
+AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+
 ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
 ConstructorInitializerIndentWidth: '2'
 
-ColumnLimit: '150'
+NamespaceIndentation: All
+IndentPPDirectives: BeforeHash
+PointerAlignment: Left
+ColumnLimit: '0'
 ContinuationIndentWidth: '2'
+UseTab: Never
 TabWidth: '2'
 IndentWidth: '2'
 AccessModifierOffset : '-2'
 IndentCaseLabels: false
 Cpp11BracedListStyle: 'true'
+AlignAfterOpenBracket: Align
+AlignConsecutiveDeclarations: true
+
+#------------------------------------
+# Configurations not supported by clang-format v12
+#------------------------------------
+# BreakInheritanceList: AfterComma
+# EmptyLineBeforeAccessModifier: Always
+# EmptyLineAfterAccessModifier: Always
+# ReferenceAlignment: Left
+
 ...
diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj
index 89e16065..7b89a50e 100644
--- a/test/vs2019/etl.vcxproj
+++ b/test/vs2019/etl.vcxproj
@@ -8366,9 +8366,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\.circleci\config.yml" />
+    <None Include="..\..\.clang-format" />
+    <None Include="..\..\.gitattributes" />
     <None Include="..\..\.github\workflows\clang.yml" />
     <None Include="..\..\.github\workflows\gcc.yml" />
     <None Include="..\..\.github\workflows\vs2019.yml" />
+    <None Include="..\..\.gitignore" />
+    <None Include="..\..\.gitmodules" />
     <None Include="..\..\appveyor.yml" />
     <None Include="..\..\arduino\create_arduino_library.py" />
     <None Include="..\..\arduino\examples\Example_0_import_etl\Example_0_import_etl.ino" />
diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
index 120b521b..6140c34a 100644
--- a/test/vs2019/etl.vcxproj.filters
+++ b/test/vs2019/etl.vcxproj.filters
@@ -121,6 +121,9 @@
     <Filter Include="Source Files\Sanity Checks\Logs">
       <UniqueIdentifier>{5b76fd56-eb83-489f-b9a6-798c07c5fa76}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Resource Files\Git">
+      <UniqueIdentifier>{ffb65df4-d5c7-44ab-a9c7-1150ddce2d6f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\etl\enum_type.h">
@@ -3106,6 +3109,18 @@
     <None Include="..\..\arduino\examples\Vector_Examples\Example_Vector_1_simple_use\Example_Vector_1_simple_use.ino">
       <Filter>ETL\Arduino\Examples\Vector_Examples\Example_Vector_1_simple_use</Filter>
     </None>
+    <None Include="..\..\.clang-format">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\..\.gitattributes">
+      <Filter>Resource Files\Git</Filter>
+    </None>
+    <None Include="..\..\.gitignore">
+      <Filter>Resource Files\Git</Filter>
+    </None>
+    <None Include="..\..\.gitmodules">
+      <Filter>Resource Files\Git</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\support\Release notes.txt">