From b6be91301722024bdfe76a598003550d0e3ab700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danny=20M=C3=B6sch?= Date: Tue, 1 Nov 2022 04:29:42 +0100 Subject: [PATCH] Update SwiftFormat to version 0.50.x (#577) --- .swiftformat | 9 +++++++++ scripts/swiftformat.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.swiftformat b/.swiftformat index 11ffe6e..8d02852 100644 --- a/.swiftformat +++ b/.swiftformat @@ -15,6 +15,7 @@ andOperator, \ anyObjectProtocol, \ assertionFailures, \ + blankLineAfterImports, \ blankLinesAroundMark, \ blankLinesAtEndOfScope, \ blankLinesAtStartOfScope, \ @@ -30,6 +31,7 @@ enumNamespaces, \ extensionAccessControl, \ fileHeader, \ +# genericExtensions, \ hoistPatternLet, \ indent, \ initCoderUnavailable, \ @@ -40,6 +42,7 @@ modifierOrder, \ # markTypes, \ numberFormatting, \ +# opaqueGenericParameters, \ # organizeDeclarations, \ preferDouble, \ preferKeyPath, \ @@ -54,6 +57,7 @@ redundantLetError, \ redundantNilInit, \ redundantObjc, \ +# redundantOptionalBinding, \ redundantParens, \ redundantPattern, \ redundantRawValues, \ @@ -91,6 +95,7 @@ wrapConditionalBodies, \ # wrapEnumCases, \ # wrapMultilineStatementBraces, \ + wrapSingleLineComments, \ # wrapSwitchCases, \ yodaConditions @@ -132,6 +137,10 @@ --emptybraces no-space +### Enum namespaces: "always" (default) or "structs-only" + +--enumnamespaces always + ### Case of 'e' in numbers: "lowercase" or "uppercase" (default) --exponentcase lowercase diff --git a/scripts/swiftformat.sh b/scripts/swiftformat.sh index 065354a..021720b 100755 --- a/scripts/swiftformat.sh +++ b/scripts/swiftformat.sh @@ -1,5 +1,5 @@ export PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}" -SWIFTFORMAT_VERSION="0.49.*" +SWIFTFORMAT_VERSION="0.50.*" if [[ "${CI}" == "true" ]]; then echo "Running in a Continuous Integration environment. Formatting is skipped."