Fix for tuple param

onevcat · onevcat · commit 8b393a52afa3 · 2015-12-03T11:20:50.000+09:00
diff --git a/VVDocumenter-Xcode.xcodeproj/project.pbxproj b/VVDocumenter-Xcode.xcodeproj/project.pbxproj
@@ -686,11 +686,6 @@
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "VVDocumenterTests/VVDocumenterTests-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-					__DEBUG__,
-				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
diff --git a/VVDocumenter-Xcode/Commenter/VVSwiftFunctionCommenter.m b/VVDocumenter-Xcode/Commenter/VVSwiftFunctionCommenter.m
@@ -71,8 +71,15 @@ -(void) parseSwiftArgumentsInputArgs:(NSString *)rawArgsCode
     }
     
     NSString *removedUnwantComma = [rawArgsCode vv_stringByReplacingRegexPattern:@"[{].*?[^}],.*?[)}]" withString:@""];
+    NSString *removedUnwantParentheses = [removedUnwantComma copy];
     
-    NSArray *argumentStrings = [removedUnwantComma componentsSeparatedByString:@","];
+    VVTextResult *parenthesesInParam = [removedUnwantComma vv_textResultMatchPartWithPairOpenString:@"(" closeString:@")" currentLocation:0];
+    while (parenthesesInParam.string) {
+        removedUnwantParentheses = [removedUnwantParentheses stringByReplacingOccurrencesOfString:parenthesesInParam.string withString:@""];
+        parenthesesInParam = [removedUnwantParentheses vv_textResultMatchPartWithPairOpenString:@"(" closeString:@")" currentLocation:0];
+    }
+    
+    NSArray *argumentStrings = [removedUnwantParentheses componentsSeparatedByString:@","];
     for (__strong NSString *argumentString in argumentStrings) {
         VVArgument *arg = [[VVArgument alloc] init];
         argumentString = [argumentString vv_stringByReplacingRegexPattern:@"=\\s*\\w*" withString:@""];
diff --git a/VVDocumenter-Xcode/OCCategory/NSString+VVTextGetter/NSString+VVTextGetter.m b/VVDocumenter-Xcode/OCCategory/NSString+VVTextGetter/NSString+VVTextGetter.m
@@ -216,7 +216,7 @@ -(VVTextResult *) textResultWithPairOpenString:(NSString *)open
         resultRange = NSMakeRange(nextLineRange.location + 1, targetRange.location - nextLineRange.location);
     }
     
-    if (resultRange.location < [self length] && NSMaxRange(resultRange) < [self length]) {
+    if (resultRange.location < [self length] && NSMaxRange(resultRange) <= [self length]) {
         NSString *result = [self substringWithRange:resultRange];
         return [[VVTextResult alloc] initWithRange:resultRange string:result];
     } else {
diff --git a/VVDocumenterTests/DocumenterTests/VVMethodTestsCode.plist b/VVDocumenterTests/DocumenterTests/VVMethodTestsCode.plist
@@ -633,6 +633,20 @@ SIAlertViewBackgroundStyleSolid,
 
  - parameter count: &lt;#count description#&gt;
 
+ - returns: &lt;#return value description#&gt;
+ */</string>
+        </dict>
+        <dict>
+            <key>source</key>
+            <string>func testTuple(aTuple: (first: String, second: String, third: String)) -> (first: String, second: String, third: String)? {</string>
+            <key>uniform</key>
+            <string>func testTuple(aTuple:(first: String, second: String, third: String))->(first: String, second: String, third: String)? {</string>
+            <key>result</key>
+            <string>/**
+ &lt;#Description#&gt;
+
+ - parameter aTuple: &lt;#aTuple description#&gt;
+
  - returns: &lt;#return value description#&gt;
  */</string>
         </dict>

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ -(VVTextResult ) textResultWithPairOpenString:(NSString )open`
`216`	`216`	`resultRange = NSMakeRange(nextLineRange.location + 1, targetRange.location - nextLineRange.location);`
`217`	`217`	`}`
`218`	`218`
`219`		`- if (resultRange.location < [self length] && NSMaxRange(resultRange) < [self length]) {`
	`219`	`+ if (resultRange.location < [self length] && NSMaxRange(resultRange) <= [self length]) {`
`220`	`220`	`NSString *result = [self substringWithRange:resultRange];`
`221`	`221`	`return [[VVTextResult alloc] initWithRange:resultRange string:result];`
`222`	`222`	`} else {`