diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType.cs index f3011e4485..22de334d05 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType.cs @@ -211,7 +211,7 @@ namespace Debugger get { ICorDebugType baseType = corType.Base; if (baseType != null) { - return new DebugType(process, baseType); + return Create(process, baseType); } else { return null; } diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Debugger.Tests.csproj b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Debugger.Tests.csproj index 24bf1328ba..101c5da720 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Debugger.Tests.csproj +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Debugger.Tests.csproj @@ -41,6 +41,7 @@ + diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTests.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTests.cs index 2ce1093e55..d44122d960 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTests.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTests.cs @@ -398,5 +398,14 @@ namespace Debugger.Tests process.Continue(); process.WaitForExit(); } + + [Test] + public void ExceptionCustom() + { + StartTest("ExceptionCustom"); + WaitForPause(PausedReason.Exception, null); + process.Continue(); + process.WaitForExit(); + } } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.cs new file mode 100644 index 0000000000..7a7f8a8803 --- /dev/null +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.cs @@ -0,0 +1,27 @@ +// +// +// +// +// $Revision$ +// + +using System; + +namespace Debugger.Tests.TestPrograms +{ + class MyException: System.Exception + { + public MyException(string msg) : base (msg) + { + + } + } + + public class ExceptionCustom + { + public static void Main() + { + throw new MyException("test"); + } + } +} diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.xml new file mode 100644 index 0000000000..729ea9ec64 --- /dev/null +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.xml @@ -0,0 +1,11 @@ + + + + + mscorlib.dll + ExceptionCustom.exe + Exception + test + + + \ No newline at end of file diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.cs index bc15e23779..3e6cd14164 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.cs @@ -11,7 +11,8 @@ namespace Debugger.Tests.TestPrograms { public class BaseClass { - + public string basePublic = "a"; + string basePrivate = "b"; } public class ObjectValue: BaseClass diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.xml index 25de16bc95..f12d2dcb82 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.xml +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.xml @@ -24,7 +24,7 @@ - 3 + 5 @@ -103,6 +103,58 @@ False System.String + + + + False + False + True + False + basePublic + Debugger.Tests.TestPrograms.BaseClass + ObjectValue.exe + + + basePublic + False + + + + False + a + False + True + False + a + False + System.String + + + + + False + True + False + False + basePrivate + Debugger.Tests.TestPrograms.BaseClass + ObjectValue.exe + + + basePrivate + False + + + + False + b + False + True + False + b + False + System.String + @@ -127,7 +179,7 @@ - 3 + 5 @@ -206,6 +258,58 @@ False System.String + + + + False + False + True + False + basePublic + Debugger.Tests.TestPrograms.BaseClass + ObjectValue.exe + + + basePublic + False + + + + False + a + False + True + False + a + False + System.String + + + + + False + True + False + False + basePrivate + Debugger.Tests.TestPrograms.BaseClass + ObjectValue.exe + + + basePrivate + False + + + + False + b + False + True + False + b + False + System.String +