Merge pull request realm#1967 from marcelofabri/bugfix-1946

Fix false positives in control_statement when methods with keyword names are used

CHANGELOG.md

@@ -16,7 +16,10 @@
 
 ##### 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
 

Rules.md

@@ -1740,6 +1740,10 @@ do {
 }
 ```
 
+```swift
+foo().catch(all: true) {}
+```
+
 </details>
 <details>
 <summary>Triggering Examples</summary>

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,