Skip checking existence of trailing comment in CommaRule if already…

… violating Fix #683
realm · Jun 8, 2016 · fcd30c5 · fcd30c5
1 parent 82fef35
commit fcd30c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,10 @@
   [Andrew Rahn](https://github.com/paddlefish)
   [#667](https://github.com/realm/SwiftLint/issues/667)
 
+* Fix `CommaRule` ignored some violations when trailing comment exists.  
+  [Norio Nomura](https://github.com/norio-nomura)
+  [#683](https://github.com/realm/SwiftLint/issues/683)
+
 ## 0.10.0: `laundry-select` edition
 
 ##### Breaking

diff --git a/Source/SwiftLintFramework/Rules/CommaRule.swift b/Source/SwiftLintFramework/Rules/CommaRule.swift
@@ -112,6 +112,12 @@ public struct CommaRule: CorrectableRule, ConfigurationProviderRule {
                     return nil
                 }
 
+                // If the first range does not start with comma, it already violates this rule
+                // whatever is contained in the second range.
+                if !(contents as NSString).substringWithRange(firstRange).hasPrefix(",") {
+                    return firstRange
+                }
+
                 // check second captured range
                 let secondRange = match.rangeAtIndex(2)
                 guard let matchByteSecondRange = contents