Rename severity configuration to allow its name to be inferred

Source/SwiftLintBuiltInRules/Rules/Idiomatic/FileNameNoSpaceRule.swift

@@ -20,7 +20,7 @@ struct FileNameNoSpaceRule: OptInRule, SourceKitFreeRule {
  }
 
  return [StyleViolation(ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: filePath, line: 1))]
  }
 }

Source/SwiftLintBuiltInRules/Rules/Idiomatic/FileNameRule.swift

@@ -46,7 +46,7 @@ struct FileNameRule: OptInRule, SourceKitFreeRule {
  }
 
  return [StyleViolation(ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: filePath, line: 1))]
  }
 }

Source/SwiftLintBuiltInRules/Rules/Idiomatic/GenericTypeNameRule.swift

@@ -63,7 +63,7 @@ private extension GenericTypeNameRule {
  reason: """
  Generic type name '\(name)' should only contain alphanumeric and other allowed characters
  """,
- severity: configuration.unallowedSymbolsSeverity.severity
+ severity: configuration.unallowedSymbolsSeverity.violationSeverity
  )
  )
  } else if let caseCheckSeverity = configuration.validatesStartWithLowercase.severity,

Source/SwiftLintBuiltInRules/Rules/Idiomatic/RedundantTypeAnnotationRule.swift

@@ -80,7 +80,7 @@ struct RedundantTypeAnnotationRule: OptInRule, SubstitutionCorrectableRule {
  return violationRanges(in: file).map { range in
  StyleViolation(
  ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file, characterOffset: range.location)
  )
  }

Source/SwiftLintBuiltInRules/Rules/Idiomatic/SyntacticSugarRule.swift

@@ -21,7 +21,7 @@ struct SyntacticSugarRule: CorrectableRule, SourceKitFreeRule {
  flattenViolations(visitor.violations)
  }.map { violation in
  return StyleViolation(ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file, byteOffset: ByteCount(violation.position)),
  reason: violation.type.violationReason)
  }

Source/SwiftLintBuiltInRules/Rules/Idiomatic/TypeNameRule.swift

@@ -86,7 +86,7 @@ private extension TypeNameRule {
  return ReasonedRuleViolation(
  position: identifier.positionAfterSkippingLeadingTrivia,
  reason: "Type name '\(name)' should only contain alphanumeric and other allowed characters",
- severity: nameConfiguration.unallowedSymbolsSeverity.severity
+ severity: nameConfiguration.unallowedSymbolsSeverity.violationSeverity
  )
  }
  if let caseCheckSeverity = nameConfiguration.validatesStartWithLowercase.severity,

Source/SwiftLintBuiltInRules/Rules/Lint/AccessibilityLabelForImageRule.swift

@@ -55,7 +55,7 @@ struct AccessibilityLabelForImageRule: ASTRule, OptInRule {
 
  violations.append(
  StyleViolation(ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file, byteOffset: offset))
  )
  }

Source/SwiftLintBuiltInRules/Rules/Lint/AccessibilityTraitForButtonRule.swift

@@ -57,7 +57,7 @@ struct AccessibilityTraitForButtonRule: ASTRule, OptInRule {
 
  violations.append(
  StyleViolation(ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file, byteOffset: offset))
  )
  }

Source/SwiftLintBuiltInRules/Rules/Lint/BlanketDisableCommandRule.swift

@@ -100,7 +100,7 @@ struct BlanketDisableCommandRule: Rule, SourceKitFreeRule {
  ) -> StyleViolation {
  StyleViolation(
  ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: command.location(of: ruleIdentifier, in: file),
  reason: reason
  )

Source/SwiftLintBuiltInRules/Rules/Lint/CaptureVariableRule.swift

@@ -164,7 +164,7 @@ struct CaptureVariableRule: AnalyzerRule, CollectingRule {
  .filter { capturedVariable in collectedInfo.values.contains { $0.contains(capturedVariable.usr) } }
  .map {
  StyleViolation(ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file, byteOffset: $0.offset))
  }
  }

Source/SwiftLintBuiltInRules/Rules/Lint/CommentSpacingRule.swift

@@ -152,7 +152,7 @@ struct CommentSpacingRule: SourceKitFreeRule, SubstitutionCorrectableRule {
  return violationRanges(in: file).map { range in
  StyleViolation(
  ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file, characterOffset: range.location)
  )
  }

Source/SwiftLintBuiltInRules/Rules/Lint/ExpiringTodoRule.swift

@@ -88,11 +88,11 @@ struct ExpiringTodoRule: OptInRule {
  private func severity(for violationLevel: ExpiryViolationLevel) -> ViolationSeverity? {
  switch violationLevel {
  case .approachingExpiry:
- return configuration.approachingExpirySeverity.severity
+ return configuration.approachingExpirySeverity.violationSeverity
  case .expired:
- return configuration.expiredSeverity.severity
+ return configuration.expiredSeverity.violationSeverity
  case .badFormatting:
- return configuration.badFormattingSeverity.severity
+ return configuration.badFormattingSeverity.violationSeverity
  }
  }
 

Source/SwiftLintBuiltInRules/Rules/Lint/InvalidSwiftLintCommandRule.swift

@@ -62,7 +62,7 @@ struct InvalidSwiftLintCommandRule: Rule, SourceKitFreeRule {
  let character = command.startingCharacterPosition(in: file)
  return StyleViolation(
  ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file.path, line: command.line, character: character),
  reason: reason
  )

Source/SwiftLintBuiltInRules/Rules/Lint/PeriodSpacingRule.swift

@@ -80,7 +80,7 @@ struct PeriodSpacingRule: SourceKitFreeRule, OptInRule, SubstitutionCorrectableR
  return violationRanges(in: file).map { range in
  StyleViolation(
  ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file, characterOffset: range.location)
  )
  }

Source/SwiftLintBuiltInRules/Rules/Lint/QuickDiscouragedCallRule.swift

@@ -53,7 +53,7 @@ struct QuickDiscouragedCallRule: OptInRule {
 
  return violationOffsets(in: dictionary.enclosedArguments).map {
  StyleViolation(ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file, byteOffset: $0),
  reason: "Discouraged call inside a '\(name)' block")
  }

Source/SwiftLintBuiltInRules/Rules/Lint/UnusedDeclarationRule.swift

@@ -61,7 +61,7 @@ struct UnusedDeclarationRule: AnalyzerRule, CollectingRule {
  allReferencedUSRs: allReferencedUSRs)
  .map {
  StyleViolation(ruleDescription: Self.description,
- severity: configuration.severityConfiguration.severity,
+ severity: configuration.severity.violationSeverity,
  location: Location(file: file, byteOffset: $0))
  }
  }

Source/SwiftLintBuiltInRules/Rules/Lint/UnusedImportRule.swift

@@ -20,7 +20,7 @@ struct UnusedImportRule: CorrectableRule, AnalyzerRule {
  func validate(file: SwiftLintFile, compilerArguments: [String]) -> [StyleViolation] {
  return importUsage(in: file, compilerArguments: compilerArguments).map { importUsage in
  StyleViolation(ruleDescription: Self.description,
- severity: configuration.severity,
+ severity: configuration.violationSeverity,
  location: Location(file: file, characterOffset: importUsage.violationRange?.location ?? 1),
  reason: importUsage.violationReason)
  }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/AttributesConfiguration.swift

@@ -5,7 +5,7 @@ struct AttributesConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = AttributesRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "attributes_with_arguments_always_on_line_above")
  private(set) var attributesWithArgumentsAlwaysOnNewLine = true
  @ConfigurationElement(key: "always_on_same_line")

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/BlanketDisableCommandConfiguration.swift

@@ -5,7 +5,7 @@ struct BlanketDisableCommandConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = BlanketDisableCommandRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "allowed_rules")
  private(set) var allowedRuleIdentifiers: Set<String> = [
  "file_header",

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/CollectionAlignmentConfiguration.swift

@@ -5,7 +5,7 @@ struct CollectionAlignmentConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = CollectionAlignmentRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "align_colons")
  private(set) var alignColons = false
 }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/ColonConfiguration.swift

@@ -5,7 +5,7 @@ struct ColonConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = ColonRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "flexible_right_spacing")
  private(set) var flexibleRightSpacing = false
  @ConfigurationElement(key: "apply_to_dictionaries")

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/ComputedAccessorsOrderConfiguration.swift

@@ -11,7 +11,7 @@ struct ComputedAccessorsOrderConfiguration: SeverityBasedRuleConfiguration {
  }
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "order")
  private(set) var order = Order.getSet
 }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/ConditionalReturnsOnNewlineConfiguration.swift

@@ -5,7 +5,7 @@ struct ConditionalReturnsOnNewlineConfiguration: SeverityBasedRuleConfiguration
  typealias Parent = ConditionalReturnsOnNewlineRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "if_only")
  private(set) var ifOnly = false
 }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/DeploymentTargetConfiguration.swift

@@ -105,12 +105,12 @@ struct DeploymentTargetConfiguration: SeverityBasedRuleConfiguration {
  private(set) var tvOSDeploymentTarget = Version(platform: .tvOS, major: 9)
  private(set) var tvOSAppExtensionDeploymentTarget = Version(platform: .tvOSApplicationExtension, major: 9)
 
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
 
  private let targets: [String: Version]
 
  var parameterDescription: RuleConfigurationDescription? {
- severityConfiguration
+ severity
  for (platform, target) in targets.sorted(by: { $0.key < $1.key }) {
  platform => .symbol(target.stringValue)
  }
@@ -135,7 +135,7 @@ struct DeploymentTargetConfiguration: SeverityBasedRuleConfiguration {
  }
  for (key, value) in configuration {
  if key == "severity", let value = value as? String {
- try severityConfiguration.apply(configuration: value)
+ try severity.apply(configuration: value)
  continue
  }
  guard let target = targets[key] else {

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/DiscouragedDirectInitConfiguration.swift

@@ -5,7 +5,7 @@ struct DiscouragedDirectInitConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = DiscouragedDirectInitRule
 
  @ConfigurationElement(key: "severity")
- var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ var severity = SeverityConfiguration<Parent>(.warning)
 
  @ConfigurationElement(
  key: "types",

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/EmptyCountConfiguration.swift

@@ -5,7 +5,7 @@ struct EmptyCountConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = EmptyCountRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.error)
+ private(set) var severity = SeverityConfiguration<Parent>(.error)
  @ConfigurationElement(key: "only_after_dot")
  private(set) var onlyAfterDot = false
 }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/ExplicitInitConfiguration.swift

@@ -3,7 +3,7 @@ struct ExplicitInitConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = ExplicitInitRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "include_bare_init")
  private(set) var includeBareInit = false
 }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/ExplicitTypeInterfaceConfiguration.swift

@@ -15,7 +15,7 @@ struct ExplicitTypeInterfaceConfiguration: SeverityBasedRuleConfiguration {
  }
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "excluded")
  private(set) var excluded = [VariableKind]()
  @ConfigurationElement(key: "allow_redundancy")

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/FileHeaderConfiguration.swift

@@ -11,7 +11,7 @@ struct FileHeaderConfiguration: SeverityBasedRuleConfiguration {
  [.anchorsMatchLines, .dotMatchesLineSeparators]
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "required_string")
  private var requiredString: String?
  @ConfigurationElement(key: "required_pattern")
@@ -60,8 +60,8 @@ struct FileHeaderConfiguration: SeverityBasedRuleConfiguration {
  }
  }
 
- if let severityString = configuration[$severityConfiguration.key] {
- try severityConfiguration.apply(configuration: severityString)
+ if let severityString = configuration[$severity.key] {
+ try severity.apply(configuration: severityString)
  }
  }
 

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/FileNameConfiguration.swift

@@ -5,7 +5,7 @@ struct FileNameConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = FileNameRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "excluded")
  private(set) var excluded: Set = ["main.swift", "LinuxMain.swift"]
  @ConfigurationElement(key: "prefix_pattern")

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/FileNameNoSpaceConfiguration.swift

@@ -5,7 +5,7 @@ struct FileNameNoSpaceConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = FileNameNoSpaceRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>.warning
+ private(set) var severity = SeverityConfiguration<Parent>.warning
  @ConfigurationElement(key: "excluded")
  private(set) var excluded = Set<String>()
 }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/FileTypesOrderConfiguration.swift

@@ -14,7 +14,7 @@ struct FileTypesOrderConfiguration: SeverityBasedRuleConfiguration {
  }
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "order")
  private(set) var order: [[FileType]] = [
  [.supportingType],

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/ForWhereConfiguration.swift

@@ -5,7 +5,7 @@ struct ForWhereConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = ForWhereRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "allow_for_as_filter")
  private(set) var allowForAsFilter = false
 }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/ImplicitReturnConfiguration.swift

@@ -20,7 +20,7 @@ struct ImplicitReturnConfiguration: SeverityBasedRuleConfiguration {
  static let defaultIncludedKinds = Set(ReturnKind.allCases)
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "included")
  private(set) var includedKinds = Self.defaultIncludedKinds
 

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/ImplicitlyUnwrappedOptionalConfiguration.swift

@@ -12,7 +12,7 @@ struct ImplicitlyUnwrappedOptionalConfiguration: SeverityBasedRuleConfiguration
  }
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>.warning
+ private(set) var severity = SeverityConfiguration<Parent>.warning
  @ConfigurationElement(key: "mode")
  private(set) var mode = ImplicitlyUnwrappedOptionalModeConfiguration.allExceptIBOutlets
 }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/InclusiveLanguageConfiguration.swift

@@ -16,7 +16,7 @@ struct InclusiveLanguageConfiguration: SeverityBasedRuleConfiguration {
  ]
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "additional_terms")
  private(set) var additionalTerms: Set<String>?
  @ConfigurationElement(key: "override_terms")

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/IndentationWidthConfiguration.swift

@@ -5,7 +5,7 @@ struct IndentationWidthConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = IndentationWidthRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>.warning
+ private(set) var severity = SeverityConfiguration<Parent>.warning
  @ConfigurationElement(
  key: "indentation_width",
  postprocessor: { if $0 < 1 { throw Issue.invalidConfiguration(ruleID: Parent.identifier) } }

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/ModifierOrderConfiguration.swift

@@ -6,7 +6,7 @@ struct ModifierOrderConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = ModifierOrderRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "preferred_modifier_order")
  private(set) var preferredModifierOrder: [SwiftDeclarationAttributeKind.ModifierGroup] = [
  .override,

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/MultilineArgumentsConfiguration.swift

@@ -12,7 +12,7 @@ struct MultilineArgumentsConfiguration: SeverityBasedRuleConfiguration {
  }
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "first_argument_location")
  private(set) var firstArgumentLocation = FirstArgumentLocation.anyLine
  @ConfigurationElement(key: "only_enforce_after_first_closure_on_first_line")

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/MultilineParametersConfiguration.swift

@@ -5,7 +5,7 @@ struct MultilineParametersConfiguration: SeverityBasedRuleConfiguration {
  typealias Parent = MultilineParametersRule
 
  @ConfigurationElement(key: "severity")
- private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
+ private(set) var severity = SeverityConfiguration<Parent>(.warning)
  @ConfigurationElement(key: "allows_single_line")
  private(set) var allowsSingleLine = true
 }