diff --git a/Source/SwiftLintFramework/Rules/FileLengthRule.swift b/Source/SwiftLintFramework/Rules/FileLengthRule.swift index 6e2afefd6..5fc60a914 100644 --- a/Source/SwiftLintFramework/Rules/FileLengthRule.swift +++ b/Source/SwiftLintFramework/Rules/FileLengthRule.swift @@ -9,7 +9,7 @@ import SourceKittenFramework public struct FileLengthRule: ConfigurationProviderRule { - public var configuration = RuleLevelsConfig(warning: 400, error: 1000) + public var configuration = SeverityLevelConfig(warning: 400, error: 1000) public init() {} diff --git a/Source/SwiftLintFramework/Rules/FunctionBodyLengthRule.swift b/Source/SwiftLintFramework/Rules/FunctionBodyLengthRule.swift index 5397e890c..ebdafb88d 100644 --- a/Source/SwiftLintFramework/Rules/FunctionBodyLengthRule.swift +++ b/Source/SwiftLintFramework/Rules/FunctionBodyLengthRule.swift @@ -9,7 +9,7 @@ import SourceKittenFramework public struct FunctionBodyLengthRule: ASTRule, ConfigurationProviderRule { - public var configuration = RuleLevelsConfig(warning: 40, error: 100) + public var configuration = SeverityLevelConfig(warning: 40, error: 100) public init() {} diff --git a/Source/SwiftLintFramework/Rules/LineLengthRule.swift b/Source/SwiftLintFramework/Rules/LineLengthRule.swift index 1f190c75f..728a498f7 100644 --- a/Source/SwiftLintFramework/Rules/LineLengthRule.swift +++ b/Source/SwiftLintFramework/Rules/LineLengthRule.swift @@ -9,7 +9,7 @@ import SourceKittenFramework public struct LineLengthRule: ConfigurationProviderRule { - public var configuration = RuleLevelsConfig(warning: 100, error: 200) + public var configuration = SeverityLevelConfig(warning: 100, error: 200) public init() {} diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/RuleMinMaxConfig.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/MinMaxLengthConfig.swift similarity index 66% rename from Source/SwiftLintFramework/Rules/RuleConfigurations/RuleMinMaxConfig.swift rename to Source/SwiftLintFramework/Rules/RuleConfigurations/MinMaxLengthConfig.swift index e20ee3a5b..74a27b156 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/RuleMinMaxConfig.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/MinMaxLengthConfig.swift @@ -1,5 +1,5 @@ // -// RuleMinMaxConfig.swift +// MinMaxLengthConfig.swift // SwiftLint // // Created by Scott Hoyt on 1/19/16. @@ -8,13 +8,13 @@ import Foundation -public struct RuleMinMaxConfig: RuleConfiguration, Equatable { - var min: RuleLevelsConfig - var max: RuleLevelsConfig +public struct MinMaxLengthConfig: RuleConfiguration, Equatable { + var min: SeverityLevelConfig + var max: SeverityLevelConfig init(minWarning: Int, minError: Int, maxWarning: Int, maxError: Int) { - min = RuleLevelsConfig(warning: minWarning, error: minError) - max = RuleLevelsConfig(warning: maxWarning, error: maxError) + min = SeverityLevelConfig(warning: minWarning, error: minError) + max = SeverityLevelConfig(warning: maxWarning, error: maxError) } public mutating func setConfiguration(config: AnyObject) throws { @@ -31,14 +31,14 @@ public struct RuleMinMaxConfig: RuleConfiguration, Equatable { } public func isEqualTo(ruleConfiguration: RuleConfiguration) -> Bool { - if let ruleConfig = ruleConfiguration as? RuleMinMaxConfig { + if let ruleConfig = ruleConfiguration as? MinMaxLengthConfig { return self == ruleConfig } return false } } -public func == (lhs: RuleMinMaxConfig, rhs: RuleMinMaxConfig) -> Bool { +public func == (lhs: MinMaxLengthConfig, rhs: MinMaxLengthConfig) -> Bool { return lhs.min == rhs.min && lhs.max == rhs.max } diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/RuleLevelsConfig.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/SeverityLevelConfig.swift similarity index 86% rename from Source/SwiftLintFramework/Rules/RuleConfigurations/RuleLevelsConfig.swift rename to Source/SwiftLintFramework/Rules/RuleConfigurations/SeverityLevelConfig.swift index bc626949a..e157e8671 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/RuleLevelsConfig.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/SeverityLevelConfig.swift @@ -1,5 +1,5 @@ // -// RuleLevelsConfig.swift +// SeverityLevelConfig.swift // SwiftLint // // Created by Scott Hoyt on 1/19/16. @@ -8,7 +8,7 @@ import Foundation -public struct RuleLevelsConfig: RuleConfiguration, Equatable { +public struct SeverityLevelConfig: RuleConfiguration, Equatable { var warning: RuleParameter var error: RuleParameter @@ -40,13 +40,13 @@ public struct RuleLevelsConfig: RuleConfiguration, Equatable { } public func isEqualTo(ruleConfiguration: RuleConfiguration) -> Bool { - if let config = ruleConfiguration as? RuleLevelsConfig { + if let config = ruleConfiguration as? SeverityLevelConfig { return self == config } return false } } -public func == (lhs: RuleLevelsConfig, rhs: RuleLevelsConfig) -> Bool { +public func == (lhs: SeverityLevelConfig, rhs: SeverityLevelConfig) -> Bool { return lhs.warning == rhs.warning && lhs.error == rhs.error } diff --git a/Source/SwiftLintFramework/Rules/TypeBodyLengthRule.swift b/Source/SwiftLintFramework/Rules/TypeBodyLengthRule.swift index e882191be..a79a3d6d1 100644 --- a/Source/SwiftLintFramework/Rules/TypeBodyLengthRule.swift +++ b/Source/SwiftLintFramework/Rules/TypeBodyLengthRule.swift @@ -9,7 +9,7 @@ import SourceKittenFramework public struct TypeBodyLengthRule: ASTRule, ConfigurationProviderRule { - public var configuration = RuleLevelsConfig(warning: 200, error: 350) + public var configuration = SeverityLevelConfig(warning: 200, error: 350) public init() {} diff --git a/Source/SwiftLintFramework/Rules/TypeNameRule.swift b/Source/SwiftLintFramework/Rules/TypeNameRule.swift index 2d17d55f3..d106e531b 100644 --- a/Source/SwiftLintFramework/Rules/TypeNameRule.swift +++ b/Source/SwiftLintFramework/Rules/TypeNameRule.swift @@ -11,7 +11,7 @@ import SourceKittenFramework public struct TypeNameRule: ASTRule, ConfigurationProviderRule { - public var configuration = RuleMinMaxConfig(minWarning: 3, + public var configuration = MinMaxLengthConfig(minWarning: 3, minError: 0, maxWarning: 40, maxError: 1000) diff --git a/Source/SwiftLintFramework/Rules/VariableNameRule.swift b/Source/SwiftLintFramework/Rules/VariableNameRule.swift index cb27d9fa4..a4a1edd12 100644 --- a/Source/SwiftLintFramework/Rules/VariableNameRule.swift +++ b/Source/SwiftLintFramework/Rules/VariableNameRule.swift @@ -10,11 +10,11 @@ import Foundation import SourceKittenFramework public struct VariableNameRuleConfig: RuleConfiguration { - var lengthConfig: RuleMinMaxConfig + var lengthConfig: MinMaxLengthConfig var excluded: [String] init(minWarning: Int, minError: Int, maxWarning: Int, maxError: Int, excluded: [String] = []) { - lengthConfig = RuleMinMaxConfig(minWarning: minWarning, + lengthConfig = MinMaxLengthConfig(minWarning: minWarning, minError: minError, maxWarning: maxWarning, maxError: maxError) diff --git a/Source/SwiftLintFrameworkTests/RuleTests.swift b/Source/SwiftLintFrameworkTests/RuleTests.swift index f3f032a33..eb0a8412e 100644 --- a/Source/SwiftLintFrameworkTests/RuleTests.swift +++ b/Source/SwiftLintFrameworkTests/RuleTests.swift @@ -11,7 +11,7 @@ import SourceKittenFramework @testable import SwiftLintFramework struct RuleWithLevelsMock: ConfigurationProviderRule { - var configuration = RuleLevelsConfig(warning: 2, error: 3) + var configuration = SeverityLevelConfig(warning: 2, error: 3) static let description = RuleDescription(identifier: "violation_level_mock", name: "", @@ -38,7 +38,7 @@ class RuleTests: XCTestCase { } private struct RuleWithLevelsMock2: ConfigurationProviderRule { - var configuration = RuleLevelsConfig(warning: 2, error: 3) + var configuration = SeverityLevelConfig(warning: 2, error: 3) static let description = RuleDescription(identifier: "violation_level_mock2", name: "", diff --git a/SwiftLint.xcodeproj/project.pbxproj b/SwiftLint.xcodeproj/project.pbxproj index 1fdf29a96..11a5621e6 100644 --- a/SwiftLint.xcodeproj/project.pbxproj +++ b/SwiftLint.xcodeproj/project.pbxproj @@ -21,8 +21,8 @@ 3B5B9FE11C444DA20009AD27 /* Array+SwiftLint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B5B9FE01C444DA20009AD27 /* Array+SwiftLint.swift */; }; 3BCC04C61C4EFA52006073C3 /* RuleConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BCC04C51C4EFA52006073C3 /* RuleConfiguration.swift */; }; 3BCC04CD1C4F5694006073C3 /* ConfigurationError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BCC04CC1C4F5694006073C3 /* ConfigurationError.swift */; }; - 3BCC04D11C4F56D3006073C3 /* RuleLevelsConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BCC04CF1C4F56D3006073C3 /* RuleLevelsConfig.swift */; }; - 3BCC04D21C4F56D3006073C3 /* RuleMinMaxConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BCC04D01C4F56D3006073C3 /* RuleMinMaxConfig.swift */; }; + 3BCC04D11C4F56D3006073C3 /* SeverityLevelConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BCC04CF1C4F56D3006073C3 /* SeverityLevelConfig.swift */; }; + 3BCC04D21C4F56D3006073C3 /* MinMaxLengthConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BCC04D01C4F56D3006073C3 /* MinMaxLengthConfig.swift */; }; 3BD9CD3D1C37175B009A5D25 /* YamlParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BD9CD3C1C37175B009A5D25 /* YamlParser.swift */; }; 3BDB224B1C345B4900473680 /* ProjectMock in Resources */ = {isa = PBXBuildFile; fileRef = 3BDB224A1C345B4900473680 /* ProjectMock */; }; 69F88BF71BDA38A6005E7CAE /* OpeningBraceRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 692B1EB11BD7E00F00EAABFF /* OpeningBraceRule.swift */; }; @@ -164,8 +164,8 @@ 3B5B9FE01C444DA20009AD27 /* Array+SwiftLint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+SwiftLint.swift"; sourceTree = ""; }; 3BCC04C51C4EFA52006073C3 /* RuleConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RuleConfiguration.swift; sourceTree = ""; }; 3BCC04CC1C4F5694006073C3 /* ConfigurationError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationError.swift; sourceTree = ""; }; - 3BCC04CF1C4F56D3006073C3 /* RuleLevelsConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RuleLevelsConfig.swift; sourceTree = ""; }; - 3BCC04D01C4F56D3006073C3 /* RuleMinMaxConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RuleMinMaxConfig.swift; sourceTree = ""; }; + 3BCC04CF1C4F56D3006073C3 /* SeverityLevelConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SeverityLevelConfig.swift; sourceTree = ""; }; + 3BCC04D01C4F56D3006073C3 /* MinMaxLengthConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MinMaxLengthConfig.swift; sourceTree = ""; }; 3BD9CD3C1C37175B009A5D25 /* YamlParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YamlParser.swift; sourceTree = ""; }; 3BDB224A1C345B4900473680 /* ProjectMock */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ProjectMock; sourceTree = ""; }; 5499CA961A2394B700783309 /* Components.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Components.plist; sourceTree = ""; }; @@ -309,8 +309,8 @@ 3BCC04CE1C4F56D3006073C3 /* RuleConfigurations */ = { isa = PBXGroup; children = ( - 3BCC04CF1C4F56D3006073C3 /* RuleLevelsConfig.swift */, - 3BCC04D01C4F56D3006073C3 /* RuleMinMaxConfig.swift */, + 3BCC04CF1C4F56D3006073C3 /* SeverityLevelConfig.swift */, + 3BCC04D01C4F56D3006073C3 /* MinMaxLengthConfig.swift */, ); path = RuleConfigurations; sourceTree = ""; @@ -806,11 +806,11 @@ E80E018F1B92C1350078EB70 /* Region.swift in Sources */, E88198581BEA956C00333A11 /* FunctionBodyLengthRule.swift in Sources */, E88DEA751B09852000A66CB0 /* File+SwiftLint.swift in Sources */, - 3BCC04D11C4F56D3006073C3 /* RuleLevelsConfig.swift in Sources */, + 3BCC04D11C4F56D3006073C3 /* SeverityLevelConfig.swift in Sources */, E86396C51BADAC15002C9E88 /* XcodeReporter.swift in Sources */, E86396C91BADB2B9002C9E88 /* JSONReporter.swift in Sources */, E881985A1BEA96EA00333A11 /* OperatorFunctionWhitespaceRule.swift in Sources */, - 3BCC04D21C4F56D3006073C3 /* RuleMinMaxConfig.swift in Sources */, + 3BCC04D21C4F56D3006073C3 /* MinMaxLengthConfig.swift in Sources */, E88DEA6F1B09843F00A66CB0 /* Location.swift in Sources */, E88DEA771B098D0C00A66CB0 /* Rule.swift in Sources */, E81619531BFC162C00946723 /* QueuedPrint.swift in Sources */,