• fixed dealloc of 'suggestions' in SPNarrowDownCompletion

• deleted (void)paste hook from CMTextView (not needed anymore)
• decreased iteration cycles for 'normal' completion (ESC) by getting only the unique words from the current textView

1 files changed, 11 insertions, 15 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
  */