1 files changed, 5 insertions, 20 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs
index 34b1968ba3..9e502170ca 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs
@@ -32,11 +32,12 @@ using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Core.Text;
 using Gtk;
 using System.Linq;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.Components.MainToolbar
 {
@@ -51,7 +52,7 @@ namespace MonoDevelop.Components.MainToolbar
 
 		IEnumerable<ProjectFile> files {
 			get {
-				foreach (Document doc in IdeApp.Workbench.Documents) {
+				foreach (var doc in IdeApp.Workbench.Documents) {
 					// We only want to check it here if it's not part
 					// of the open combine.  Otherwise, it will get
 					// checked down below.
@@ -61,7 +62,7 @@ namespace MonoDevelop.Components.MainToolbar
 				
 				var projects = IdeApp.Workspace.GetAllProjects ();
 
-				foreach (Project p in projects) {
+				foreach (var p in projects) {
 					foreach (ProjectFile file in p.Files) {
 						if (file.Subtype != Subtype.Directory && (file.Flags & ProjectItemFlags.Hidden) != ProjectItemFlags.Hidden)
 							yield return file;
@@ -126,9 +127,7 @@ namespace MonoDevelop.Components.MainToolbar
 		class WorkerResult 
 		{
 			public List<ProjectFile> filteredFiles = null;
-			public List<ITypeDefinition> filteredTypes = null;
-			public List<IMember> filteredMembers  = null;
-			
+
 			public string pattern = null;
 			public bool isGotoFilePattern;
 			public ResultsDataSource results;
@@ -137,8 +136,6 @@ namespace MonoDevelop.Components.MainToolbar
 			
 			public bool IncludeFiles, IncludeTypes, IncludeMembers;
 			
-			public Ambience ambience;
-			
 			public StringMatcher matcher = null;
 			
 			public WorkerResult (Widget widget)
@@ -162,18 +159,6 @@ namespace MonoDevelop.Components.MainToolbar
 				return null;
 			}
 			
-			internal SearchResult CheckType (ITypeDefinition type)
-			{
-				int rank;
-				if (MatchName (type.Name, out rank))
-					return new TypeSearchResult (pattern, type.Name, rank, type, false) { Ambience = ambience };
-				if (!FullSearch)
-					return null;
-				if (MatchName (type.FullName, out rank))
-					return new TypeSearchResult (pattern, type.FullName, rank, type, true) { Ambience = ambience };
-				return null;
-			}
-			
 			Dictionary<string, MatchResult> savedMatches = new Dictionary<string, MatchResult> ();
 			bool MatchName (string name, out int matchRank)
 			{