diff options
| author | sqlprodev <sqlprodev@northofthree.com> | 2011-04-11 20:29:49 +0000 |
|---|---|---|
| committer | sqlprodev <sqlprodev@northofthree.com> | 2011-04-11 20:29:49 +0000 |
| commit | 0ce916eb0583ec6b062786f91bee0133906671ce (patch) | |
| tree | 68a5767ded966f4eadf53ba9ce85bcaf6d31b951 /Source/SPNarrowDownCompletion.m | |
| parent | 2621e79c75a0119a54c669b263caa82183bd19c8 (diff) | |
| download | sequelpro-0ce916eb0583ec6b062786f91bee0133906671ce.tar.gz sequelpro-0ce916eb0583ec6b062786f91bee0133906671ce.tar.bz2 sequelpro-0ce916eb0583ec6b062786f91bee0133906671ce.zip | |
initial commit of SP_REFACTOR ifdefs, the start of a long quest to separate UI code from functional code
Diffstat (limited to 'Source/SPNarrowDownCompletion.m')
| -rw-r--r-- | Source/SPNarrowDownCompletion.m | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m index b1101704..04627e2d 100644 --- a/Source/SPNarrowDownCompletion.m +++ b/Source/SPNarrowDownCompletion.m @@ -92,7 +92,7 @@ [self selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO]; } [self scrollRowToVisible:row]; - [[self delegate] insertAutocompletePlaceholder]; + [(SPNarrowDownCompletion*)[self delegate] insertAutocompletePlaceholder]; return YES; } } @@ -124,9 +124,15 @@ staticPrefix = nil; suggestions = nil; autocompletePlaceholderWasInserted = NO; +#ifndef SP_REFACTOR prefs = [NSUserDefaults standardUserDefaults]; +#endif +#ifndef SP_REFACTOR tableFont = [NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SPCustomQueryEditorFont]]; +#else + tableFont = [NSFont userFixedPitchFontOfSize:10.0]; +#endif [self setupInterface]; syncArrowImages = [[NSArray alloc] initWithObjects: @@ -270,7 +276,7 @@ if(!dictMode) { NSUInteger maxLength = 0; for(id w in someSuggestions) { - NSUInteger len = [[w objectForKey:@"display"] length]; + NSUInteger len = [(NSString*)[w objectForKey:@"display"] length]; if(len>maxLength) maxLength = len; } NSMutableString *dummy = [NSMutableString string]; @@ -1054,12 +1060,14 @@ if(backtickMode && !triggerMode) [theView performSelector:@selector(moveRight:)]; // If it's a function or procedure append () and if a argument list can be retieved insert them as snippets +#ifndef SP_REFACTOR else if([prefs boolForKey:SPCustomQueryFunctionCompletionInsertsArguments] && ([[[filtered objectAtIndex:[theTableView selectedRow]] objectForKey:@"image"] hasPrefix:@"func"] || [[[filtered objectAtIndex:[theTableView selectedRow]] objectForKey:@"image"] hasPrefix:@"proc"]) && ![aString hasSuffix:@")"]) { NSString *functionArgumentSnippet = [NSString stringWithFormat:@"(%@)", [[SPQueryController sharedQueryController] argumentSnippetForFunction:aString]]; [theView insertAsSnippet:functionArgumentSnippet atRange:[theView selectedRange]]; if([functionArgumentSnippet length] == 2) [theView performSelector:@selector(moveLeft:)]; } +#endif } - (void)completeAndInsertSnippet @@ -1079,7 +1087,7 @@ NSString* candidateMatch = [selectedItem objectForKey:@"match"] ?: [selectedItem objectForKey:@"display"]; if([selectedItem objectForKey:@"isRef"] && ([[NSApp currentEvent] modifierFlags] & (NSShiftKeyMask)) - && [[selectedItem objectForKey:@"path"] length] && theAliasName == nil) { + && [(NSString*)[selectedItem objectForKey:@"path"] length] && theAliasName == nil) { NSString *path = [[[selectedItem objectForKey:@"path"] componentsSeparatedByString:SPUniqueSchemaDelimiter] componentsJoinedByPeriodAndBacktickQuotedAndIgnoreFirst]; // Check if path's db name is the current selected db name |