Change evaluation of ExceptionInfo so it works with .NetCore debugger

Author: David Karlaš

Mono.Debugging/Mono.Debugging.Client/ExceptionInfo.cs

@@ -112,7 +112,8 @@ public ObjectValue Instance {
 			get {
 				if (instance == null)
 					instance = exception.GetChild ("Instance");
-
+				if (instance == null)
+					return exception;
 				return instance;
 			}
 		}
@@ -137,7 +138,7 @@ public ExceptionStackFrame[] StackTrace {
 					return frames;
 
 				var stackTrace = exception.GetChild ("StackTrace");
-				if (stackTrace == null)
+				if (stackTrace == null || stackTrace.IsNull)
 					return frames = new ExceptionStackFrame [0];
 
 				if (stackTrace.IsEvaluating) {
@@ -146,9 +147,13 @@ public ExceptionStackFrame[] StackTrace {
 					return frames;
 				}
 
+				if (stackTrace.TypeName == "string") {
+					stackTrace = Debugging.Evaluation.ExceptionInfoSource.GetStackTrace (stackTrace.Value);
+				}
+
 				var list = new List<ExceptionStackFrame> ();
-				foreach (var val in stackTrace.GetAllChildren ())
-					list.Add (new ExceptionStackFrame (val));
+				for (int i = 0; i < stackTrace.ArrayCount; i++)
+					list.Add (new ExceptionStackFrame (stackTrace.GetArrayItem (i, EvaluationOptions.DefaultOptions)));
 
 				frames = list.ToArray ();
 
@@ -160,7 +165,7 @@ public ExceptionInfo InnerException {
 			get {
 				if (innerException == null) {
 					ObjectValue innerVal = exception.GetChild ("InnerException");
-					if (innerVal == null || innerVal.IsError || innerVal.IsUnknown)
+					if (innerVal == null || innerVal.IsNull || innerVal.IsError || innerVal.IsUnknown)
 						return null;
 					if (innerVal.IsEvaluating) {
 						innerVal.ValueChanged += delegate { NotifyChanged (); };
@@ -261,7 +266,7 @@ public ExceptionStackFrame (ObjectValue value)
 
 		public string File {
 			get {
-				ObjectValue file = frame.GetChild ("File");
+				ObjectValue file = frame.GetChild ("File", EvaluationOptions.DefaultOptions);
 				if (file != null)
 					return file.Value;
 
@@ -271,7 +276,7 @@ public string File {
 
 		public int Line {
 			get {
-				ObjectValue val = frame.GetChild ("Line");
+				ObjectValue val = frame.GetChild ("Line", EvaluationOptions.DefaultOptions);
 				if (val != null)
 					return int.Parse (val.Value);
 
@@ -281,7 +286,7 @@ public int Line {
 
 		public int Column {
 			get {
-				ObjectValue val = frame.GetChild ("Column");
+				ObjectValue val = frame.GetChild ("Column", EvaluationOptions.DefaultOptions);
 				if (val != null)
 					return int.Parse (val.Value);
 

Mono.Debugging/Mono.Debugging.Evaluation/ExceptionInfoSource.cs

@@ -148,24 +148,25 @@ public ObjectValue CreateObjectValue (bool withTimeout, EvaluationOptions option
 			ObjectValue stackTraceValue;
 			if (withTimeout) {
 				stackTraceValue = ctx.Adapter.CreateObjectValueAsync ("StackTrace", ObjectValueFlags.None, delegate {
-					return GetStackTrace (options, exceptionType);
+					var stackTrace = ctx.Adapter.GetMember (ctx, Exception, exceptionType, Exception.Value, "StackTrace");
+					if (stackTrace == null)
+						return ObjectValue.CreateUnknown ("StackTrace");
+					return GetStackTrace (stackTrace.ObjectValue as string);
 				});
 			} else {
-				stackTraceValue = GetStackTrace (options, exceptionType);
+				var stackTrace = ctx.Adapter.GetMember (ctx, Exception, exceptionType, Exception.Value, "StackTrace");
+				if (stackTrace == null)
+					return ObjectValue.CreateUnknown ("StackTrace");
+				stackTraceValue = GetStackTrace (stackTrace.ObjectValue as string);
 			}
 
 			var children = new ObjectValue [] { excInstance, messageValue, stackTraceValue, childExceptionValue, childExceptionsValue };
 
 			return ObjectValue.CreateObject (null, new ObjectPath ("InnerException"), type, "", ObjectValueFlags.None, children);
 		}
 
-		ObjectValue GetStackTrace (EvaluationOptions options, object exceptionType)
+		public static ObjectValue GetStackTrace (string trace)
 		{
-			var stackTrace = ctx.Adapter.GetMember (ctx, Exception, exceptionType, Exception.Value, "StackTrace");
-			if (stackTrace == null)
-				return ObjectValue.CreateUnknown ("StackTrace");
-
-			string trace = stackTrace.ObjectValue as string;
 			if (trace == null)
 				return ObjectValue.CreateUnknown ("StackTrace");
 
@@ -174,7 +175,7 @@ ObjectValue GetStackTrace (EvaluationOptions options, object exceptionType)
 			var frames = new List<ObjectValue> ();
 
 			foreach (var sframe in trace.Split ('\n')) {
-				string text = sframe.Trim (' ', '\r', '\t');
+				string text = sframe.Trim (' ', '\r', '\t', '"');
 				string file = "";
 				int column = 0;
 				int line = 0;