Changed guard to be based on the largest replacement index. Added ent…

…ry to the changelog.
rafalwojcik · Apr 24, 2016 · 7930c09 · 7930c09
1 parent c3a5e33
commit 7930c09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,9 @@
   [Norio Nomura](https://github.com/norio-nomura)
   [#617](https://github.com/realm/SwiftLint/issues/617)
 
+* Add autocorrect for `ReturnArrowWhitespaceRule`.  
+  [Craig Siemens](https://github.com/CraigSiemens)
+
 ##### Bug Fixes
 
 * Failed to launch swiftlint when Xcode.app was placed at non standard path.  

diff --git a/Source/SwiftLintFramework/Rules/ReturnArrowWhitespaceRule.swift b/Source/SwiftLintFramework/Rules/ReturnArrowWhitespaceRule.swift
@@ -71,10 +71,11 @@ public struct ReturnArrowWhitespaceRule: CorrectableRule, ConfigurationProviderR
             return regularExpression.firstMatchInString(contents, options: [], range: range)
         }
 
+        let replacementsByIndex = [2: " -> ", 4: " -> ", 6: " ", 7: " "]
+
         for result in results {
-            guard result.numberOfRanges == 8 else { break }
+            guard result.numberOfRanges > replacementsByIndex.keys.maxElement() else { break }
 
-            let replacementsByIndex = [2: " -> ", 4: " -> ", 6: " ", 7: " "]
             for (index, string) in replacementsByIndex {
                 if let range = contents.nsrangeToIndexRange(result.rangeAtIndex(index)) {
                     contents.replaceRange(range, with: string)