Merge pull request onevcat#186 from onevcat/fix/enum-crash

onevcat · onevcat · commit 5fe3930de6c0 · 2015-10-12T22:01:44.000+09:00
Enum crash at EOF
diff --git a/VVDocumenter-Xcode/Commenter/VVEnumCommenter.m b/VVDocumenter-Xcode/Commenter/VVEnumCommenter.m
@@ -46,7 +46,8 @@ - (NSString *)document {
     NSTextCheckingResult *enumDefineResult = [enumDefineExpression firstMatchInString:self.code options:0 range:NSMakeRange(0, self.code.length)];
     
     finalString = [finalString stringByAppendingString:[self.code substringWithRange:[enumDefineResult rangeAtIndex:0]]];
-    finalString = [finalString stringByAppendingString:@"\n"];
+    finalString = [finalString substringToIndex:finalString.length - 1];
+    finalString = [finalString stringByAppendingString:@" {\n"];
     
     NSString *endPattern = @"\\}\\s*;";
     NSString *enumPartsString = [[self.code vv_stringByReplacingRegexPattern:enumDefinePattern withString:@""]
diff --git a/VVDocumenter-Xcode/OCCategory/NSString+VVTextGetter/NSString+VVTextGetter.m b/VVDocumenter-Xcode/OCCategory/NSString+VVTextGetter/NSString+VVTextGetter.m
@@ -115,7 +115,7 @@ -(VVTextResult *) vv_textResultUntilNextString:(NSString *)findString currentLoc
     NSString *line = nil;
     if (nextLineRange.location != NSNotFound && rangeToString.location != NSNotFound && nextLineRange.location <= rangeToString.location) {
         NSRange lineRange = NSMakeRange(nextLineRange.location + 1, rangeToString.location - nextLineRange.location);
-        if (lineRange.location < [self length] && NSMaxRange(lineRange) < [self length]) {
+        if (lineRange.location < [self length] && NSMaxRange(lineRange) <= [self length]) {
             line = [self substringWithRange:lineRange];
             return [[VVTextResult alloc] initWithRange:lineRange string:line];
         } else {
diff --git a/VVDocumenterTests/DocumenterTests/VVMethodTestsCode.plist b/VVDocumenterTests/DocumenterTests/VVMethodTestsCode.plist
@@ -355,7 +355,7 @@
 			<string>/**
  *  &lt;#Description#&gt;
  */
-typedef NS_ENUM(NSInteger, SIAlertViewBackgroundStyle){
+typedef NS_ENUM(NSInteger, SIAlertViewBackgroundStyle) {
 /**
  *  &lt;#Description#&gt;
  */
