From 68ee2008af9fe99eca656aba2b119daba700f097 Mon Sep 17 00:00:00 2001 From: Marcelo Fabri Date: Sun, 18 Dec 2016 18:23:05 -0200 Subject: [PATCH] Fixing existing violations --- Source/SwiftLintFramework/Rules/ExplicitInitRule.swift | 2 +- .../SwiftLintFramework/Rules/StatementPositionRule.swift | 8 ++++---- Tests/SwiftLintFrameworkTests/ConfigurationTests.swift | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/SwiftLintFramework/Rules/ExplicitInitRule.swift b/Source/SwiftLintFramework/Rules/ExplicitInitRule.swift index 70bfaa2c6..72eedcd38 100644 --- a/Source/SwiftLintFramework/Rules/ExplicitInitRule.swift +++ b/Source/SwiftLintFramework/Rules/ExplicitInitRule.swift @@ -31,7 +31,7 @@ public struct ExplicitInitRule: ASTRule, ConfigurationProviderRule, CorrectableR "[String.self].map { Type in Type↓.init(1) }" // starting with capital assumes as type ], corrections: [ - "[1].flatMap{String↓.init($0)}" : "[1].flatMap{String($0)}" + "[1].flatMap{String↓.init($0)}": "[1].flatMap{String($0)}" ] ) diff --git a/Source/SwiftLintFramework/Rules/StatementPositionRule.swift b/Source/SwiftLintFramework/Rules/StatementPositionRule.swift index 627ee209f..aade642d8 100644 --- a/Source/SwiftLintFramework/Rules/StatementPositionRule.swift +++ b/Source/SwiftLintFramework/Rules/StatementPositionRule.swift @@ -64,10 +64,10 @@ public struct StatementPositionRule: CorrectableRule, ConfigurationProviderRule "↓}\n\t catch {" ], corrections: [ - " }else if {":" }\n else if {", - "}\n else {":"}\nelse {", - " }\ncatch {":" }\n catch {", - "}\n\t catch {":"}\ncatch {" + " }else if {": " }\n else if {", + "}\n else {": "}\nelse {", + " }\ncatch {": " }\n catch {", + "}\n\t catch {": "}\ncatch {" ] ) diff --git a/Tests/SwiftLintFrameworkTests/ConfigurationTests.swift b/Tests/SwiftLintFrameworkTests/ConfigurationTests.swift index 270ee4d7d..63ce58b0a 100644 --- a/Tests/SwiftLintFrameworkTests/ConfigurationTests.swift +++ b/Tests/SwiftLintFrameworkTests/ConfigurationTests.swift @@ -46,7 +46,7 @@ class ConfigurationTests: XCTestCase { func testWhitelistRules() { let whitelist = ["nesting", "todo"] - let config = Configuration(dict: ["whitelist_rules": whitelist])! + let config = Configuration(dict: ["whitelist_rules": whitelist])! let configuredIdentifiers = config.rules.map { type(of: $0).description.identifier }.sorted() @@ -85,7 +85,7 @@ class ConfigurationTests: XCTestCase { } func testDisabledRules() { - let disabledConfig = Configuration(dict: ["disabled_rules": ["nesting", "todo"]])! + let disabledConfig = Configuration(dict: ["disabled_rules": ["nesting", "todo"]])! XCTAssertEqual(disabledConfig.disabledRules, ["nesting", "todo"], "initializing Configuration with valid rules in Dictionary should succeed") @@ -97,7 +97,7 @@ class ConfigurationTests: XCTestCase { XCTAssertEqual(expectedIdentifiers, configuredIdentifiers) // Duplicate - let duplicateConfig = Configuration(dict: ["disabled_rules": ["todo", "todo"]]) + let duplicateConfig = Configuration(dict: ["disabled_rules": ["todo", "todo"]]) XCTAssert(duplicateConfig == nil, "initializing Configuration with duplicate rules in " + "Dictionary should fail") }