Adds new opt-in rule, private_action

Implements realm#1931. (+1 squashed commit) Squashed commits: [5911dcc] Fix false positives in control_statement when methods with keyword names are used Fixes realm#1946 (+1 squashed commit) Squashed commits: [4cdcc48] Updates changelog entry
dirtydanee · Dec 18, 2017 · 7f513b2 · 7f513b2
1 parent e5d5a22
commit 7f513b2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,10 +12,17 @@
 * Add `yoda_condition` opt-in rule which warns to avoid Yoda conditions.  
   [Daniel Metzing](https://github.com/dirtydanee)
   [#1924](https://github.com/realm/SwiftLint/issues/1924)
+* Add `private_action` opt-in rule which warns against public
+  @IBAction methods.  
+  [Ornithologist Coder](https://github.com/ornithocoder)
+  [#1931](https://github.com/realm/SwiftLint/issues/1931)
 
 ##### Bug Fixes
 
-* None.
+* Fix false positives in `control_statement` rule when methods with keyword
+  names are used.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+  [#1946](https://github.com/realm/SwiftLint/issues/1946)
 
 ## 0.24.0: Timed Dry
 
@@ -77,6 +84,10 @@
   [JP Simard](https://github.com/jpsim)
   [#1822](https://github.com/realm/SwiftLint/issues/1822)
 
+* Add `private_action` opt-in rule which warns agaist public @IBAction methods.  
+  [Ornithologist Coder](https://github.com/ornithocoder)
+  [#1931](https://github.com/realm/SwiftLint/issues/1931)
+
 ##### Bug Fixes
 
 * Extend `first_where` and `contains_over_first_not_nil` rules to also detect
@@ -110,10 +121,7 @@
 
 ##### Enhancements
 
-* Add `private_action` opt-in rule which warns agaist public
-  @IBAction methods.  
-  [Ornithologist Coder](https://github.com/ornithocoder)
-  [#1931](https://github.com/realm/SwiftLint/issues/1931)
+* None.
 
 ##### Bug Fixes
 

diff --git a/Rules.md b/Rules.md
@@ -1741,6 +1741,10 @@ do {
 }
 ```
 
+```swift
+foo().catch(all: true) {}
+```
+
 </details>
 <details>
 <summary>Triggering Examples</summary>

diff --git a/Source/SwiftLintFramework/Rules/ControlStatementRule.swift b/Source/SwiftLintFramework/Rules/ControlStatementRule.swift
@@ -36,7 +36,8 @@ public struct ControlStatementRule: ConfigurationProviderRule {
             "} while condition {\n",
             "do { ; } while condition {\n",
             "switch foo {\n",
-            "do {\n} catch let error as NSError {\n}"
+            "do {\n} catch let error as NSError {\n}",
+            "foo().catch(all: true) {}"
         ],
         triggeringExamples: [
             "↓if (condition) {\n",
@@ -72,6 +73,15 @@ public struct ControlStatementRule: ConfigurationProviderRule {
                     let matchString = file.contents.substring(from: match.location, length: match.length)
                     return !isFalsePositive(matchString, syntaxKind: syntaxKinds.first)
                 }
+                .filter { match, _ -> Bool in
+                    let contents = file.contents.bridge()
+                    guard let byteOffset = contents.NSRangeToByteRange(start: match.location, length: 1)?.location,
+                        let outerKind = file.structure.kinds(forByteOffset: byteOffset).last else {
+                            return true
+                    }
+
+                    return SwiftExpressionKind(rawValue: outerKind.kind) != .call
+                }
                 .map { match, _ -> StyleViolation in
                     return StyleViolation(ruleDescription: type(of: self).description,
                                           severity: configuration.severity,