Merge pull request onevcat#84 from Garnel/master

onevcat · onevcat · commit 9844fee0ee3a · 2015-01-28T10:32:22.000+09:00
fixed bug onevcat#83
diff --git a/VVDocumenter-Xcode/OCCategory/NSString+VVSyntax/NSString+VVSyntax.m b/VVDocumenter-Xcode/OCCategory/NSString+VVSyntax/NSString+VVSyntax.m
@@ -81,7 +81,9 @@ -(BOOL) vv_isSwiftEnum
 
 -(BOOL) vv_isSwiftProperty
 {
-    return [self vv_matchesPatternRegexPattern:@"^\\s*(.*?)(\\s*let|var\\s*)\\s+"];
+    // `let`/`var` can be in swift func, but `(` appear before `let`/`var` only
+    // happens when `private(set)` or `internal(set)` is used
+    return [self vv_matchesPatternRegexPattern:@"^\\s*([^(]*?)(((\\s*let|var\\s*)\\s+)|(\\(\\s*set\\s*\\)))"];
 }
 
 @end
diff --git a/VVDocumenterTests/DocumenterTests/VVMethodTestsCode.plist b/VVDocumenterTests/DocumenterTests/VVMethodTestsCode.plist
@@ -429,6 +429,21 @@ SIAlertViewBackgroundStyleSolid,
 	</array>
 	<key>vv_isSwiftFunction</key>
 	<array>
+        <dict>
+            <key>source</key>
+            <string>func testParasType(var a: Int, let b: Int, inout c: Int, d: Int) {</string>
+            <key>uniform</key>
+            <string>func testParasType(var a: Int, let b: Int, inout c: Int, d: Int){</string>
+            <key>result</key>
+            <string>/**
+ &lt;#Description#&gt;
+
+ :param: a &lt;#a description#&gt;
+ :param: b &lt;#b description#&gt;
+ :param: c &lt;#c description#&gt;
+ :param: d &lt;#d description#&gt;
+ */</string>
+        </dict>
 		<dict>
 			<key>source</key>
 			<string>func sayHello(personName: String) -&gt; String  {</string>
diff --git a/VVDocumenterTests/VVTestHelper.m b/VVDocumenterTests/VVTestHelper.m
@@ -69,7 +69,8 @@ +(NSArray *) testCodes
 
     NSArray *swiftFunctions = @[@"func sayHello(personName: String) -> String  {",
                                 @"func halfOpenRangeLength(start: Int, end: Int) -> Int\n  {",
-                                @"func sayHelloWorld() ->String"];
+                                @"func sayHelloWorld() ->String",
+                                @"func testParamsType(var a: Int) {"];
     
     /*
     //Now there is no difference between Objective-C (C) struct and Swift struct. Ignore this.
@@ -134,6 +135,7 @@ +(NSArray *) uniformCodes
     NSArray *swiftFunctions = @[@"func sayHello(personName: String)-> String  {",
                                 @"func halfOpenRangeLength(start: Int, end: Int)-> Int {",
                                 @"func sayHelloWorld()->String",
+                                @"func testParamsType(var a: Int){",
                                 @"init(style: Style, gearing: Gearing, handlebar: Handlebar, frameSize centimeters: Int) {"];
     
     /*

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,9 @@ -(BOOL) vv_isSwiftEnum`
`81`	`81`
`82`	`82`	`-(BOOL) vv_isSwiftProperty`
`83`	`83`	`{`
`84`		`- return [self vv_matchesPatternRegexPattern:@"^\\s(.?)(\\slet\|var\\s)\\s+"];`
	`84`	+ // `let`/`var` can be in swift func, but `(` appear before `let`/`var` only
	`85`	+ // happens when `private(set)` or `internal(set)` is used
	`86`	`+ return [self vv_matchesPatternRegexPattern:@"^\\s([^(]?)(((\\slet\|var\\s)\\s+)\|(\\(\\sset\\s\\)))"];`
`85`	`87`	`}`
`86`	`88`
`87`	`89`	`@end`