From b9983be6b6a62ca68be93f8b1d760010fa5ac69e Mon Sep 17 00:00:00 2001
From: Manuel Simon Hirsig <simon.hirsig@gmail.com>
Date: Thu, 3 Mar 2016 22:28:45 +0100
Subject: [PATCH] --amend

---
 completion.lua   | 47 +++++++++++++++++++++++------------------------
 search_frame.lua |  6 ++++--
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/completion.lua b/completion.lua
index cb3f3a7..2554e65 100644
--- a/completion.lua
+++ b/completion.lua
@@ -24,22 +24,22 @@ function m:complete()
 
 	local completed_filter_string = ({strfind(filter_string, '([^;]*)/[^/;]*$')})[3]
 	local current_filter = completed_filter_string and Aux.scan_util.filter_from_string(completed_filter_string)
+	local current_query = current_filter and current_filter.blizzard_query
 
 	local options = {}
 
-	if current_filter or not completed_filter_string then
-		current_filter = current_filter or {}
+	if current_query or not completed_filter_string then
+		current_query = current_query or {}
 
-		if current_filter.name
-				and Aux.static.item_id(strupper(current_filter.name))
-				and not current_filter.min_level
-				and not current_filter.max_level
-				and not current_filter.class
-				and not current_filter.subclass
-				and not current_filter.slot
-				and not current_filter.quality
-				and not current_filter.usable
-				and not current_filter.exact
+		if current_query.name
+				and Aux.static.item_id(strupper(current_query.name))
+				and not current_query.min_level
+				and not current_query.max_level
+				and not current_query.class
+				and not current_query.subclass
+				and not current_query.slot
+				and not current_query.quality
+				and not current_query.usable
 		then
 			tinsert(options, 'exact')
 		end
@@ -49,44 +49,43 @@ function m:complete()
 		tinsert(options, 'not')
 		tinsert(options, 'tt')
 
+		for filter, _ in pairs(Aux.scan_util.filters) do
+			tinsert(options, strlower(filter))
+		end
+
 		-- classes
-		if not current_filter.class and not current_filter.exact then
+		if not current_query.class then
 			for _, class in ipairs({ GetAuctionItemClasses() }) do
 				tinsert(options, class)
 			end
 		end
 
 		-- subclasses
-		if current_filter.class and not current_filter.subclass then
-			for _, subclass in ipairs({ GetAuctionItemSubClasses(current_filter.class) }) do
+		if current_query.class and not current_query.subclass then
+			for _, subclass in ipairs({ GetAuctionItemSubClasses(current_query.class) }) do
 				tinsert(options, subclass)
 			end
 		end
 
 		-- slots
-		if current_filter.class and current_filter.subclass and not current_filter.slot then
-			for _, invtype in ipairs({ GetAuctionInvTypes(current_filter.class, current_filter.subclass) }) do
+		if current_query.class and current_query.subclass and not current_query.slot then
+			for _, invtype in ipairs({ GetAuctionInvTypes(current_query.class, current_query.subclass) }) do
 				tinsert(options, getglobal(invtype))
 			end
 		end
 
 		-- usable
-		if not current_filter.usable and not current_filter.exact then
+		if not current_query.usable then
 			tinsert(options, 'usable')
 		end
 
 		-- rarities
-		if not current_filter.quality and not current_filter.exact then
+		if not current_query.quality then
 			for i=0,4 do
 				tinsert(options, getglobal('ITEM_QUALITY'..i..'_DESC'))
 			end
 		end
 
-		-- discard
-		if not current_filter.discard then
-			tinsert(options, 'discard')
-		end
-
 		-- item names
 		if not completed_filter_string then
 			for _, name in ipairs(m.sorted_item_names()) do
diff --git a/search_frame.lua b/search_frame.lua
index bbcbd65..6e2dd3c 100644
--- a/search_frame.lua
+++ b/search_frame.lua
@@ -164,13 +164,15 @@ function private.prettify_search(search)
         return NORMAL_FONT_COLOR_CODE..'No filter'..FONT_COLOR_CODE_CLOSE
     end
 
+    local default_color = Aux.gui.inline_color({216, 225, 211, 1})
+
     local item_pattern = '([^/;]+)([^;]*)/exact'
     while true do
         local _, _, name, in_between = strfind(search, item_pattern)
         if name then
-            search = gsub(search, item_pattern, private.display_name(Aux.static.item_id(strupper(name)))..in_between, 1)
+            search = gsub(search, item_pattern, private.display_name(Aux.static.item_id(strupper(name)))..default_color..in_between, 1)
         else
-            return Aux.gui.inline_color({216, 225, 211, 1})..search..'|r'
+            return default_color..search..'|r'
         end
     end
 end