Apply code review changes

realm · Aug 7, 2017 · be2c121 · be2c121
1 parent 99c93f1
commit be2c121
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/Source/SwiftLintFramework/Rules/JoinedDefaultRule.swift b/Source/SwiftLintFramework/Rules/JoinedDefaultRule.swift
@@ -25,9 +25,9 @@ public struct JoinedDefaultParameterRule: ASTRule, ConfigurationProviderRule, Op
             "let foo = bar.joined(separator: toto)"
         ],
         triggeringExamples: [
-            "let foo = bar.joined(↓separator: \"\")",
+            "let foo = bar.joined(separator: ↓\"\")",
             "let foo = bar.filter(toto)\n" +
-            "             .joined(↓separator: \"\")"
+            "             .joined(separator: ↓\"\")"
         ]
     )
 
@@ -48,11 +48,19 @@ public struct JoinedDefaultParameterRule: ASTRule, ConfigurationProviderRule, Op
     }
 
     private func defaultSeparatorOffset(dictionary: [String: SourceKitRepresentable], file: File) -> Int? {
+        let arguments = dictionary.substructure.filter { $0.kind == SwiftExpressionKind.argument.rawValue }
+
         guard
-            let bodyOffset = dictionary.bodyOffset,
-            let bodyLength = dictionary.bodyLength else { return nil }
+            arguments.count == 1,
+            let argument = arguments.first,
+            let argumentBodyOffset = argument.bodyOffset,
+            let argumentBodyLength = argument.bodyLength,
+            argument.name == "separator"
+            else {
+                return nil
+        }
 
-        let body = file.contents.bridge().substringWithByteRange(start: bodyOffset, length: bodyLength)
-        return body == "separator: \"\"" ? bodyOffset : nil
+        let body = file.contents.bridge().substringWithByteRange(start: argumentBodyOffset, length: argumentBodyLength)
+        return body == "\"\"" ? argumentBodyOffset : nil
     }
 }