diff options
| -rw-r--r-- | Source/CMTextView.m | 26 | ||||
| -rw-r--r-- | Source/SPNarrowDownCompletion.m | 10 |
2 files changed, 14 insertions, 22 deletions
diff --git a/Source/CMTextView.m b/Source/CMTextView.m index dbd33342..ecca0721 100644 --- a/Source/CMTextView.m +++ b/Source/CMTextView.m @@ -915,12 +915,20 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) if(![[[self textStorage] attribute:kBTQuote atIndex:charRange.location effectiveRange:nil] isEqualToString:kBTQuoteValue] ) { // Only parse for words if text size is less than 6MB + // if([[self string] length]<6000000) + // { + // NSCharacterSet *separators = [NSCharacterSet characterSetWithCharactersInString:@" \t\r\n,()\"'`-!;=+|?:~@"]; + // NSArray *textViewWords = [[self string] componentsSeparatedByCharactersInSet:separators]; + // [possibleCompletions addObjectsFromArray:textViewWords]; + // } if([[self string] length]<6000000) { - NSCharacterSet *separators = [NSCharacterSet characterSetWithCharactersInString:@" \t\r\n,()\"'`-!;=+|?:~@"]; - NSArray *textViewWords = [[self string] componentsSeparatedByCharactersInSet:separators]; - [possibleCompletions addObjectsFromArray:textViewWords]; + NSCharacterSet *separators = [NSCharacterSet characterSetWithCharactersInString:@" \t\r\n,()[]{}\"'`-!;=+|?:~@"]; + NSMutableArray *uniqueArray = [NSMutableArray array]; + [uniqueArray addObjectsFromArray:[[NSSet setWithArray:[[self string] componentsSeparatedByCharactersInSet:separators]] allObjects]]; + [possibleCompletions addObjectsFromArray:uniqueArray]; } + [possibleCompletions addObjectsFromArray:[self keywords]]; } @@ -946,18 +954,6 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) /* - * Hook to invoke the auto-uppercasing of SQL keywords after pasting - */ -- (void)paste:(id)sender -{ - - [super paste:sender]; - // Invoke the auto-uppercasing of SQL keywords via an additional trigger - [self insertText:@""]; -} - - -/* * List of keywords for autocompletion. If you add a keyword here, * it should also be added to the flex file SPEditorTokens.l */ diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m index adadd902..e2a52882 100644 --- a/Source/SPNarrowDownCompletion.m +++ b/Source/SPNarrowDownCompletion.m @@ -110,8 +110,7 @@ [mutablePrefix release]; [textualInputCharacters release]; - // TODO: This may cause errors, I cannot see if it is always set up - only if !dictMode. - // [suggestions release]; + if(suggestions) [suggestions release]; if (filtered) [filtered release]; @@ -134,9 +133,7 @@ theView = aView; dictMode = mode; - if(dictMode) { - words = [NSArray arrayWithArray:suggestions]; - } else { + if(!dictMode) { suggestions = [someSuggestions retain]; words = nil; } @@ -236,8 +233,7 @@ NSArray* newFiltered; if([mutablePrefix length] > 0) { - if(dictMode) - { + if(dictMode) { newFiltered = [[NSSpellChecker sharedSpellChecker] completionsForPartialWordRange:NSMakeRange(0,[[self filterString] length]) inString:[self filterString] language:nil inSpellDocumentWithTag:0]; } else { NSPredicate* predicate; |