GitHub/SwiftLint
1
0
Fork 0
mirror of https://github.com/realm/SwiftLint.git synced 2026-06-06 20:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #325 from realm/nn-fix-324

Browse Source 
Fix regex for ignoring closure parameter on detecting return value
This commit is contained in:
JP Simard
2016-01-07 16:28:58 -08:00
parent 5dcd0656e2 8edc234e64
commit ef4e3c9ddf
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+3
View File
@@ -14,6 +14,9 @@
* AutoCorrect for TrailingNewlineRule only removes at most one line.
[John Estropia](https://github.com/JohnEstropia)
* `valid_docs` did not detect tuple as return value.
[Norio Nomura](https://github.com/norio-nomura)
[#324](https://github.com/realm/SwiftLint/issues/324)
## 0.5.5: Magic Drying Fluff Balls™
Source/SwiftLintFramework/Rules/ValidDocsRule.swift
+3 -2
View File
@@ -43,7 +43,7 @@ func delcarationReturns(declaration: String, kind: SwiftDeclarationKind) -> Bool
if SwiftDeclarationKind.variableKinds().contains(kind) { return true }
let outsideBraces = NSMutableString(string: declaration)
regex("(\\s*->\\s*).*[^(]\\)").replaceMatchesInString(outsideBraces, options: [],
regex("(\\s*->\\s*)[^(]*\\)").replaceMatchesInString(outsideBraces, options: [],
range: NSRange(location: 0, length: outsideBraces.length), withTemplate: "")
return outsideBraces.containsString("->")
@@ -60,7 +60,7 @@ func commentReturns(comment: String) -> Bool {
func missingReturnDocumentation(declaration: String, comment: String) -> Bool {
let outsideBraces = NSMutableString(string: declaration)
regex("(\\s*->\\s*).*[^(]\\)").replaceMatchesInString(outsideBraces, options: [],
regex("(\\s*->\\s*)[^(]*\\)").replaceMatchesInString(outsideBraces, options: [],
range: NSRange(location: 0, length: outsideBraces.length), withTemplate: "")
return outsideBraces.containsString("->") && !commentReturns(comment)
@@ -135,6 +135,7 @@ public struct ValidDocsRule: Rule {
"\n///- parameter param2: this is void too" +
"\npublic func no(param: (Void -> Void)?, param2: String->Void) {}",
"/// docs👨‍👩‍👧‍👧\n/// - returns: false\npublic func no() -> Bool { return false }",
"/// docs\n/// - returns: tuple\npublic func no() -> (Int, Int) {return (1, 2)}",
],
triggeringExamples: [
"/// docs\npublic ↓func a(param: Void) {}\n",