[UIRefresh] Implemented navigate to command tags/Fixed 'Bug 7059 - On

clicking 'Search' menu, the following options: 'Go to File', 'Go to
Type' and 'Navigate TO' are not appearing.'.

1 files changed, 6 insertions, 8 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 a4b256eb9d..9c834b0df7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs
@@ -73,22 +73,20 @@ namespace MonoDevelop.Components.MainToolbar
 		}
 
 		WorkerResult lastResult;
+		string[] validTags = new [] { "f", "file"};
 
-		public override Task<ISearchDataSource> GetResults (string searchPattern, CancellationToken token)
+		public override Task<ISearchDataSource> GetResults (SearchPopupSearchPattern searchPattern, CancellationToken token)
 		{
 			return Task.Factory.StartNew (delegate {
+				if (searchPattern.Tag != null && !validTags.Contains (searchPattern.Tag))
+					return null;
 				WorkerResult newResult = new WorkerResult (widget);
-				newResult.pattern = searchPattern;
+				newResult.pattern = searchPattern.Pattern;
 				newResult.IncludeFiles = true;
 				newResult.IncludeTypes = true;
 				newResult.IncludeMembers = true;
 
-				string toMatch = searchPattern;
-				int i = toMatch.IndexOf (':');
-				if (i != -1) {
-					toMatch = toMatch.Substring (0,i);
-					newResult.isGotoFilePattern = true;
-				}
+				string toMatch = searchPattern.Pattern;
 				newResult.matcher = StringMatcher.GetMatcher (toMatch, true);
 				newResult.FullSearch = true;