Merge branch 'master' of https://github.com/aarondaub/SwiftLint into …

…ad-dynamicRules
realm · May 20, 2015 · 97b96ec · 97b96ec
2 parents 9299e54 + d550d7d
commit 97b96ec
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@
 * The `Rule` and `ASTRule` protocol members are now non-static.  
   [aarondaub](https://github.com/aarondaub)
 
+* Split `Rule` into `Rule` and `ParameterizedRule` protocols.  
+  [aarondaub](https://github.com/aarondaub)
+  [#21](https://github.com/realm/SwiftLint/issues/21)
+
 ##### Enhancements
 
 * The following rules now conform to `ASTRule`: 

diff --git a/Source/SwiftLintFramework/Rule.swift b/Source/SwiftLintFramework/Rule.swift
@@ -8,14 +8,13 @@
 
 import SourceKittenFramework
 
+protocol Rule {
+    var identifier: String { get }
+    func validateFile(file: File) -> [StyleViolation]
+}
+
 protocol ParameterizedRule: Rule {
     typealias ParameterType
     var parameters: [RuleParameter<ParameterType>] { get }
-
-}
-
-public protocol Rule {
-     var identifier: String { get }
-     func validateFile(file: File) -> [StyleViolation]
 }
 
diff --git a/Source/SwiftLintFramework/Rules/FunctionBodyLengthRule.swift b/Source/SwiftLintFramework/Rules/FunctionBodyLengthRule.swift
@@ -9,7 +9,7 @@
 import SourceKittenFramework
 import SwiftXPC
 
-struct FunctionBodyLengthRule: ASTRule {
+struct FunctionBodyLengthRule: ASTRule, ParameterizedRule {
     let identifier = "function_body_length"
     let parameters = [
         RuleParameter(severity: .VeryLow, value: 40),

diff --git a/Source/SwiftLintFramework/Rules/TypeBodyLengthRule.swift b/Source/SwiftLintFramework/Rules/TypeBodyLengthRule.swift
@@ -9,7 +9,7 @@
 import SourceKittenFramework
 import SwiftXPC
 
-struct TypeBodyLengthRule: ASTRule {
+struct TypeBodyLengthRule: ASTRule, ParameterizedRule {
     let identifier = "type_body_length"
     let parameters = [
         RuleParameter(severity: .VeryLow, value: 200),