fix #549: Breaking on all but one exception type does not work as expected

Author: siegfriedpammer

data/resources/StringResources.resx

@@ -8211,9 +8211,12 @@ a line break</value>
     <value>Break on</value>
   </data>
   <data name="Dialog.Options.IDEOptions.Debugging.ExceptionFilter.ColumnExpression" xml:space="preserve">
-    <value>Exception name expression (wildcards are allowed)</value>
+    <value>Full exception name</value>
   </data>
   <data name="Dialog.Options.IDEOptions.Debugging.ChooseExceptions" xml:space="preserve">
     <value>Choose exceptions</value>
   </data>
+  <data name="MainWindow.Windows.Debug.ExceptionForm.BreakOnHandled" xml:space="preserve">
+    <value>Break on handled ${ExceptionName}</value>
+  </data>
 </root>

src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
 using Debugger;
 using ICSharpCode.Core;
@@ -30,16 +31,18 @@ namespace ICSharpCode.SharpDevelop.Services
 	internal sealed partial class DebuggeeExceptionForm
 	{
 		Process process;
+		string exceptionType;
 
 		public bool Break { get; set; }
 
-		DebuggeeExceptionForm(Process process)
+		DebuggeeExceptionForm(Process process, string exceptionType)
 		{
 			InitializeComponent();
 
 			this.Break = true;
 
 			this.process = process;
+			this.exceptionType = exceptionType;
 
 			this.process.Exited += ProcessHandler;
 			this.process.Resumed += ProcessHandler;
@@ -75,14 +78,20 @@ void FormClosedHandler(object sender, EventArgs e)
 			this.process.Resumed -= ProcessHandler;
 		}
 
-		public static bool Show(Process process, string title, string type, string stacktrace, Bitmap icon, bool isUnhandled)
+		public static bool Show(Process process, string exceptionType, string stacktrace, bool isUnhandled)
 		{
-			DebuggeeExceptionForm form = new DebuggeeExceptionForm(process);
-			form.Text = title;
+			DebuggeeExceptionForm form = new DebuggeeExceptionForm(process, exceptionType);
+			string type = string.Format(StringParser.Parse("${res:MainWindow.Windows.Debug.ExceptionForm.Message}"), exceptionType);
+			Bitmap icon = WinFormsResourceService.GetBitmap(isUnhandled ? "Icons.32x32.Error" : "Icons.32x32.Warning");
+
+			form.Text = isUnhandled ? StringParser.Parse("${res:MainWindow.Windows.Debug.ExceptionForm.Title.Unhandled}") : StringParser.Parse("${res:MainWindow.Windows.Debug.ExceptionForm.Title.Handled}");
 			form.pictureBox.Image = icon;
 			form.lblExceptionText.Text = type;
 			form.exceptionView.Text = stacktrace;
 			form.btnContinue.Enabled = !isUnhandled;
+			form.chkBreakOnHandled.Visible = !isUnhandled;
+			form.chkBreakOnHandled.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.ExceptionForm.BreakOnHandled}", new StringTagPair("ExceptionName", exceptionType));
+			form.chkBreakOnHandled.Checked = true;
 
 			// Showing the form as dialg seems like a resonable thing in the presence of potentially multiple
 			// concurent debugger evetns
@@ -91,6 +100,21 @@ public static bool Show(Process process, string title, string type, string stack
 			return form.Break;
 		}
 
+		protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
+		{
+			if (chkBreakOnHandled.Visible && !chkBreakOnHandled.Checked) {
+				var list = process.Debugger.Options.ExceptionFilterList.ToList();
+				var entry = list.FirstOrDefault(item => item.Expression.Equals(exceptionType, StringComparison.OrdinalIgnoreCase));
+				if (entry == null) {
+					list.Add(new ExceptionFilterEntry(exceptionType) { IsActive = false });
+				} else {
+					entry.IsActive = false;
+				}
+				process.Debugger.Options.ExceptionFilterList = list;
+			}
+			base.OnClosing(e);
+		}
+		
 		void ExceptionViewDoubleClick(object sender, EventArgs e)
 		{
 			string fullText = exceptionView.Text;

src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs

@@ -533,12 +533,8 @@ void debuggedProcess_DebuggingPaused(object sender, DebuggerPausedEventArgs e)
 					// Do not intercept handled expetions
 					stacktrace += exceptionThread.GetStackTrace(formatSymbols, formatNoSymbols);
 				}
-				
-				string title = isUnhandled ? StringParser.Parse("${res:MainWindow.Windows.Debug.ExceptionForm.Title.Unhandled}") : StringParser.Parse("${res:MainWindow.Windows.Debug.ExceptionForm.Title.Handled}");
-				string type = string.Format(StringParser.Parse("${res:MainWindow.Windows.Debug.ExceptionForm.Message}"), exception.Type);
-				Bitmap icon = WinFormsResourceService.GetBitmap(isUnhandled ? "Icons.32x32.Error" : "Icons.32x32.Warning");
-				
-				if (DebuggeeExceptionForm.Show(e.Process, title, type, stacktrace, icon, isUnhandled)) {
+								
+				if (DebuggeeExceptionForm.Show(e.Process, exception.Type.FullName, stacktrace, isUnhandled)) {
 					breakProcess = true;
 					// The dialog box is allowed to kill the process
 					if (e.Process.HasExited) {

src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs

@@ -557,7 +557,7 @@ public void Exception2(ICorDebugAppDomain pAppDomain, ICorDebugThread pThread, I
 			ExitCallback();
 		}
 
-		Regex filterRegex;
+		Dictionary<string, bool> exceptionFilter;
 
 		static string ConvertWildcardsToRegex(string searchPattern)
 		{
@@ -587,17 +587,18 @@ bool BreakOnException(Thread thread)
 		{
 			IType exceptionType = thread.CurrentException.Type;
 
-			if (filterRegex == null) {
-				var exceptionFilterList = thread.Process.Options.ExceptionFilterList.Where(i => i.IsActive).Select(s => "(" + ConvertWildcardsToRegex(s.Expression) + ")");
-				filterRegex = new Regex(string.Join("|", exceptionFilterList), RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+			if (exceptionFilter == null) {
+				exceptionFilter = thread.Process.Options.ExceptionFilterList
+					.ToDictionary(e => e.Expression, e => e.IsActive, StringComparer.OrdinalIgnoreCase);
 			}
 
-			foreach (var baseType in exceptionType.GetNonInterfaceBaseTypes()) {
-				if (filterRegex.IsMatch(baseType.ReflectionName))
-					return true;
+			foreach (var baseType in exceptionType.GetNonInterfaceBaseTypes().Reverse()) {
+				bool isActive;
+				if (exceptionFilter.TryGetValue(baseType.ReflectionName, out isActive))
+					return isActive;
 			}
 
-			return false;
+			return true;
 		}
 
 		public void ExceptionUnwind(ICorDebugAppDomain pAppDomain, ICorDebugThread pThread, CorDebugExceptionUnwindCallbackType dwEventType, uint dwFlags)