diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/AttributesConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/AttributesConfiguration.swift index 8b0d1c9cd..bb9355b09 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/AttributesConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/AttributesConfiguration.swift @@ -4,7 +4,7 @@ struct AttributesConfiguration: SeverityBasedRuleConfiguration, Equatable { private(set) var alwaysOnNewLine = Set() var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", always_on_same_line: \(alwaysOnSameLine.sorted())" + ", always_on_line_above: \(alwaysOnNewLine.sorted())" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/CollectionAlignmentConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/CollectionAlignmentConfiguration.swift index b1f60daa5..7da54f3c8 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/CollectionAlignmentConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/CollectionAlignmentConfiguration.swift @@ -5,7 +5,7 @@ struct CollectionAlignmentConfiguration: SeverityBasedRuleConfiguration, Equatab init() {} var consoleDescription: String { - return severityConfiguration.consoleDescription + ", align_colons: \(alignColons)" + return "severity: \(severityConfiguration.consoleDescription)" + ", align_colons: \(alignColons)" } mutating func apply(configuration: Any) throws { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ColonConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ColonConfiguration.swift index 8a0030ef3..ea8af1561 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ColonConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ColonConfiguration.swift @@ -4,7 +4,7 @@ struct ColonConfiguration: RuleConfiguration, Equatable { private(set) var applyToDictionaries = true var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", flexible_right_spacing: \(flexibleRightSpacing)" + ", apply_to_dictionaries: \(applyToDictionaries)" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ComputedAccessorsOrderRuleConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ComputedAccessorsOrderRuleConfiguration.swift index ab0f885d9..37df93790 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ComputedAccessorsOrderRuleConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ComputedAccessorsOrderRuleConfiguration.swift @@ -8,7 +8,8 @@ struct ComputedAccessorsOrderRuleConfiguration: SeverityBasedRuleConfiguration, private(set) var order = Order.getSet var consoleDescription: String { - return [severityConfiguration.consoleDescription, "order: \(order.rawValue)"].joined(separator: ", ") + return "severity: \(severityConfiguration.consoleDescription)" + + ", order: \(order.rawValue)" } mutating func apply(configuration: Any) throws { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ConditionalReturnsOnNewlineConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ConditionalReturnsOnNewlineConfiguration.swift index 500f1c8db..26ab1db13 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ConditionalReturnsOnNewlineConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ConditionalReturnsOnNewlineConfiguration.swift @@ -3,7 +3,7 @@ struct ConditionalReturnsOnNewlineConfiguration: SeverityBasedRuleConfiguration, private(set) var ifOnly = false var consoleDescription: String { - return [severityConfiguration.consoleDescription, "if_only: \(ifOnly)"].joined(separator: ", ") + return ["severity: \(severityConfiguration.consoleDescription)", "if_only: \(ifOnly)"].joined(separator: ", ") } mutating func apply(configuration: Any) throws { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/DeploymentTargetConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/DeploymentTargetConfiguration.swift index cb1685bbf..c8b526654 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/DeploymentTargetConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/DeploymentTargetConfiguration.swift @@ -112,7 +112,7 @@ struct DeploymentTargetConfiguration: SeverityBasedRuleConfiguration, Equatable private let targets: [String: Version] var consoleDescription: String { - severityConfiguration.consoleDescription + targets + "severity: \(severityConfiguration.consoleDescription)" + targets .sorted { $0.key < $1.key } .map { ", \($0): \($1.stringValue)" }.joined() } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/DiscouragedDirectInitConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/DiscouragedDirectInitConfiguration.swift index 5f99cac45..f8fd195c4 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/DiscouragedDirectInitConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/DiscouragedDirectInitConfiguration.swift @@ -6,7 +6,7 @@ struct DiscouragedDirectInitConfiguration: SeverityBasedRuleConfiguration, Equat var severityConfiguration = SeverityConfiguration(.warning) var consoleDescription: String { - return severityConfiguration.consoleDescription + ", types: \(discouragedInits.sorted(by: <))" + return "severity: \(severityConfiguration.consoleDescription)" + ", types: \(discouragedInits.sorted(by: <))" } private(set) var discouragedInits: Set diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/EmptyCountConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/EmptyCountConfiguration.swift index 9bd543350..6126e808a 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/EmptyCountConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/EmptyCountConfiguration.swift @@ -8,7 +8,7 @@ struct EmptyCountConfiguration: SeverityBasedRuleConfiguration, Equatable { private(set) var onlyAfterDot = false var consoleDescription: String { - return [severityConfiguration.consoleDescription, + return ["severity: \(severityConfiguration.consoleDescription)", "\(ConfigurationKey.onlyAfterDot.rawValue): \(onlyAfterDot)"].joined(separator: ", ") } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ExplicitTypeInterfaceConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ExplicitTypeInterfaceConfiguration.swift index 9f87033cc..72efcdb20 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ExplicitTypeInterfaceConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ExplicitTypeInterfaceConfiguration.swift @@ -16,7 +16,7 @@ struct ExplicitTypeInterfaceConfiguration: SeverityBasedRuleConfiguration, Equat var consoleDescription: String { let excludedKinds = VariableKind.all.subtracting(allowedKinds).map(\.rawValue).sorted() - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", excluded: \(excludedKinds)" + ", allow_redundancy: \(allowRedundancy)" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/FileHeaderConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/FileHeaderConfiguration.swift index 06c6fbdaf..09b9b5a15 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/FileHeaderConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/FileHeaderConfiguration.swift @@ -24,7 +24,7 @@ struct FileHeaderConfiguration: RuleConfiguration, Equatable { let forbiddenStringDescription = forbiddenString ?? "None" let forbiddenPatternDescription = forbiddenPattern ?? "None" - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", required_string: \(requiredStringDescription)" + ", required_pattern: \(requiredPatternDescription)" + ", forbidden_string: \(forbiddenStringDescription)" + diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/FileLengthRuleConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/FileLengthRuleConfiguration.swift index 46fa2663d..b7239c72f 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/FileLengthRuleConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/FileLengthRuleConfiguration.swift @@ -9,7 +9,7 @@ struct FileLengthRuleConfiguration: RuleConfiguration, Equatable { private(set) var severityConfiguration: SeverityLevelsConfiguration var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", \(ConfigurationKey.ignoreCommentOnlyLines.rawValue): \(ignoreCommentOnlyLines)" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/FileTypesOrderConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/FileTypesOrderConfiguration.swift index 89c2a2f1d..6b55b3aa9 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/FileTypesOrderConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/FileTypesOrderConfiguration.swift @@ -17,7 +17,7 @@ struct FileTypesOrderConfiguration: RuleConfiguration, Equatable { ] var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", order: \(String(describing: order))" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ForWhereRuleConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ForWhereRuleConfiguration.swift index a990592ed..2e48d2074 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ForWhereRuleConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ForWhereRuleConfiguration.swift @@ -3,7 +3,7 @@ struct ForWhereRuleConfiguration: SeverityBasedRuleConfiguration, Equatable { private(set) var allowForAsFilter = false var consoleDescription: String { - return severityConfiguration.consoleDescription + ", allow_for_as_filter: \(allowForAsFilter)" + return "severity: \(severityConfiguration.consoleDescription)" + ", allow_for_as_filter: \(allowForAsFilter)" } mutating func apply(configuration: Any) throws { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/FunctionParameterCountConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/FunctionParameterCountConfiguration.swift index 12229761c..9ebc08c85 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/FunctionParameterCountConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/FunctionParameterCountConfiguration.swift @@ -9,8 +9,8 @@ struct FunctionParameterCountConfiguration: RuleConfiguration, Equatable { private(set) var severityConfiguration: SeverityLevelsConfiguration var consoleDescription: String { - return severityConfiguration.consoleDescription + - "\(ConfigurationKey.ignoresDefaultParameters.rawValue): \(ignoresDefaultParameters)" + return "severity: \(severityConfiguration.consoleDescription)" + + ", \(ConfigurationKey.ignoresDefaultParameters.rawValue): \(ignoresDefaultParameters)" } init(warning: Int, error: Int?, ignoresDefaultParameters: Bool = true) { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ImplicitReturnConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ImplicitReturnConfiguration.swift index b586794e2..fda466986 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ImplicitReturnConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ImplicitReturnConfiguration.swift @@ -13,7 +13,7 @@ struct ImplicitReturnConfiguration: RuleConfiguration, Equatable { var consoleDescription: String { let includedKinds = self.includedKinds.map { $0.rawValue } - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", included: [\(includedKinds.sorted().joined(separator: ", "))]" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ImplicitlyUnwrappedOptionalConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ImplicitlyUnwrappedOptionalConfiguration.swift index 87f5d6a29..961a6b5e3 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ImplicitlyUnwrappedOptionalConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ImplicitlyUnwrappedOptionalConfiguration.swift @@ -23,7 +23,7 @@ struct ImplicitlyUnwrappedOptionalConfiguration: SeverityBasedRuleConfiguration, } var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", mode: \(mode)" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/InclusiveLanguageConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/InclusiveLanguageConfiguration.swift index 5f42b6979..133147536 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/InclusiveLanguageConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/InclusiveLanguageConfiguration.swift @@ -14,7 +14,7 @@ struct InclusiveLanguageConfiguration: SeverityBasedRuleConfiguration, Equatable private(set) var allAllowedTerms: Set var consoleDescription: String { - severityConfiguration.consoleDescription + "severity: \(severityConfiguration.consoleDescription)" + ", additional_terms: \(additionalTerms?.sorted() ?? [])" + ", override_terms: \(overrideTerms?.sorted() ?? [])" + ", override_allowed_terms: \(overrideAllowedTerms?.sorted() ?? [])" diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/IndentationWidthConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/IndentationWidthConfiguration.swift index 8285ccb8f..f9a5f3b1f 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/IndentationWidthConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/IndentationWidthConfiguration.swift @@ -1,6 +1,6 @@ struct IndentationWidthConfiguration: RuleConfiguration, Equatable { var consoleDescription: String { - return "severity: \(severityConfiguration.consoleDescription), " + return "severity: \("severity: \(severityConfiguration.consoleDescription)"), " + "indentation_width: \(indentationWidth), " + "include_comments: \(includeComments)" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ModifierOrderConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ModifierOrderConfiguration.swift index 1f57db991..53602c981 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ModifierOrderConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ModifierOrderConfiguration.swift @@ -5,7 +5,8 @@ struct ModifierOrderConfiguration: RuleConfiguration, Equatable { private(set) var preferredModifierOrder = [SwiftDeclarationAttributeKind.ModifierGroup]() var consoleDescription: String { - return severityConfiguration.consoleDescription + ", preferred_modifier_order: \(preferredModifierOrder)" + return "severity: \(severityConfiguration.consoleDescription)" + + ", preferred_modifier_order: \(preferredModifierOrder)" } init() { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/MultilineArgumentsConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/MultilineArgumentsConfiguration.swift index fec4fa569..d187b9d59 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/MultilineArgumentsConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/MultilineArgumentsConfiguration.swift @@ -26,7 +26,7 @@ struct MultilineArgumentsConfiguration: RuleConfiguration, Equatable { private(set) var onlyEnforceAfterFirstClosureOnFirstLine = false var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", \(ConfigurationKey.firstArgumentLocation.rawValue): \(firstArgumentLocation.rawValue)" + ", \(ConfigurationKey.onlyEnforceAfterFirstClosureOnFirstLine.rawValue): \(onlyEnforceAfterFirstClosureOnFirstLine)" // swiftlint:disable:previous line_length diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/MultilineParametersConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/MultilineParametersConfiguration.swift index 158d1be3d..6fecbe721 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/MultilineParametersConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/MultilineParametersConfiguration.swift @@ -3,7 +3,7 @@ struct MultilineParametersConfiguration: SeverityBasedRuleConfiguration, Equatab private(set) var allowsSingleLine = true var consoleDescription: String { - severityConfiguration.consoleDescription + "severity: \(severityConfiguration.consoleDescription)" + ", allowsSingleLine: \(allowsSingleLine)" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/NumberSeparatorConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/NumberSeparatorConfiguration.swift index ae4372dd1..055b8e5c7 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/NumberSeparatorConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/NumberSeparatorConfiguration.swift @@ -11,7 +11,7 @@ struct NumberSeparatorConfiguration: SeverityBasedRuleConfiguration, Equatable { } else { minimumFractionLengthDescription = ", minimum_fraction_length: none" } - return severityConfiguration.consoleDescription + return "severity: \(severityConfiguration.consoleDescription)" + ", minimum_length: \(minimumLength)" + minimumFractionLengthDescription } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ObjectLiteralConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ObjectLiteralConfiguration.swift index cb91ed593..da89fa988 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ObjectLiteralConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ObjectLiteralConfiguration.swift @@ -4,7 +4,7 @@ struct ObjectLiteralConfiguration: SeverityBasedRuleConfiguration, Equatable { private(set) var colorLiteral = true var consoleDescription: String { - return severityConfiguration.consoleDescription + return "severity: \(severityConfiguration.consoleDescription)" + ", image_literal: \(imageLiteral)" + ", color_literal: \(colorLiteral)" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/OpeningBraceConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/OpeningBraceConfiguration.swift index 3b2f137f9..401aa331b 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/OpeningBraceConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/OpeningBraceConfiguration.swift @@ -8,7 +8,7 @@ struct OpeningBraceConfiguration: RuleConfiguration, Equatable { private(set) var allowMultilineFunc = false var consoleDescription: String { - return [severityConfiguration.consoleDescription, + return ["severity: \(severityConfiguration.consoleDescription)", "\(ConfigurationKey.allowMultilineFunc): \(allowMultilineFunc)"].joined(separator: ", ") } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/OperatorUsageWhitespaceConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/OperatorUsageWhitespaceConfiguration.swift index 77c4aa5ee..0859bf840 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/OperatorUsageWhitespaceConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/OperatorUsageWhitespaceConfiguration.swift @@ -5,7 +5,7 @@ struct OperatorUsageWhitespaceConfiguration: RuleConfiguration, Equatable { private(set) var allowedNoSpaceOperators: [String] = ["...", "..<"] var consoleDescription: String { - return severityConfiguration.consoleDescription + return "severity: \(severityConfiguration.consoleDescription)" + ", lines_look_around: \(linesLookAround)" + ", skip_aligned_constants: \(skipAlignedConstants)" + ", allowed_no_space_operators: \(allowedNoSpaceOperators)" diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/OverriddenSuperCallConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/OverriddenSuperCallConfiguration.swift index 29fd928b5..c24ce4852 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/OverriddenSuperCallConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/OverriddenSuperCallConfiguration.swift @@ -45,7 +45,7 @@ struct OverriddenSuperCallConfiguration: SeverityBasedRuleConfiguration, Equatab } var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", excluded: \(excluded)" + ", included: \(included)" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/PrefixedConstantRuleConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/PrefixedConstantRuleConfiguration.swift index 582bc61f6..be19d2ff5 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/PrefixedConstantRuleConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/PrefixedConstantRuleConfiguration.swift @@ -3,7 +3,7 @@ struct PrefixedConstantRuleConfiguration: SeverityBasedRuleConfiguration, Equata var onlyPrivateMembers = false var consoleDescription: String { - return severityConfiguration.consoleDescription + ", only_private: \(onlyPrivateMembers)" + return "severity: \(severityConfiguration.consoleDescription)" + ", only_private: \(onlyPrivateMembers)" } init(onlyPrivateMembers: Bool) { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/PrivateOutletRuleConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/PrivateOutletRuleConfiguration.swift index 351124985..46470b21a 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/PrivateOutletRuleConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/PrivateOutletRuleConfiguration.swift @@ -3,7 +3,7 @@ struct PrivateOutletRuleConfiguration: SeverityBasedRuleConfiguration, Equatable var allowPrivateSet = false var consoleDescription: String { - return severityConfiguration.consoleDescription + ", allow_private_set: \(allowPrivateSet)" + return "severity: \(severityConfiguration.consoleDescription)" + ", allow_private_set: \(allowPrivateSet)" } init(allowPrivateSet: Bool) { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/PrivateOverFilePrivateRuleConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/PrivateOverFilePrivateRuleConfiguration.swift index df6055270..9975ad614 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/PrivateOverFilePrivateRuleConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/PrivateOverFilePrivateRuleConfiguration.swift @@ -3,7 +3,7 @@ struct PrivateOverFilePrivateRuleConfiguration: SeverityBasedRuleConfiguration, var validateExtensions = false var consoleDescription: String { - return severityConfiguration.consoleDescription + ", validate_extensions: \(validateExtensions)" + return "severity: \(severityConfiguration.consoleDescription)" + ", validate_extensions: \(validateExtensions)" } // MARK: - RuleConfiguration diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/ProhibitedSuperConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/ProhibitedSuperConfiguration.swift index 1aedec505..56a9587bb 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/ProhibitedSuperConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/ProhibitedSuperConfiguration.swift @@ -17,7 +17,7 @@ struct ProhibitedSuperConfiguration: SeverityBasedRuleConfiguration, Equatable { init() {} var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", excluded: [\(excluded)]" + ", included: [\(included)]" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/SelfBindingConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/SelfBindingConfiguration.swift index 100389ff8..5da73c880 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/SelfBindingConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/SelfBindingConfiguration.swift @@ -8,7 +8,7 @@ struct SelfBindingConfiguration: SeverityBasedRuleConfiguration, Equatable { private(set) var bindIdentifier = "self" var consoleDescription: String { - return [severityConfiguration.consoleDescription, + return ["severity: \(severityConfiguration.consoleDescription)", "\(ConfigurationKey.bindIdentifier): \(bindIdentifier)"].joined(separator: ", ") } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/SwitchCaseAlignmentConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/SwitchCaseAlignmentConfiguration.swift index 0879fabc7..15e9f30a0 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/SwitchCaseAlignmentConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/SwitchCaseAlignmentConfiguration.swift @@ -5,7 +5,7 @@ struct SwitchCaseAlignmentConfiguration: SeverityBasedRuleConfiguration, Equatab init() {} var consoleDescription: String { - return severityConfiguration.consoleDescription + ", indented_cases: \(indentedCases)" + return "severity: \(severityConfiguration.consoleDescription)" + ", indented_cases: \(indentedCases)" } mutating func apply(configuration: Any) throws { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/TestCaseAccessibilityConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/TestCaseAccessibilityConfiguration.swift index 3c7458a18..dff5b8eda 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/TestCaseAccessibilityConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/TestCaseAccessibilityConfiguration.swift @@ -4,7 +4,7 @@ struct TestCaseAccessibilityConfiguration: SeverityBasedRuleConfiguration, Equat private(set) var testParentClasses: Set = ["QuickSpec", "XCTestCase"] var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", allowed_prefixes: \(allowedPrefixes.sorted())" + ", test_parent_classes: \(testParentClasses.sorted())" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingClosureConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingClosureConfiguration.swift index 5ddc0d8c5..4dc350d9f 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingClosureConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingClosureConfiguration.swift @@ -3,7 +3,8 @@ struct TrailingClosureConfiguration: RuleConfiguration, Equatable { private(set) var onlySingleMutedParameter: Bool var consoleDescription: String { - return severityConfiguration.consoleDescription + ", only_single_muted_parameter: \(onlySingleMutedParameter)" + return "severity: \(severityConfiguration.consoleDescription)" + + ", only_single_muted_parameter: \(onlySingleMutedParameter)" } init(onlySingleMutedParameter: Bool = false) { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingCommaConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingCommaConfiguration.swift index d9a973be7..9cc5cfa11 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingCommaConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingCommaConfiguration.swift @@ -3,7 +3,7 @@ struct TrailingCommaConfiguration: SeverityBasedRuleConfiguration, Equatable { private(set) var mandatoryComma: Bool var consoleDescription: String { - return severityConfiguration.consoleDescription + ", mandatory_comma: \(mandatoryComma)" + return "severity: \(severityConfiguration.consoleDescription)" + ", mandatory_comma: \(mandatoryComma)" } init(mandatoryComma: Bool = false) { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingWhitespaceConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingWhitespaceConfiguration.swift index 99c2f6608..135fc5776 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingWhitespaceConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/TrailingWhitespaceConfiguration.swift @@ -4,7 +4,7 @@ struct TrailingWhitespaceConfiguration: RuleConfiguration, Equatable { var ignoresComments = true var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", ignores_empty_lines: \(ignoresEmptyLines)" + ", ignores_comments: \(ignoresComments)" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/TypeContentsOrderConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/TypeContentsOrderConfiguration.swift index e0b50e38b..ce60606dd 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/TypeContentsOrderConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/TypeContentsOrderConfiguration.swift @@ -36,7 +36,7 @@ struct TypeContentsOrderConfiguration: RuleConfiguration, Equatable { ] var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", order: \(String(describing: order))" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/UnitTestRuleConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/UnitTestRuleConfiguration.swift index 790c55470..e8f5530c9 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/UnitTestRuleConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/UnitTestRuleConfiguration.swift @@ -7,7 +7,7 @@ public struct UnitTestRuleConfiguration: SeverityBasedRuleConfiguration, Equatab public private(set) var testParentClasses: Set = ["QuickSpec", "XCTestCase"] public var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", test_parent_classes: \(testParentClasses.sorted())" } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/UnusedOptionalBindingConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/UnusedOptionalBindingConfiguration.swift index 16cce2016..bc7db0292 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/UnusedOptionalBindingConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/UnusedOptionalBindingConfiguration.swift @@ -3,7 +3,7 @@ struct UnusedOptionalBindingConfiguration: SeverityBasedRuleConfiguration, Equat private(set) var ignoreOptionalTry: Bool var consoleDescription: String { - return severityConfiguration.consoleDescription + ", ignore_optional_try: \(ignoreOptionalTry)" + return "severity: \(severityConfiguration.consoleDescription)" + ", ignore_optional_try: \(ignoreOptionalTry)" } init(ignoreOptionalTry: Bool) { diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/VerticalWhitespaceConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/VerticalWhitespaceConfiguration.swift index 09efc286e..6ca6247f4 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/VerticalWhitespaceConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/VerticalWhitespaceConfiguration.swift @@ -3,7 +3,7 @@ struct VerticalWhitespaceConfiguration: RuleConfiguration, Equatable { private(set) var maxEmptyLines: Int var consoleDescription: String { - return severityConfiguration.consoleDescription + ", max_empty_lines: \(maxEmptyLines)" + return "severity: \(severityConfiguration.consoleDescription)" + ", max_empty_lines: \(maxEmptyLines)" } init(maxEmptyLines: Int) { diff --git a/Source/SwiftLintFramework/Rules/Style/VerticalWhitespaceClosingBracesRule.swift b/Source/SwiftLintFramework/Rules/Style/VerticalWhitespaceClosingBracesRule.swift index da67d3adf..91872125f 100644 --- a/Source/SwiftLintFramework/Rules/Style/VerticalWhitespaceClosingBracesRule.swift +++ b/Source/SwiftLintFramework/Rules/Style/VerticalWhitespaceClosingBracesRule.swift @@ -27,7 +27,7 @@ extension VerticalWhitespaceClosingBracesRule { private(set) var onlyEnforceBeforeTrivialLines = false var consoleDescription: String { - return severityConfiguration.consoleDescription + + return "severity: \(severityConfiguration.consoleDescription)" + ", \(ConfigurationKey.onlyEnforceBeforeTrivialLines.rawValue): \(onlyEnforceBeforeTrivialLines)" } diff --git a/Tests/SwiftLintFrameworkTests/ExplicitTypeInterfaceConfigurationTests.swift b/Tests/SwiftLintFrameworkTests/ExplicitTypeInterfaceConfigurationTests.swift index 568fcfad4..976f4481f 100644 --- a/Tests/SwiftLintFrameworkTests/ExplicitTypeInterfaceConfigurationTests.swift +++ b/Tests/SwiftLintFrameworkTests/ExplicitTypeInterfaceConfigurationTests.swift @@ -44,7 +44,7 @@ class ExplicitTypeInterfaceConfigurationTests: XCTestCase { try config.apply(configuration: ["excluded": ["class", "instance"]]) XCTAssertEqual( config.consoleDescription, - "warning, excluded: [\"class\", \"instance\"], allow_redundancy: false" + "severity: warning, excluded: [\"class\", \"instance\"], allow_redundancy: false" ) } } diff --git a/Tests/SwiftLintFrameworkTests/RuleConfigurationTests.swift b/Tests/SwiftLintFrameworkTests/RuleConfigurationTests.swift index e41e5f195..0df7e23c9 100644 --- a/Tests/SwiftLintFrameworkTests/RuleConfigurationTests.swift +++ b/Tests/SwiftLintFrameworkTests/RuleConfigurationTests.swift @@ -383,6 +383,6 @@ class RuleConfigurationTests: XCTestCase { XCTAssertEqual(configuration.severityConfiguration.severity, .error) XCTAssertEqual(configuration.order, .setGet) - XCTAssertEqual(configuration.consoleDescription, "error, order: set_get") + XCTAssertEqual(configuration.consoleDescription, "severity: error, order: set_get") } }