Skip to content

Commit

Permalink
Merge branch 'feature/#436-clang-format-file' into development
Browse files Browse the repository at this point in the history
# Conflicts:
#	test/vs2019/etl.vcxproj.filters
  • Loading branch information
jwellbelove committed Oct 2, 2021
2 parents c691991 + 4a972db commit 21dc927
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 1 deletion.
51 changes: 51 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
---
#------------------------------------
# Configuration for clang-format v12
#------------------------------------

Language: Cpp

SortIncludes: true

BasedOnStyle: Chromium

BinPackParameters: false
BitFieldColonSpacing: Both

BreakBeforeBraces: Allman
BreakConstructorInitializers: BeforeComma

AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: true
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: false

AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true

ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
ConstructorInitializerIndentWidth: '2'

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

...
4 changes: 4 additions & 0 deletions test/vs2019/etl.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8367,9 +8367,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" />
Expand Down
17 changes: 16 additions & 1 deletion test/vs2019/etl.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,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>
<Filter Include="Resource Files\Meson">
<UniqueIdentifier>{690ab671-31ea-446a-bd63-a7a2bf05b409}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -3109,6 +3112,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>
<None Include="..\..\meson.build">
<Filter>Resource Files\Meson</Filter>
</None>
Expand Down Expand Up @@ -3170,4 +3185,4 @@
<Filter>Resource Files</Filter>
</Natvis>
</ItemGroup>
</Project>
</Project>

0 comments on commit 21dc927

Please sign in to comment.