Special evaluator exception type (EvaluatorExceptionThrownException) that wraps target process exception that occurred during runtime call. This allows to inspect exception objects in watch window if eval thrown an exception.

Author: nerzhulart

Mono.Debugging/Mono.Debugging.Client/ObjectValue.cs

@@ -32,6 +32,7 @@
 using System.Linq;
 
 using Mono.Debugging.Backend;
+using Mono.Debugging.Evaluation;
 
 namespace Mono.Debugging.Client
 {
@@ -151,8 +152,18 @@ public static ObjectValue CreateError (IObjectValueSource source, ObjectPath pat
 			val.value = value;
 			return val;
 		}
-		
-		public static ObjectValue CreateImplicitNotSupported (IObjectValueSource source, ObjectPath path, string typeName, ObjectValueFlags flags)
+
+		public static ObjectValue CreateEvaluationException (EvaluationContext ctx, IObjectValueSource source, ObjectPath path, EvaluatorExceptionThrownException exception,
+			ObjectValueFlags flags = ObjectValueFlags.None)
+		{
+			var error = CreateError (source, path, exception.ExceptionTypeName, "Exception was thrown", flags);
+			var exceptionReference = LiteralValueReference.CreateTargetObjectLiteral (ctx, "Exception", exception.Exception);
+			var exceptionValue = exceptionReference.CreateObjectValue (ctx.Options);
+			error.children = new List<ObjectValue> {exceptionValue};
+			return error;
+		}
+
+	  public static ObjectValue CreateImplicitNotSupported (IObjectValueSource source, ObjectPath path, string typeName, ObjectValueFlags flags)
 		{
 			var val = Create (source, path, typeName);
 			val.flags = flags | ObjectValueFlags.ImplicitNotSupported;

Mono.Debugging/Mono.Debugging.Evaluation/ExpressionEvaluator.cs

@@ -199,14 +199,28 @@ public virtual ValueReference GetCurrentException (EvaluationContext ctx)
 	[Serializable]
 	public class EvaluatorException: Exception
 	{
+
 		protected EvaluatorException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 		}
 
-		public EvaluatorException (string msg, params object[] args): base (string.Format (msg, args))
+		public EvaluatorException (string msg, params object[] args): base (string.Format(msg, args))
+		{
+		}
+	}
+
+	[Serializable]
+	public class EvaluatorExceptionThrownException : EvaluatorException
+	{
+		public EvaluatorExceptionThrownException (object exception, string exceptionTypeName) : base ("Exception is thrown")
 		{
+			Exception = exception;
+			ExceptionTypeName = exceptionTypeName;
 		}
+
+		public object Exception { get; private set; }
+		public string ExceptionTypeName { get; private set; }
 	}
 
 	[Serializable]

Mono.Debugging/Mono.Debugging.Evaluation/ObjectValueAdaptor.cs

@@ -1355,6 +1355,8 @@ public ObjectValue GetExpressionValue (EvaluationContext ctx, string exp)
 				return ObjectValue.CreateImplicitNotSupported (ctx.ExpressionValueSource, new ObjectPath (exp), "", ObjectValueFlags.None);
 			} catch (NotSupportedExpressionException ex) {
 				return ObjectValue.CreateNotSupported (ctx.ExpressionValueSource, new ObjectPath (exp), "", ex.Message, ObjectValueFlags.None);
+			} catch (EvaluatorExceptionThrownException ex) {
+				return ObjectValue.CreateEvaluationException (ctx, ctx.ExpressionValueSource, new ObjectPath (exp), ex);
 			} catch (EvaluatorException ex) {
 				return ObjectValue.CreateError (ctx.ExpressionValueSource, new ObjectPath (exp), "", ex.Message, ObjectValueFlags.None);
 			} catch (Exception ex) {