updated clangformat

mriffey · Aug 29, 2019 · 6e0aa2c · 6e0aa2c
1 parent b8520c7
commit 6e0aa2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,11 +8,11 @@ end_of_line = crlf
 charset = latin1
 
 [*.cpp]
-indent_style = tab
+indent_style = space
 indent_size = 4
 
 [*.h]
-indent_style = tab
+indent_style = space
 indent_size = 4
 
 [*.rc]

diff --git a/_clang-format b/_clang-format
@@ -5,7 +5,7 @@ AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlinesLeft: false
 AlignOperands: true
-AlignTrailingComments: false
+AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: true
@@ -48,8 +48,8 @@ IndentCaseLabels: false
 IndentWidth: 4
 IndentWrappedFunctionNames: true
 KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: '^BEGIN_MSG_MAP|^BEGIN_UPDATE_UI_MAP|^BEGIN_COM_MAP'
-MacroBlockEnd: '^END_MSG_MAP|^END_UPDATE_UI_MAP|^END_COM_MAP'
+MacroBlockBegin: '^BEGIN_MSG_MAP|^BEGIN_UPDATE_UI_MAP|^BEGIN_COM_MAP|^BEGIN_DLGRESIZE_MAP'
+MacroBlockEnd: '^END_MSG_MAP|^END_UPDATE_UI_MAP|^END_COM_MAP|^END_DLGRESIZE_MAP'
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 PenaltyBreakBeforeFirstCallParameter: 100
@@ -73,4 +73,4 @@ SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: Cpp11
 TabWidth: 4
-UseTab: Always
+UseTab: Never