Add space and customize trigger string.

onevcat · onevcat · commit afb36fed727d · 2013-08-03T23:36:17.000+09:00
Signed-off-by: onevcat &lt;onevcat@gmail.com&gt;
diff --git a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m
@@ -8,6 +8,11 @@
 
 #import "VVBaseCommenter.h"
 #import "VVArgument.h"
+#import "VVDocumenterSetting.h"
+
+@interface VVBaseCommenter()
+@property (nonatomic, copy) NSString *space;
+@end
 
 @implementation VVBaseCommenter
 -(id) initWithIndentString:(NSString *)indent codeString:(NSString *)code
@@ -17,13 +22,14 @@ -(id) initWithIndentString:(NSString *)indent codeString:(NSString *)code
         self.indent = indent;
         self.code = code;
         self.arguments = [NSMutableArray array];
+        self.space = [[VVDocumenterSetting defaultSetting] spacesString];
     }
     return self;
 }
 
 -(NSString *) startComment
 {
-    return [NSString stringWithFormat:@"%@/**\n%@ *\t<#%@#>\n",self.indent,self.indent,@"Description"];
+    return [NSString stringWithFormat:@"%@/**\n%@ *%@<#%@#>\n",self.indent,self.indent,self.space,@"Description"];
 }
 
 -(NSString *) argumentsComment
@@ -33,7 +39,7 @@ -(NSString *) argumentsComment
         if (result.length == 0) {
             [result appendFormat:@"%@ *\n",self.indent];
         }
-        [result appendFormat:@"%@ *\t@param\t%@\t<#%@ description#>\n",self.indent,arg.name,arg.name];
+        [result appendFormat:@"%@ *%@@param%@%@%@<#%@ description#>\n",self.indent,self.space,self.space,arg.name,self.space,arg.name];
     }
     return result;
 }
@@ -44,7 +50,7 @@ -(NSString *) returnComment
     if (!self.hasReturn) {
         return @"";
     } else {
-        return [NSString stringWithFormat:@"%@ *\n%@ *\t@return\t<#return value description#>\n",self.indent,self.indent];
+        return [NSString stringWithFormat:@"%@ *\n%@ *%@@return%@<#return value description#>\n",self.indent,self.indent,self.space,self.space];
     }
 }
 
diff --git a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h
@@ -22,4 +22,6 @@ extern NSString *const VVDDefaultTriggerString;
 -(NSString *) triggerString;
 -(void) setTriggerString:(NSString *)triggerString;
 
+-(NSString *) spacesString;
+
 @end
diff --git a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m
@@ -54,7 +54,6 @@ -(void) setSpaceCount:(NSInteger)spaceCount
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 
-
 -(NSString *) triggerString
 {
     NSString *s = [[NSUserDefaults standardUserDefaults] stringForKey:kVVDTriggerString];
@@ -75,4 +74,13 @@ -(void) setTriggerString:(NSString *)triggerString
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 
+-(NSString *) spacesString
+{
+    if ([self useSpaces]) {
+        return [@"" stringByPaddingToLength:[self spaceCount] withString:@" " startingAtIndex:0];
+    } else {
+        return @"\t";
+    }
+}
+
 @end
diff --git a/VVDocumenter-Xcode/VVDocumenterManager.m b/VVDocumenter-Xcode/VVDocumenterManager.m
@@ -12,6 +12,7 @@
 #import "VVDocumenter.h"
 #import "VVKeyboardEventSender.h"
 #import "VVDSettingPanelWindowController.h"
+#import "VVDocumenterSetting.h"
 
 @interface VVDocumenterManager()
 @property (nonatomic, retain) id eventMonitor;
@@ -79,9 +80,16 @@ - (void) textStorageDidChange:(NSNotification *)noti {
 
             //Check if there is a "//" already typed in. We do this to solve the undo issue
             //Otherwise when you press Cmd+Z, "///" will be recognized and trigger the doc inserting, so you can not perform an undo.
-            self.prefixTyped = [currentLineResult.string vv_matchesPatternRegexPattern:@"^\\s*//$"] | self.prefixTyped;
+            NSString *triggerString = [[VVDocumenterSetting defaultSetting] triggerString];
             
-            if ([currentLineResult.string vv_matchesPatternRegexPattern:@"^\\s*///$"] && self.prefixTyped) {
+            if (triggerString.length > 1) {
+                NSString *preTypeString = [triggerString substringToIndex:triggerString.length - 2];
+                self.prefixTyped = [currentLineResult.string vv_matchesPatternRegexPattern:[NSString stringWithFormat:@"^\\s*%@$",[NSRegularExpression escapedPatternForString:preTypeString]]] | self.prefixTyped;
+            } else {
+                self.prefixTyped = YES;
+            }
+            
+            if ([currentLineResult.string vv_matchesPatternRegexPattern:[NSString stringWithFormat:@"^\\s*%@$",[NSRegularExpression escapedPatternForString:triggerString]]] && self.prefixTyped) {
                 self.prefixTyped = NO;
                 //Get a @"///" typed in by user. Do work!
                 

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,11 @@`
`8`	`8`
`9`	`9`	`#import "VVBaseCommenter.h"`
`10`	`10`	`#import "VVArgument.h"`
	`11`	`+#import "VVDocumenterSetting.h"`
	`12`	`+`
	`13`	`+@interface VVBaseCommenter()`
	`14`	`+@property (nonatomic, copy) NSString *space;`
	`15`	`+@end`
`11`	`16`
`12`	`17`	`@implementation VVBaseCommenter`
`13`	`18`	`-(id) initWithIndentString:(NSString )indent codeString:(NSString )code`
`@@ -17,13 +22,14 @@ -(id) initWithIndentString:(NSString )indent codeString:(NSString )code`
`17`	`22`	`self.indent = indent;`
`18`	`23`	`self.code = code;`
`19`	`24`	`self.arguments = [NSMutableArray array];`
	`25`	`+ self.space = [[VVDocumenterSetting defaultSetting] spacesString];`
`20`	`26`	`}`
`21`	`27`	`return self;`
`22`	`28`	`}`
`23`	`29`
`24`	`30`	`-(NSString *) startComment`
`25`	`31`	`{`
`26`		`- return [NSString stringWithFormat:@"%@/*\n%@ \t<#%@#>\n",self.indent,self.indent,@"Description"];`
	`32`	`+ return [NSString stringWithFormat:@"%@/*\n%@ %@<#%@#>\n",self.indent,self.indent,self.space,@"Description"];`
`27`	`33`	`}`
`28`	`34`
`29`	`35`	`-(NSString *) argumentsComment`
`@@ -33,7 +39,7 @@ -(NSString *) argumentsComment`
`33`	`39`	`if (result.length == 0) {`
`34`	`40`	`[result appendFormat:@"%@ *\n",self.indent];`
`35`	`41`	`}`
`36`		`- [result appendFormat:@"%@ *\t@param\t%@\t<#%@ description#>\n",self.indent,arg.name,arg.name];`
	`42`	`+ [result appendFormat:@"%@ *%@@param%@%@%@<#%@ description#>\n",self.indent,self.space,self.space,arg.name,self.space,arg.name];`
`37`	`43`	`}`
`38`	`44`	`return result;`
`39`	`45`	`}`
`@@ -44,7 +50,7 @@ -(NSString *) returnComment`
`44`	`50`	`if (!self.hasReturn) {`
`45`	`51`	`return @"";`
`46`	`52`	`} else {`
`47`		`- return [NSString stringWithFormat:@"%@ \n%@ \t@return\t<#return value description#>\n",self.indent,self.indent];`
	`53`	`+ return [NSString stringWithFormat:@"%@ \n%@ %@@return%@<#return value description#>\n",self.indent,self.indent,self.space,self.space];`
`48`	`54`	`}`
`49`	`55`	`}`
`50`	`56`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ -(void) setSpaceCount:(NSInteger)spaceCount`
`54`	`54`	`[[NSUserDefaults standardUserDefaults] synchronize];`
`55`	`55`	`}`
`56`	`56`
`57`		`-`
`58`	`57`	`-(NSString *) triggerString`
`59`	`58`	`{`
`60`	`59`	`NSString *s = [[NSUserDefaults standardUserDefaults] stringForKey:kVVDTriggerString];`
`@@ -75,4 +74,13 @@ -(void) setTriggerString:(NSString *)triggerString`
`75`	`74`	`[[NSUserDefaults standardUserDefaults] synchronize];`
`76`	`75`	`}`
`77`	`76`
	`77`	`+-(NSString *) spacesString`
	`78`	`+{`
	`79`	`+ if ([self useSpaces]) {`
	`80`	`+ return [@"" stringByPaddingToLength:[self spaceCount] withString:@" " startingAtIndex:0];`
	`81`	`+ } else {`
	`82`	`+ return @"\t";`
	`83`	`+ }`
	`84`	`+}`
	`85`	`+`
`78`	`86`	`@end`