From a329d031aac349c0ad2b0768cc24ce69dc09a577 Mon Sep 17 00:00:00 2001
From: rowanbeentje <rowan@beent.je>
Date: Sat, 24 Apr 2010 01:36:34 +0000
Subject: Merge in a number of fixes from trunk (r2065, r2066, r2067, r2068,
 r2069, r2074, r2075, r2076, r2078, r2079, r2081, r2083, r2084, r2085, r2089,
 r2090, r2100, r2110, r2117, r2118, r2119, r2120, r2128, r2132, r2133, r2134,
 r2137, r2138, r2139, r2140, r2142, r2150, r2152, r2153, r2154, r2155, r2158,
 and r2160)

---
 Source/CMTextView.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Source/CMTextView.h')

diff --git a/Source/CMTextView.h b/Source/CMTextView.h
index 224349e3..7c09d827 100644
--- a/Source/CMTextView.h
+++ b/Source/CMTextView.h
@@ -31,6 +31,8 @@
 
 #define SP_TEXT_SIZE_TRIGGER_FOR_PARTLY_PARSING 10000
 
+@class SPNarrowDownCompletion;
+
 @interface CMTextView : NSTextView 
 {
 	BOOL autoindentEnabled;
@@ -47,6 +49,7 @@
 	NSString *showMySQLHelpFor;
 	
 	IBOutlet NSScrollView *scrollView;
+	SPNarrowDownCompletion *completionPopup;
 	
 	NSUserDefaults *prefs;
 
@@ -64,6 +67,8 @@
 
 	BOOL completionIsOpen;
 	BOOL completionWasReinvokedAutomatically;
+	BOOL completionWasRefreshed;
+	BOOL completionFuzzyMode;
 	NSUInteger completionParseRangeLocation;
 
 	NSColor *queryHiliteColor;
@@ -120,6 +125,7 @@
 - (void) setConnection:(MCPConnection *)theConnection withVersion:(NSInteger)majorVersion;
 - (void) doCompletionByUsingSpellChecker:(BOOL)isDictMode fuzzyMode:(BOOL)fuzzySearch autoCompleteMode:(BOOL)autoCompleteMode;
 - (void) doAutoCompletion;
+- (void) refreshCompletion;
 - (NSArray *)suggestionsForSQLCompletionWith:(NSString *)currentWord dictMode:(BOOL)isDictMode browseMode:(BOOL)dbBrowseMode withTableName:(NSString*)aTableName withDbName:(NSString*)aDbName;
 - (void) selectCurrentQuery;
 - (void) processMirroredSnippets;
-- 
cgit v1.2.3