Specify default options in configurations only (#5056)
This commit is contained in:
parent
156f6aabc8
commit
23326fc433
|
@ -4,21 +4,25 @@ struct ModifierOrderConfiguration: SeverityBasedRuleConfiguration, Equatable {
|
|||
typealias Parent = ModifierOrderRule
|
||||
|
||||
private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
|
||||
private(set) var preferredModifierOrder = [SwiftDeclarationAttributeKind.ModifierGroup]()
|
||||
private(set) var preferredModifierOrder: [SwiftDeclarationAttributeKind.ModifierGroup] = [
|
||||
.override,
|
||||
.acl,
|
||||
.setterACL,
|
||||
.dynamic,
|
||||
.mutators,
|
||||
.lazy,
|
||||
.final,
|
||||
.required,
|
||||
.convenience,
|
||||
.typeMethods,
|
||||
.owned
|
||||
]
|
||||
|
||||
var consoleDescription: String {
|
||||
return "severity: \(severityConfiguration.consoleDescription)"
|
||||
+ ", preferred_modifier_order: \(preferredModifierOrder)"
|
||||
}
|
||||
|
||||
init() {
|
||||
self.preferredModifierOrder = []
|
||||
}
|
||||
|
||||
init(preferredModifierOrder: [SwiftDeclarationAttributeKind.ModifierGroup] = []) {
|
||||
self.preferredModifierOrder = preferredModifierOrder
|
||||
}
|
||||
|
||||
mutating func apply(configuration: Any) throws {
|
||||
guard let configuration = configuration as? [String: Any] else {
|
||||
throw Issue.unknownConfiguration(ruleID: Parent.identifier)
|
||||
|
|
|
@ -2,9 +2,9 @@ struct NumberSeparatorConfiguration: SeverityBasedRuleConfiguration, Equatable {
|
|||
typealias Parent = NumberSeparatorRule
|
||||
|
||||
private(set) var severityConfiguration = SeverityConfiguration<Parent>(.warning)
|
||||
private(set) var minimumLength: Int
|
||||
private(set) var minimumLength = 0
|
||||
private(set) var minimumFractionLength: Int?
|
||||
private(set) var excludeRanges: [Range<Double>]
|
||||
private(set) var excludeRanges = [Range<Double>]()
|
||||
|
||||
var consoleDescription: String {
|
||||
let minimumFractionLengthDescription: String
|
||||
|
@ -18,12 +18,6 @@ struct NumberSeparatorConfiguration: SeverityBasedRuleConfiguration, Equatable {
|
|||
+ minimumFractionLengthDescription
|
||||
}
|
||||
|
||||
init(minimumLength: Int, minimumFractionLength: Int?, excludeRanges: [Range<Double>]) {
|
||||
self.minimumLength = minimumLength
|
||||
self.minimumFractionLength = minimumFractionLength
|
||||
self.excludeRanges = excludeRanges
|
||||
}
|
||||
|
||||
mutating func apply(configuration: Any) throws {
|
||||
guard let configuration = configuration as? [String: Any] else {
|
||||
throw Issue.unknownConfiguration(ruleID: Parent.identifier)
|
||||
|
|
|
@ -2,21 +2,7 @@ import Foundation
|
|||
import SourceKittenFramework
|
||||
|
||||
struct ModifierOrderRule: ASTRule, OptInRule, ConfigurationProviderRule, CorrectableRule {
|
||||
var configuration = ModifierOrderConfiguration(
|
||||
preferredModifierOrder: [
|
||||
.override,
|
||||
.acl,
|
||||
.setterACL,
|
||||
.dynamic,
|
||||
.mutators,
|
||||
.lazy,
|
||||
.final,
|
||||
.required,
|
||||
.convenience,
|
||||
.typeMethods,
|
||||
.owned
|
||||
]
|
||||
)
|
||||
var configuration = ModifierOrderConfiguration()
|
||||
|
||||
static let description = RuleDescription(
|
||||
identifier: "modifier_order",
|
||||
|
|
|
@ -2,11 +2,7 @@ import Foundation
|
|||
import SwiftSyntax
|
||||
|
||||
struct NumberSeparatorRule: OptInRule, SwiftSyntaxCorrectableRule, ConfigurationProviderRule {
|
||||
var configuration = NumberSeparatorConfiguration(
|
||||
minimumLength: 0,
|
||||
minimumFractionLength: nil,
|
||||
excludeRanges: []
|
||||
)
|
||||
var configuration = NumberSeparatorConfiguration()
|
||||
|
||||
static let description = RuleDescription(
|
||||
identifier: "number_separator",
|
||||
|
|
Loading…
Reference in New Issue