Merge pull request onevcat#125 from onevcat/fix/issue-118

onevcat · onevcat · commit f7eb8a80da2c · 2015-06-18T00:21:30.000+09:00
Fix for unwanted comma
diff --git a/VVDocumenter-Xcode/Commenter/VVSwiftFunctionCommenter.m b/VVDocumenter-Xcode/Commenter/VVSwiftFunctionCommenter.m
@@ -48,7 +48,7 @@ -(void) parseSwiftArgumentsInputArgs:(NSString *)rawArgsCode
         return;
     }
     
-    NSString *removedUnwantComma = [rawArgsCode vv_stringByReplacingRegexPattern:@"([{(].*?[^\\)}],.*?[)}])" withString:@""];
+    NSString *removedUnwantComma = [rawArgsCode vv_stringByReplacingRegexPattern:@"[{].*?[^}],.*?[)}]" withString:@""];
     
     NSArray *argumentStrings = [removedUnwantComma componentsSeparatedByString:@","];
     for (__strong NSString *argumentString in argumentStrings) {
diff --git a/VVDocumenterTests/DocumenterTests/VVMethodTestsCode.plist b/VVDocumenterTests/DocumenterTests/VVMethodTestsCode.plist
@@ -560,6 +560,20 @@ SIAlertViewBackgroundStyleSolid,
  :param: key &lt;#key description#&gt;
 
  :returns: &lt;#return value description#&gt;
+ */</string>
+        </dict>
+        <dict>
+            <key>source</key>
+            <string>func getSomething(input:String?, success: (Int) -> Void, failure: (NSHTTPURLResponse?, AnyObject?, NSError?) -> Void) {</string>
+            <key>uniform</key>
+            <string>func getSomething(input:String?, success:(Int)-> Void, failure:(NSHTTPURLResponse?, AnyObject?, NSError?)-> Void){</string>
+            <key>result</key>
+            <string>/**
+ &lt;#Description#&gt;
+
+ :param: input   &lt;#input description#&gt;
+ :param: success &lt;#success description#&gt;
+ :param: failure &lt;#failure description#&gt;
  */</string>
         </dict>
 	</array>

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ -(void) parseSwiftArgumentsInputArgs:(NSString *)rawArgsCode`
`48`	`48`	`return;`
`49`	`49`	`}`
`50`	`50`
`51`		`- NSString removedUnwantComma = [rawArgsCode vv_stringByReplacingRegexPattern:@"([{(].?[^\\)}],.*?[)}])" withString:@""];`
	`51`	`+ NSString removedUnwantComma = [rawArgsCode vv_stringByReplacingRegexPattern:@"[{].?[^}],.*?[)}]" withString:@""];`
`52`	`52`
`53`	`53`	`NSArray *argumentStrings = [removedUnwantComma componentsSeparatedByString:@","];`
`54`	`54`	`for (__strong NSString *argumentString in argumentStrings) {`