aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2009-07-16 13:58:27 +0000
committerBibiko <bibiko@eva.mpg.de>2009-07-16 13:58:27 +0000
commit01fd0bed61eaa3ea3be6c5992bfe749aec090f9c (patch)
treed4e87b5a06cf8504073539e9e9338a095bf96745 /Source
parentb9a52df3071aba89d4e34410d58af56b0cea61ff (diff)
downloadsequelpro-01fd0bed61eaa3ea3be6c5992bfe749aec090f9c.tar.gz
sequelpro-01fd0bed61eaa3ea3be6c5992bfe749aec090f9c.tar.bz2
sequelpro-01fd0bed61eaa3ea3be6c5992bfe749aec090f9c.zip
• rewrote ⌘/ "comment line" completely
- ⌘/ (un)comment current line only if no selection is given (by using "-- ") -- caret jumps to the next line to (un)comment lines quickly -- # sign will be recognized for uncommenting as well as if the entire line is wrapped into /* */ - ⌘/ (un)comment current selection (by wrapping it into /* */) -- it (un)escapes present */ into *\/ automatically - ⌥⌘/ (un)comment the current query (by wrapping it into /* */) -- the GUI element will be found in the Gear Menu by pressing ⌥ • added shortcut ⌫ to Table Content's "Delete selected row(s)" tooltip
Diffstat (limited to 'Source')
-rw-r--r--Source/CustomQuery.h6
-rw-r--r--Source/CustomQuery.m128
2 files changed, 106 insertions, 28 deletions
diff --git a/Source/CustomQuery.h b/Source/CustomQuery.h
index 9d6ea2df..47be44c7 100644
--- a/Source/CustomQuery.h
+++ b/Source/CustomQuery.h
@@ -63,7 +63,8 @@
IBOutlet NSMenuItem *autopairMenuItem;
IBOutlet NSMenuItem *autohelpMenuItem;
IBOutlet NSMenuItem *autouppercaseKeywordsMenuItem;
- IBOutlet NSMenuItem *commentCurrentQueryOrSelectionMenuItem;
+ IBOutlet NSMenuItem *commentCurrentQueryMenuItem;
+ IBOutlet NSMenuItem *commentLineOrSelectionMenuItem;
IBOutlet NSWindow *helpWebViewWindow;
IBOutlet WebView *helpWebView;
@@ -149,7 +150,8 @@
- (void)setFavorites;
- (void)doPerformQueryService:(NSString *)query;
- (void)selectCurrentQuery;
-- (void)commentOutQuery;
+- (void)commentOut;
+- (void)commentOutCurrentQueryTakingSelection:(BOOL)takeSelection;
- (NSString *)usedQuery;
- (NSString *)argumentForRow:(NSUInteger)rowIndex ofTable:(NSString *)tableForColumn;
diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m
index 59be27f8..afd24e8d 100644
--- a/Source/CustomQuery.m
+++ b/Source/CustomQuery.m
@@ -212,10 +212,17 @@
[textView shiftSelectionLeft];
}
- // "Comment Current Query/Selection" menu item - Add or remove "-- " for each line
- // in the current query or selection
- if (sender == commentCurrentQueryOrSelectionMenuItem) {
- [self commentOutQuery];
+ // "Comment Line/Selection" menu item - Add or remove "-- " for each line
+ // in a line or selection resp. or wrap the selection into /* */
+ // if the selection does not end at the end of a line (in-line comment)
+ if (sender == commentLineOrSelectionMenuItem) {
+ [self commentOut];
+ }
+
+ // "Comment Current Query" menu item - Add or remove "-- " for each line
+ // in the current query
+ if (sender == commentCurrentQueryMenuItem) {
+ [self commentOutCurrentQueryTakingSelection:NO];
}
// "Completion List" menu item - used to autocomplete. Uses a different shortcut to avoid the menu button flickering
@@ -934,39 +941,105 @@
}
/*
- * Add or remove "-- " for each line in the current query or selection
+ * Add or remove "/* *~/" for each line in the current query
+ * a given selection
*/
-- (void)commentOutQuery
+- (void)commentOutCurrentQueryTakingSelection:(BOOL)takeSelection
{
-
- if(!currentQueryRange.length && ![textView selectedRange].length) {
- NSBeep();
- return;
- }
-
- NSRange workingRange;
- NSRange oldRange = [textView selectedRange];
+ BOOL isUncomment = NO;
- if(oldRange.length)
- workingRange = oldRange;
- else
+ NSRange oldRange = [textView selectedRange];
+
+ NSRange workingRange = oldRange;
+ if(!takeSelection)
workingRange = currentQueryRange;
-
+
NSMutableString *n = [NSMutableString string];
- [n setString:[NSString stringWithFormat:@"-- %@", [[textView string] substringWithRange:workingRange]]];
- [n replaceOccurrencesOfRegex:@"\\n(?=.)" withString:@"\n-- "];
- // comment out if at least one line is already commented out
- if(!([n isMatchedByRegex:@"(\\n-- --|^-- --)"] && [n isMatchedByRegex:@"(\\n-- |^-- )(?!-)"])) {
- [n replaceOccurrencesOfRegex:@"\\n-- -- " withString:@"\n"];
- [n replaceOccurrencesOfRegex:@"^-- -- " withString:@""];
+ [n setString:[[textView string] substringWithRange:workingRange]];
+
+ // Escape given */ by *\/
+ [n replaceOccurrencesOfRegex:@"\\*/(?=.)" withString:@"*\\\\/"];
+ [n replaceOccurrencesOfRegex:@"\\*/(?=\\n)" withString:@"*\\\\/"];
+
+ // Wrap current query into /* */
+ [n replaceOccurrencesOfRegex:@"^" withString:@"/* "];
+ [n replaceOccurrencesOfRegex:@"$" withString:@" */"];
+
+ // Check if current query/selection is already commented out, if so uncomment it
+ if([n isMatchedByRegex:@"^/\\* \\s*/\\*\\s*(.|\\n)*?\\s*\\*/ \\*/\\s*$"]) {
+ [n replaceOccurrencesOfRegex:@"^/\\* \\s*/\\*\\s*" withString:@""];
+ [n replaceOccurrencesOfRegex:@"\\s*\\*/ \\*/\\s*$" withString:@""];
+ // unescape *\/
+ [n replaceOccurrencesOfRegex:@"\\*\\\\/" withString:@"*/"];
+ isUncomment = YES;
}
- [textView setSelectedRange:workingRange];
+ // Replace current query/selection by (un)commented string
+ [textView setSelectedRange:workingRange];
[textView insertText:n];
+
+ // If commenting out locate the caret just after the first /* to allow to enter
+ // something like /*!400000 or similar
+ if(!isUncomment)
+ [textView setSelectedRange:NSMakeRange(workingRange.location+2,0)];
+
+}
+
+/*
+ * Add or remove "-- " for each line in the current query or selection,
+ * if the selection is in-line wrap selection into /* block comments and
+ * place the caret after /* to allow to enter !xxxxxx e.g.
+ */
+- (void)commentOut
+{
+
+ NSRange oldRange = [textView selectedRange];
+
+ if(oldRange.length) {
+ [self commentOutCurrentQueryTakingSelection:YES];
+ } else { // single line
+
+ // get the current line range
+ NSRange lineRange = [[textView string] lineRangeForRange:oldRange];
+ NSMutableString *n = [NSMutableString string];
+
+ // Put "-- " in front of the current line
+ [n setString:[NSString stringWithFormat:@"-- %@", [[textView string] substringWithRange:lineRange]]];
+
+ // Check if current line is already commented out, if so uncomment it
+ // and preserve the original indention via regex:@"^-- (\\s*)"
+ if([n isMatchedByRegex:@"^-- \\s*(--\\s|#)"]) {
+ [n replaceOccurrencesOfRegex:@"^-- \\s*(--\\s|#)"
+ withString:[n substringWithRange:[n rangeOfRegex:@"^-- (\\s*)"
+ options:RKLNoOptions
+ inRange:NSMakeRange(0,[n length])
+ capture:1
+ error: nil]]];
+ } else if ([n isMatchedByRegex:@"^-- \\s*/\\*.*?\\*/\\s*$"]) {
+ [n replaceOccurrencesOfRegex:@"^-- \\s*/\\* ?"
+ withString:[n substringWithRange:[n rangeOfRegex:@"^-- (\\s*)"
+ options:RKLNoOptions
+ inRange:NSMakeRange(0,[n length])
+ capture:1
+ error: nil]]];
+ [n replaceOccurrencesOfRegex:@"\\*/\\s*$"
+ withString:[n substringWithRange:[n rangeOfRegex:@"\\*/(\\s*)$"
+ options:RKLNoOptions
+ inRange:NSMakeRange(0,[n length])
+ capture:1
+ error: nil]]];
+ }
+
+ // Replace current line by (un)commented string
+ // The caret will be placed at the beginning of the next line if present to
+ // allow a fast (un)commenting of lines
+ [textView setSelectedRange:lineRange];
+ [textView insertText:n];
+
+ }
- [textView setSelectedRange:NSMakeRange(NSMaxRange(currentQueryRange),0)];
}
#pragma mark -
@@ -1653,6 +1726,9 @@
currentQueryRange = NSMakeRange(0, 0);
}
+ // disable "Comment Current Query" meun item if no current query is selectable
+ [commentCurrentQueryMenuItem setEnabled:(currentQueryRange.length) ? YES : NO];
+
// If no text is selected, disable the button and action menu.
if ( caretPosition == NSNotFound ) {
[runSelectionButton setEnabled:NO];