GitHub/SwiftLint
1
0
Fork 0
mirror of https://github.com/realm/SwiftLint.git synced 2026-06-06 20:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add guard statements to nonTriggeringExamples and triggeringExamples and fix tests.

Browse Source
This commit is contained in:
David Potter
2015-10-23 19:11:44 -07:00
parent 94b7ebdf36
commit 8748a4f3a2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/SwiftLintFramework/Rules/ControlStatementRule.swift
+8 -3
View File
@@ -14,9 +14,11 @@ public struct ControlStatementRule: Rule {
public let identifier = "control_statement"
public func validateFile(file: File) -> [StyleViolation] {
return ["if", "for", "guard", "switch", "while"].flatMap { statementKind -> [StyleViolation] in
let pattern = statementKind == "guard" ?
"\(statementKind)\\s*\\([^,]*\\)\\s*else\\s*\\{" : "\(statementKind)\\s*\\([^,]*\\)\\s*\\{"
let statements = ["if", "for", "guard", "switch", "while"]
return statements.flatMap { statementKind -> [StyleViolation] in
let pattern = statementKind == "guard"
? "\(statementKind)\\s*\\([^,]*\\)\\s*else\\s*\\{"
: "\(statementKind)\\s*\\([^,]*\\)\\s*\\{"
return file.matchPattern(pattern).flatMap { match, syntaxKinds in
if syntaxKinds.first != .Keyword {
return nil
@@ -43,6 +45,7 @@ public struct ControlStatementRule: Rule {
"for (key, value) in dictionary {\n",
"for (index, value) in enumerate(array) {\n",
"for var index = 0; index < 42; index++ {\n",
"guard condition else {\n",
"while condition {\n",
"} while condition {\n",
"do { ; } while condition {\n",
@@ -55,6 +58,8 @@ public struct ControlStatementRule: Rule {
"for (var index = 0; index < 42; index++) {\n",
"for(item in collection) {\n",
"for(var index = 0; index < 42; index++) {\n",
"guard (condition) else {\n",
"guard (condition) else {\n",
"while (condition) {\n",
"while(condition) {\n",
"} while (condition) {\n",