[Ide] Report cancelation in the statusbar when cancelling a search.

3 files changed, 15 insertions, 9 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
index 18fb504f14..f2d967720e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
@@ -869,20 +869,18 @@ namespace MonoDevelop.Ide.FindInFiles
 						LoggingService.LogError ("Error while search", ex);
 					}
 						
-					string message;
+					string message = null;
 					if (errorMessage != null) {
 						message = GettextCatalog.GetString ("The search could not be finished: {0}", errorMessage);
 						searchMonitor.ReportError (message, null);
-					} else if (searchMonitor.CancellationToken.IsCancellationRequested) {
-						message = GettextCatalog.GetString ("Search cancelled.");
-						searchMonitor.ReportWarning (message);
-					} else {
+					} else if (!searchMonitor.CancellationToken.IsCancellationRequested) {
 						string matches = string.Format (GettextCatalog.GetPluralString ("{0} match found", "{0} matches found", find.FoundMatchesCount), find.FoundMatchesCount);
 						string files = string.Format (GettextCatalog.GetPluralString ("in {0} file.", "in {0} files.", find.SearchedFilesCount), find.SearchedFilesCount);
 						message = GettextCatalog.GetString ("Search completed.") + Environment.NewLine + matches + " " + files;
 						searchMonitor.ReportSuccess (message);
 					}
-					searchMonitor.ReportStatus (message);
+					if (message != null)
+						searchMonitor.ReportStatus (message);
 					searchMonitor.Log.WriteLine (GettextCatalog.GetString ("Search time: {0} seconds."), (DateTime.Now - timer).TotalSeconds);
 				}
 				if (UpdateStopButton != null) {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs
index 411cef17c2..f504105b48 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs
@@ -99,14 +99,18 @@ namespace MonoDevelop.Ide.FindInFiles
 		protected override void OnCompleted ()
 		{
 			if (outputPad == null) throw GetDisposedException ();
+
 			outputPad.WriteText ("\n");
 			
 			foreach (string msg in SuccessMessages)
 				outputPad.WriteText (msg + "\n");
 			
+			if (CancellationToken.IsCancellationRequested)
+				ReportWarning (GettextCatalog.GetString ("Search operation canceled"));
+
 			foreach (string msg in Warnings)
 				outputPad.WriteText (msg + "\n");
-			
+
 			foreach (var msg in Errors)
 				outputPad.WriteText (msg.Message + "\n");
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultPad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultPad.cs
index 5311dca0d1..b1cb2d9cf5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultPad.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultPad.cs
@@ -126,8 +126,12 @@ namespace MonoDevelop.Ide.FindInFiles
 		public void EndProgress ()
 		{
 			Window.IsWorking = false;
-			widget.ShowStatus (" " + GettextCatalog.GetString("Search completed") + " - " + 
-				string.Format (GettextCatalog.GetPluralString("{0} match.", "{0} matches.", widget.ResultCount), widget.ResultCount));
+			if (CancellationTokenSource.Token.IsCancellationRequested) {
+				widget.ShowStatus (" " + GettextCatalog.GetString ("Search cancelled"));
+			} else {
+				widget.ShowStatus (" " + GettextCatalog.GetString ("Search completed") + " - " +
+				string.Format (GettextCatalog.GetPluralString ("{0} match.", "{0} matches.", widget.ResultCount), widget.ResultCount));
+			}
 			widget.EndProgress ();
 			if (FocusPad) 
 				widget.FocusPad ();