From 42c8db92b120bedbd2b7b90de3f5ffcb05ea618a Mon Sep 17 00:00:00 2001 From: JP Simard Date: Mon, 10 Jul 2017 22:53:19 -0700 Subject: [PATCH] fix a number of uncaught colon spacing violations --- Source/SwiftLintFramework/Rules/ClosureEndIndentationRule.swift | 2 +- Source/SwiftLintFramework/Rules/ClosureSpacingRule.swift | 2 +- Source/SwiftLintFramework/Rules/LeadingWhitespaceRule.swift | 2 +- .../SwiftLintFramework/Rules/PrivateOverFilePrivateRule.swift | 2 +- .../RuleConfigurations/CyclomaticComplexityConfiguration.swift | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/SwiftLintFramework/Rules/ClosureEndIndentationRule.swift b/Source/SwiftLintFramework/Rules/ClosureEndIndentationRule.swift index b1f3999ab..222dce304 100644 --- a/Source/SwiftLintFramework/Rules/ClosureEndIndentationRule.swift +++ b/Source/SwiftLintFramework/Rules/ClosureEndIndentationRule.swift @@ -73,7 +73,7 @@ public struct ClosureEndIndentationRule: ASTRule, OptInRule, ConfigurationProvid case let nameEndPosition = nameOffset + nameLength, let (bodyOffsetLine, _) = contents.lineAndCharacter(forByteOffset: nameEndPosition), startLine != endLine, bodyOffsetLine != endLine, - !containsSingleLineClosure(dictionary: dictionary, endPosition: endOffset, file:file) else { + !containsSingleLineClosure(dictionary: dictionary, endPosition: endOffset, file: file) else { return [] } diff --git a/Source/SwiftLintFramework/Rules/ClosureSpacingRule.swift b/Source/SwiftLintFramework/Rules/ClosureSpacingRule.swift index 5b366104c..48c0a4f0b 100644 --- a/Source/SwiftLintFramework/Rules/ClosureSpacingRule.swift +++ b/Source/SwiftLintFramework/Rules/ClosureSpacingRule.swift @@ -118,7 +118,7 @@ public struct ClosureSpacingRule: CorrectableRule, ConfigurationProviderRule, Op to: foundRange.lowerBound) let location = validBraces[startIndex].location let length = validBraces[startIndex + 1 ].location + 1 - location - ranges.append(NSRange(location:location, length: length)) + ranges.append(NSRange(location: location, length: length)) bracesAsString.replaceSubrange(foundRange, with: "") validBraces.removeSubrange(startIndex...startIndex + 1) } diff --git a/Source/SwiftLintFramework/Rules/LeadingWhitespaceRule.swift b/Source/SwiftLintFramework/Rules/LeadingWhitespaceRule.swift index 321775a26..e2f1ad85f 100644 --- a/Source/SwiftLintFramework/Rules/LeadingWhitespaceRule.swift +++ b/Source/SwiftLintFramework/Rules/LeadingWhitespaceRule.swift @@ -51,7 +51,7 @@ public struct LeadingWhitespaceRule: CorrectableRule, ConfigurationProviderRule, let indexEnd = file.contents.index( file.contents.startIndex, - offsetBy:spaceCount, + offsetBy: spaceCount, limitedBy: file.contents.endIndex) ?? file.contents.endIndex file.write(file.contents.substring(from: indexEnd)) let location = Location(file: file.path, line: max(file.lines.count, 1)) diff --git a/Source/SwiftLintFramework/Rules/PrivateOverFilePrivateRule.swift b/Source/SwiftLintFramework/Rules/PrivateOverFilePrivateRule.swift index 2ee51713c..c2eb1e63b 100644 --- a/Source/SwiftLintFramework/Rules/PrivateOverFilePrivateRule.swift +++ b/Source/SwiftLintFramework/Rules/PrivateOverFilePrivateRule.swift @@ -66,7 +66,7 @@ public struct PrivateOverFilePrivateRule: Rule, ConfigurationProviderRule, Corre let parts = syntaxTokens.prefix { offset > $0.offset } guard let lastKind = parts.last, SyntaxKind(rawValue: lastKind.type) == .attributeBuiltin, - let aclName = contents.substringWithByteRange(start:lastKind.offset, length: lastKind.length), + let aclName = contents.substringWithByteRange(start: lastKind.offset, length: lastKind.length), AccessControlLevel(description: aclName) == .fileprivate, let range = contents.byteRangeToNSRange(start: lastKind.offset, length: lastKind.length) else { return nil diff --git a/Source/SwiftLintFramework/Rules/RuleConfigurations/CyclomaticComplexityConfiguration.swift b/Source/SwiftLintFramework/Rules/RuleConfigurations/CyclomaticComplexityConfiguration.swift index 66a8c5233..e379abd22 100644 --- a/Source/SwiftLintFramework/Rules/RuleConfigurations/CyclomaticComplexityConfiguration.swift +++ b/Source/SwiftLintFramework/Rules/RuleConfigurations/CyclomaticComplexityConfiguration.swift @@ -62,7 +62,7 @@ public struct CyclomaticComplexityConfiguration: RuleConfiguration, Equatable { length = SeverityLevelsConfiguration(warning: warning, error: error) } else if let configDict = configuration as? [String: Any], !configDict.isEmpty { for (string, value) in configDict { - guard let key = ConfigurationKey(rawValue:string) else { + guard let key = ConfigurationKey(rawValue: string) else { throw ConfigurationError.unknownConfiguration } switch (key, value) {