From dbbe820ae40d208c07c45b700fcc99063e68d1eb Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Tue, 25 Aug 2020 10:15:43 -0700 Subject: [PATCH] Update clang-format to 10.0 (#7389) This commit removes our local copy of clang-format 8 and replaces it with a newly-built nuget package containing clang-format 10. This resolves the inconsistency between our version of clang-format and the one shipped in Visual Studio. A couple minor format changes were either required or erroneously forced upon us--chief among them is a redistribution of `*`s around SAL annotations in inline class members of COM classes. Don't ask why; I couldn't figure it out. We had some aspirational goals for our formatting, which were left in but commented out. Enabling them changes our format a little more than I'm comfortable with, so I uncommented them and locked them to the format style we've been using for the past year. We may not love it, but our aspirations may not matter here any longer. Consistent formatting is better than perfect formatting. --- .clang-format | 14 +++++++++----- dep/llvm/clang-format.exe | Bin 2526208 -> 0 bytes .../PublicTerminalCore/HwndTerminal.cpp | 2 +- src/inc/til/static_map.h | 2 +- src/propsheet/PropSheetHandler.cpp | 12 ++++++------ src/renderer/dx/DxRenderer.cpp | 3 +-- src/terminal/input/terminalInput.cpp | 3 +-- tools/OpenConsole.psm1 | 12 +++++++++--- tools/packages.config | 4 ++++ 9 files changed, 32 insertions(+), 20 deletions(-) delete mode 100644 dep/llvm/clang-format.exe create mode 100644 tools/packages.config diff --git a/.clang-format b/.clang-format index 9e5a7d1315..26a27f32ed 100644 --- a/.clang-format +++ b/.clang-format @@ -1,17 +1,19 @@ AccessModifierOffset: -4 AlignAfterOpenBracket: Align -#AllowAllArgumentsOnNextLine: false +AllowAllArgumentsOnNextLine: true +AlignConsecutiveMacros: false AlignConsecutiveAssignments: false AlignConsecutiveDeclarations: false -#AllowAllConstructorInitializersOnNextLine: false +AllowAllConstructorInitializersOnNextLine: true AlignEscapedNewlines: Left AlignOperands: true AlignTrailingComments: false AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: Never AllowShortFunctionsOnASingleLine: Inline AllowShortCaseLabelsOnASingleLine: false -AllowShortIfStatementsOnASingleLine: false +AllowShortIfStatementsOnASingleLine: Never #AllowShortLambdasOnASingleLine: Inline AllowShortLoopsOnASingleLine: false AlwaysBreakAfterReturnType: None @@ -20,6 +22,7 @@ AlwaysBreakTemplateDeclarations: Yes BinPackArguments: false BinPackParameters: false BraceWrapping: + AfterCaseLabel: true AfterClass: true AfterControlStatement: true AfterEnum: true @@ -47,6 +50,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: false +DeriveLineEnding: true DerivePointerAlignment: false FixNamespaceComments: false IncludeBlocks: Regroup @@ -73,7 +77,7 @@ ReflowComments: false SortIncludes: false SortUsingDeclarations: true SpaceAfterCStyleCast: false -#SpaceAfterLogicalNot: false +SpaceAfterLogicalNot: false SpaceAfterTemplateKeyword: false SpaceBeforeAssignmentOperators: true SpaceBeforeCpp11BracedList: false @@ -88,6 +92,6 @@ SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Cpp11 +Standard: Latest TabWidth: 4 UseTab: Never diff --git a/dep/llvm/clang-format.exe b/dep/llvm/clang-format.exe deleted file mode 100644 index efed82cc09d1ec79ee4b595518e8cf3b37a8ed51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2526208 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