fix http://community.sharpdevelop.net/forums/t/13658.aspx - type was …

…not found due to type forwarding
stark-lang · Aug 21, 2011 · c0fe6d0 · c0fe6d0
1 parent ac683e2
commit c0fe6d0
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/ILSpy.BamlDecompiler/CecilTypeResolver.cs b/ILSpy.BamlDecompiler/CecilTypeResolver.cs
@@ -48,15 +48,38 @@ public IType GetTypeByAssemblyQualifiedName(string name)
 			string assemblyName = name.Substring(comma + 1).Trim();
 
 			var type = thisAssembly.MainModule.GetType(fullName);
+
+			if (type == null) {
+				type = TryFindInExportedTypes(fullName, thisAssembly);
+			}
+
 			if (type == null) {
 				var otherAssembly = resolver.Resolve(assemblyName);
 				if (otherAssembly == null)
 					throw new Exception("could not resolve '" + assemblyName + "'!");
 				type = otherAssembly.MainModule.GetType(fullName.Replace('+', '/'));
+
+				if (type == null) {
+					type = TryFindInExportedTypes(fullName, otherAssembly);
+				}
 			}
 
+			if (type == null)
+				throw new Exception("could not resolve '" + name + "'!");
+
 			return new CecilType(type);
 		}
+
+		TypeDefinition TryFindInExportedTypes(string fullName, AssemblyDefinition asm)
+		{
+			foreach (var exportedType in asm.MainModule.ExportedTypes) {
+				if (exportedType.IsForwarder && exportedType.FullName == fullName) {
+					return exportedType.Resolve();
+				}
+			}
+
+			return null;
+		}
 
 		public IDependencyPropertyDescriptor GetDependencyPropertyDescriptor(string name, IType ownerType, IType targetType)
 		{