implement proper fix for #179 + add unit test

ICSharpCode.Decompiler/Ast/AstBuilder.cs

@@ -427,17 +427,6 @@ namespace ICSharpCode.Decompiler.Ast
 						astType = new MemberType { Target = nsType, MemberName = name };
 					} else {
 						astType = new SimpleType(name);
-
-						// Look for generic type parameters defined in TypeDefinition
-						// allows us to display angle brackets in unbound type names
-						// e.g. typeof(List<>)
-						TypeDefinition resolvedType = type.Resolve();
-						
-						if (!type.HasGenericParameters && resolvedType != null) {
-							for (int i = 0; i < resolvedType.GenericParameters.Count; i++) {
-								((SimpleType)astType).TypeArguments.Add(new SimpleType(""));
-							}
-						}
 					}
 					astType.AddAnnotation(type);
 					

ICSharpCode.Decompiler/Ast/AstMethodBodyBuilder.cs

@@ -601,7 +601,7 @@ namespace ICSharpCode.Decompiler.Ast
 					case ILCode.Ldstr:  return new Ast.PrimitiveExpression(operand);
 				case ILCode.Ldtoken:
 					if (operand is Cecil.TypeReference) {
-						return new Ast.TypeOfExpression { Type = operandAsTypeRef }.Member("TypeHandle");
+						return new Ast.TypeOfExpression { Type = AddEmptyTypeArgumentsForUnboundGenerics(operandAsTypeRef) }.Member("TypeHandle");
 					} else {
 						return InlineAssembly(byteCode, args);
 					}
@@ -749,6 +749,32 @@ namespace ICSharpCode.Decompiler.Ast
 			}
 		}
 		
+		AstType AddEmptyTypeArgumentsForUnboundGenerics(AstType type)
+		{
+			TypeDefinition typeDef = type.Annotation<TypeReference>().Resolve();
+			if (typeDef == null || !typeDef.HasGenericParameters)
+				return type;
+			SimpleType sType = type as SimpleType;
+			MemberType mType = type as MemberType;
+			if (sType != null) {
+				while (typeDef.GenericParameters.Count > sType.TypeArguments.Count) {
+					sType.TypeArguments.Add(new SimpleType(""));
+				}
+			}
+			
+			if (mType != null) {
+				AddEmptyTypeArgumentsForUnboundGenerics(mType.Target);
+				
+				int outerTypeParamCount = typeDef.DeclaringType == null ? 0 : typeDef.DeclaringType.GenericParameters.Count;
+				
+				while (typeDef.GenericParameters.Count - outerTypeParamCount > mType.TypeArguments.Count) {
+					mType.TypeArguments.Add(new SimpleType(""));
+				}
+			}
+			
+			return type;
+		}
+		
 		static readonly AstNode objectInitializerPattern = new AssignmentExpression(
 			new MemberReferenceExpression {
 				Target = new InitializedObjectExpression()

ICSharpCode.Decompiler/Tests/Generics.cs

@@ -60,6 +60,10 @@ public static class Generics
 		}
 	}
 	
+	private static Type type1 = typeof(List<>);
+	private static Type type2 = typeof(Generics.MyArray<>);
+	private static Type type3 = typeof(List<>.Enumerator);
+	
 	public static void MethodWithConstraint<T, S>() where T : class, S where S : ICloneable, new()
 	{
 	}