Fix Swift property and add typealias support

onevcat · onevcat · commit b95f03d6cd15 · 2015-06-17T23:10:55.000+09:00
diff --git a/VVDocumenter-Xcode/OCCategory/NSString+VVSyntax/NSString+VVSyntax.m b/VVDocumenter-Xcode/OCCategory/NSString+VVSyntax/NSString+VVSyntax.m
@@ -76,14 +76,15 @@ -(BOOL) vv_isSwiftFunction
 
 -(BOOL) vv_isSwiftEnum
 {
-    return [self vv_matchesPatternRegexPattern:@"^\\s*(.*\\s+)?enum\\s+"];
+    return ![self vv_isSwiftProperty] && [self vv_matchesPatternRegexPattern:@"^\\s*(.*\\s+)?enum\\s+"];
 }
 
 -(BOOL) vv_isSwiftProperty
 {
     // `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*\\)))"];
+    // typealias is considered to share the same comment as property.
+    return [self vv_matchesPatternRegexPattern:@"^\\s*([^(]*?)(((\\s*let|var|typealias\\s*)\\s+)|(\\(\\s*set\\s*\\)))"];
 }
 
 @end
diff --git a/VVDocumenter-Xcode/OCCategory/NSString+VVTextGetter/NSString+VVTextGetter.h b/VVDocumenter-Xcode/OCCategory/NSString+VVTextGetter/NSString+VVTextGetter.h
@@ -27,4 +27,6 @@
 -(VVTextResult *) vv_textResultMatchPartWithPairOpenString:(NSString *)open
                                             closeString:(NSString *)close
                                         currentLocation:(NSInteger)location;
+
+-(VVTextResult *) vv_textResultToEndOfFileCurrentLocation:(NSInteger)location;
 @end
diff --git a/VVDocumenter-Xcode/OCCategory/NSString+VVTextGetter/NSString+VVTextGetter.m b/VVDocumenter-Xcode/OCCategory/NSString+VVTextGetter/NSString+VVTextGetter.m
@@ -122,6 +122,13 @@ -(VVTextResult *) vv_textResultWithPairOpenString:(NSString *)open
     return [self textResultWithPairOpenString:open closeString:close currentLocation:location extractMatch:NO];
 }
 
+-(VVTextResult *) vv_textResultToEndOfFileCurrentLocation:(NSInteger)location
+{
+    NSRange range = NSMakeRange(location, self.length - location);
+    VVTextResult *result = [[VVTextResult alloc] initWithRange:range string:[self substringWithRange:range]];
+    return result;
+}
+
 -(VVTextResult *) textResultWithPairOpenString:(NSString *)open
                                    closeString:(NSString *)close
                                currentLocation:(NSInteger)location
diff --git a/VVDocumenter-Xcode/OCCategory/NSTextView+VVTextGetter/NSTextView+VVTextGetter.h b/VVDocumenter-Xcode/OCCategory/NSTextView+VVTextGetter/NSTextView+VVTextGetter.h
@@ -23,4 +23,5 @@
 
 -(VVTextResult *) vv_textResultWithPairOpenString:(NSString *)open closeString:(NSString *)close;
 
+-(VVTextResult *) vv_textResultToEndOfFile;
 @end
diff --git a/VVDocumenter-Xcode/OCCategory/NSTextView+VVTextGetter/NSTextView+VVTextGetter.m b/VVDocumenter-Xcode/OCCategory/NSTextView+VVTextGetter/NSTextView+VVTextGetter.m
@@ -36,10 +36,14 @@ -(VVTextResult *) vv_textResultUntilNextString:(NSString *)findString
     return [self.textStorage.string vv_textResultUntilNextString:findString currentLocation:[self vv_currentCurseLocation]];
 }
 
-
 -(VVTextResult *) vv_textResultWithPairOpenString:(NSString *)open closeString:(NSString *)close
 {
     return [self.textStorage.string vv_textResultWithPairOpenString:open closeString:close currentLocation:[self vv_currentCurseLocation]];
 }
 
+-(VVTextResult *) vv_textResultToEndOfFile
+{
+    return [self.textStorage.string vv_textResultToEndOfFileCurrentLocation:[self vv_currentCurseLocation]];
+}
+
 @end
diff --git a/VVDocumenter-Xcode/VVDocumenterManager.m b/VVDocumenter-Xcode/VVDocumenterManager.m
@@ -114,15 +114,18 @@ - (void) textStorageDidChange:(NSNotification *)noti {
                 //We just want to document the next valid line.
                 VVTextResult *resultUntilSemiColon = [textView vv_textResultUntilNextString:@";"];
                 VVTextResult *resultUntilBrace = [textView vv_textResultUntilNextString:@"{"];
+                VVTextResult *resultUntilFileEnd = [textView vv_textResultToEndOfFile];
                 
                 VVTextResult *resultToDocument = nil;
                 
                 if (resultUntilSemiColon && resultUntilBrace) {
                     resultToDocument = (resultUntilSemiColon.range.length < resultUntilBrace.range.length) ? resultUntilSemiColon : resultUntilBrace;
                 } else if (resultUntilBrace) {
                     resultToDocument = resultUntilBrace;
-                } else {
+                } else if (resultUntilSemiColon) {
                     resultToDocument = resultUntilSemiColon;
+                } else {
+                    resultToDocument = resultUntilFileEnd;
                 }
                 
                 //We always write document until semicolon for enum. (Maybe struct later)

Original file line number	Diff line number	Diff line change
`@@ -76,14 +76,15 @@ -(BOOL) vv_isSwiftFunction`
`76`	`76`
`77`	`77`	`-(BOOL) vv_isSwiftEnum`
`78`	`78`	`{`
`79`		`- return [self vv_matchesPatternRegexPattern:@"^\\s(.\\s+)?enum\\s+"];`
	`79`	`+ return ![self vv_isSwiftProperty] && [self vv_matchesPatternRegexPattern:@"^\\s(.\\s+)?enum\\s+"];`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`-(BOOL) vv_isSwiftProperty`
`83`	`83`	`{`
`84`	`84`	// `let`/`var` can be in swift func, but `(` appear before `let`/`var` only
`85`	`85`	// happens when `private(set)` or `internal(set)` is used
`86`		`- return [self vv_matchesPatternRegexPattern:@"^\\s([^(]?)(((\\slet\|var\\s)\\s+)\|(\\(\\sset\\s\\)))"];`
	`86`	`+ // typealias is considered to share the same comment as property.`
	`87`	`+ return [self vv_matchesPatternRegexPattern:@"^\\s([^(]?)(((\\slet\|var\|typealias\\s)\\s+)\|(\\(\\sset\\s\\)))"];`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,5 @@`
`23`	`23`
`24`	`24`	`-(VVTextResult ) vv_textResultWithPairOpenString:(NSString )open closeString:(NSString *)close;`
`25`	`25`
	`26`	`+-(VVTextResult *) vv_textResultToEndOfFile;`
`26`	`27`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,14 @@ -(VVTextResult ) vv_textResultUntilNextString:(NSString )findString`
`36`	`36`	`return [self.textStorage.string vv_textResultUntilNextString:findString currentLocation:[self vv_currentCurseLocation]];`
`37`	`37`	`}`
`38`	`38`
`39`		`-`
`40`	`39`	`-(VVTextResult ) vv_textResultWithPairOpenString:(NSString )open closeString:(NSString *)close`
`41`	`40`	`{`
`42`	`41`	`return [self.textStorage.string vv_textResultWithPairOpenString:open closeString:close currentLocation:[self vv_currentCurseLocation]];`
`43`	`42`	`}`
`44`	`43`
	`44`	`+-(VVTextResult *) vv_textResultToEndOfFile`
	`45`	`+{`
	`46`	`+ return [self.textStorage.string vv_textResultToEndOfFileCurrentLocation:[self vv_currentCurseLocation]];`
	`47`	`+}`
	`48`	`+`
`45`	`49`	`@end`