diff --git a/.swift-format b/.swift-format index 267c15a..1d8155d 100644 --- a/.swift-format +++ b/.swift-format @@ -3,13 +3,14 @@ "accessLevel": "private" }, "indentConditionalCompilationBlocks": false, + "indentBlankLines": false, "indentSwitchCaseLabels": false, "indentation": { "spaces": 4 }, "lineBreakAroundMultilineExpressionChainComponents": false, "lineBreakBeforeControlFlowKeywords": false, - "lineBreakBeforeEachArgument": true, + "lineBreakBeforeEachArgument": false, "lineBreakBeforeEachGenericRequirement": false, "lineBreakBetweenDeclarationAttributes": false, "lineLength": 120, @@ -21,9 +22,7 @@ ] }, "prioritizeKeepingFunctionOutputTogether": true, - "reflowMultilineStringLiterals": { - "never": { } - }, + "reflowMultilineStringLiterals": "onlyLinesOverLength", "respectsExistingLineBreaks": true, "rules": { "AllPublicDeclarationsHaveDocumentation": true, @@ -31,7 +30,7 @@ "AlwaysUseLowerCamelCase": true, "AmbiguousTrailingClosureOverload": true, "AvoidRetroactiveConformances": true, - "BeginDocumentationCommentWithOneLineSummary": true, + "BeginDocumentationCommentWithOneLineSummary": false, "DoNotUseSemicolons": true, "DontRepeatTypeInStaticProperties": true, "FileScopedDeclarationPrivacy": true, @@ -60,7 +59,7 @@ "ReplaceForEachWithForLoop": true, "ReturnVoidInsteadOfEmptyTuple": true, "TypeNamesShouldBeCapitalized": true, - "UseEarlyExits": false, + "UseEarlyExits": true, "UseExplicitNilCheckInConditions": true, "UseLetInEveryBoundCaseVariable": true, "UseShorthandTypeNames": true, diff --git a/Plugins/SwiftFormatBuildToolPlugin/plugin.swift b/Plugins/SwiftFormatBuildToolPlugin/plugin.swift index 0e7596d..80fb59d 100644 --- a/Plugins/SwiftFormatBuildToolPlugin/plugin.swift +++ b/Plugins/SwiftFormatBuildToolPlugin/plugin.swift @@ -243,13 +243,14 @@ private let fallbackConfigJSON = """ "accessLevel": "private" }, "indentConditionalCompilationBlocks": false, + "indentBlankLines": false, "indentSwitchCaseLabels": false, "indentation": { "spaces": 4 }, "lineBreakAroundMultilineExpressionChainComponents": false, "lineBreakBeforeControlFlowKeywords": false, - "lineBreakBeforeEachArgument": true, + "lineBreakBeforeEachArgument": false, "lineBreakBeforeEachGenericRequirement": false, "lineBreakBetweenDeclarationAttributes": false, "lineLength": 120, @@ -261,9 +262,7 @@ private let fallbackConfigJSON = """ ] }, "prioritizeKeepingFunctionOutputTogether": true, - "reflowMultilineStringLiterals": { - "never": { } - }, + "reflowMultilineStringLiterals": "onlyLinesOverLength", "respectsExistingLineBreaks": true, "rules": { "AllPublicDeclarationsHaveDocumentation": true, @@ -271,7 +270,7 @@ private let fallbackConfigJSON = """ "AlwaysUseLowerCamelCase": true, "AmbiguousTrailingClosureOverload": true, "AvoidRetroactiveConformances": true, - "BeginDocumentationCommentWithOneLineSummary": true, + "BeginDocumentationCommentWithOneLineSummary": false, "DoNotUseSemicolons": true, "DontRepeatTypeInStaticProperties": true, "FileScopedDeclarationPrivacy": true, @@ -300,7 +299,7 @@ private let fallbackConfigJSON = """ "ReplaceForEachWithForLoop": true, "ReturnVoidInsteadOfEmptyTuple": true, "TypeNamesShouldBeCapitalized": true, - "UseEarlyExits": false, + "UseEarlyExits": true, "UseExplicitNilCheckInConditions": true, "UseLetInEveryBoundCaseVariable": true, "UseShorthandTypeNames": true, diff --git a/Plugins/SwiftFormatCommandPlugin/plugin.swift b/Plugins/SwiftFormatCommandPlugin/plugin.swift index 23a42a9..a5b40a3 100644 --- a/Plugins/SwiftFormatCommandPlugin/plugin.swift +++ b/Plugins/SwiftFormatCommandPlugin/plugin.swift @@ -254,13 +254,14 @@ private let fallbackConfigJSON = """ "accessLevel": "private" }, "indentConditionalCompilationBlocks": false, + "indentBlankLines": false, "indentSwitchCaseLabels": false, "indentation": { "spaces": 4 }, "lineBreakAroundMultilineExpressionChainComponents": false, "lineBreakBeforeControlFlowKeywords": false, - "lineBreakBeforeEachArgument": true, + "lineBreakBeforeEachArgument": false, "lineBreakBeforeEachGenericRequirement": false, "lineBreakBetweenDeclarationAttributes": false, "lineLength": 120, @@ -272,9 +273,7 @@ private let fallbackConfigJSON = """ ] }, "prioritizeKeepingFunctionOutputTogether": true, - "reflowMultilineStringLiterals": { - "never": { } - }, + "reflowMultilineStringLiterals": "onlyLinesOverLength", "respectsExistingLineBreaks": true, "rules": { "AllPublicDeclarationsHaveDocumentation": true, @@ -282,7 +281,7 @@ private let fallbackConfigJSON = """ "AlwaysUseLowerCamelCase": true, "AmbiguousTrailingClosureOverload": true, "AvoidRetroactiveConformances": true, - "BeginDocumentationCommentWithOneLineSummary": true, + "BeginDocumentationCommentWithOneLineSummary": false, "DoNotUseSemicolons": true, "DontRepeatTypeInStaticProperties": true, "FileScopedDeclarationPrivacy": true, @@ -311,7 +310,7 @@ private let fallbackConfigJSON = """ "ReplaceForEachWithForLoop": true, "ReturnVoidInsteadOfEmptyTuple": true, "TypeNamesShouldBeCapitalized": true, - "UseEarlyExits": false, + "UseEarlyExits": true, "UseExplicitNilCheckInConditions": true, "UseLetInEveryBoundCaseVariable": true, "UseShorthandTypeNames": true,