Crash earlier when type is not found by name

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6250 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Debugger/Debugger.Core/MetaData/DebugType.cs

@@ -867,10 +867,7 @@ namespace Debugger.MetaData
 			if (type.DeclaringType != null)
 				declaringType = CreateFromType(module, type.DeclaringType);
 			
-			DebugType result = CreateFromName(module, type.FullName, declaringType);
-			if (result == null)
-				throw new DebuggerException("Type not found: " + type);
-			return result;
+			return CreateFromName(module, type.FullName, declaringType);
 		}
 		
 		public static DebugType CreateFromType(AppDomain appDomain, System.Type type, params DebugType[] genericArgumentsOverride)
@@ -897,19 +894,24 @@ namespace Debugger.MetaData
 				declaringType = null;
 			}
 			
-			DebugType result = CreateFromName(appDomain, name, declaringType, genericArgumentsOverride);
-			if (result == null)
-				throw new DebuggerException("Type not found: " + type);
-			return result;
+			return CreateFromName(appDomain, name, declaringType, genericArgumentsOverride);
 		}
 		
 		public static DebugType CreateFromName(AppDomain appDomain, string name, DebugType declaringType, params DebugType[] genericArguments)
+		{
+			DebugType type = CreateFromNameOrNull(appDomain, name, declaringType, genericArguments);
+			if (type == null)
+				throw new DebuggerException("Type not found: " + name + (declaringType != null ? " (declaring type = " + declaringType.FullName + ")" : string.Empty));
+			return type;
+		}
+		
+		public static DebugType CreateFromNameOrNull(AppDomain appDomain, string name, DebugType declaringType, params DebugType[] genericArguments)
 		{
 			if (declaringType != null)
-				return CreateFromName(declaringType.DebugModule, name, declaringType, genericArguments);
+				return CreateFromNameOrNull(declaringType.DebugModule, name, declaringType, genericArguments);
 			foreach(Module module in appDomain.Process.Modules) {
 				if (module.AppDomain != appDomain) continue;
-				DebugType result = CreateFromName(module, name, declaringType, genericArguments);
+				DebugType result = CreateFromNameOrNull(module, name, declaringType, genericArguments);
 				if (result != null)
 					return result;
 			}
@@ -917,6 +919,14 @@ namespace Debugger.MetaData
 		}
 		
 		public static DebugType CreateFromName(Module module, string name, DebugType declaringType, params DebugType[] genericArguments)
+		{
+			DebugType type = CreateFromNameOrNull(module, name, declaringType, genericArguments);
+			if (type == null)
+				throw new DebuggerException("Type not found: " + name + (declaringType != null ? " (declaring type = " + declaringType.FullName + ")" : string.Empty));
+			return type;
+		}
+		
+		public static DebugType CreateFromNameOrNull(Module module, string name, DebugType declaringType, params DebugType[] genericArguments)
 		{
 			if (declaringType != null && declaringType.DebugModule != module)
 				throw new DebuggerException("Declaring type must be in the same module");

src/AddIns/Debugger/Debugger.Core/NRefactory/Ast/ExpressionExtensionMethods.cs

@@ -307,7 +307,7 @@ namespace ICSharpCode.NRefactory.Ast
 			// If there are generic types up in the tree, it must be nested type
 			if (genArgs.Length == typeRef.GenericTypes.Count) {
 				string name = GetNameWithArgCounts(typeRef);
-				type = DebugType.CreateFromName(appDomain, name, null, genArgs);
+				type = DebugType.CreateFromNameOrNull(appDomain, name, null, genArgs);
 			}
 			
 			// Try to construct nested type
@@ -318,7 +318,7 @@ namespace ICSharpCode.NRefactory.Ast
 				
 				DebugType outter = ResolveTypeInternal(((InnerClassTypeReference)typeRef).BaseType, outterGenArgs, appDomain);
 				string nestedName = typeRef.GenericTypes.Count == 0 ? typeRef.Type : typeRef.Type + "`" + typeRef.GenericTypes.Count;
-				type = DebugType.CreateFromName(appDomain, nestedName, outter, genArgs);
+				type = DebugType.CreateFromNameOrNull(appDomain, nestedName, outter, genArgs);
 			}
 			
 			if (type == null)