Enable last_where on SwiftLint

maciesielka · Dec 26, 2018 · 506e308 · 506e308
1 parent c17e269
commit 506e308
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -27,6 +27,7 @@ opt_in_rules:
   - identical_operands
   - joined_default_parameter
   - let_var_whitespace
+  - last_where
   - literal_expression_end_indentation
   - lower_acl_than_parent
   - nimble_operator

diff --git a/Source/SwiftLintFramework/Rules/Style/TrailingCommaRule.swift b/Source/SwiftLintFramework/Rules/Style/TrailingCommaRule.swift
@@ -133,11 +133,11 @@ public struct TrailingCommaRule: ASTRule, CorrectableRule, ConfigurationProvider
         let ranges = TrailingCommaRule.commaRegex.matches(in: contents, options: [], range: range).map { $0.range }
 
         // skip commas in comments
-        return ranges.filter {
+        return ranges.last {
             let range = NSRange(location: $0.location + offset, length: $0.length)
             let kinds = file.syntaxMap.kinds(inByteRange: range)
             return SyntaxKind.commentKinds.isDisjoint(with: kinds)
-        }.last.flatMap {
+        }.flatMap {
             nsstring.NSRangeToByteRange(start: $0.location, length: $0.length)
         }?.location
     }