Merge pull request #837 from jpbruyere/CodeTemplateFix

[code] Fix Generic collection argument type return for code template
mono · Jun 10, 2015 · ca5f9c2 · ca5f9c2
2 parents 18432cc + 5dd383d
commit ca5f9c2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs
@@ -143,18 +143,19 @@ public string GetLengthProperty (Func<string, string> callback, string varName)
 
 		IType GetElementType (IType result)
 		{
+			IType tmp = null;
 			foreach (var baseType in result.GetAllBaseTypes ()) {
 				var baseTypeDef = baseType.GetDefinition();
 				if (baseTypeDef != null && baseTypeDef.Name == "IEnumerable") {
 					if (baseTypeDef.Namespace == "System.Collections.Generic" && baseTypeDef.TypeParameterCount == 1) {
 						if (baseType.TypeArguments.Count > 0)
 							return baseType.TypeArguments[0];
 					} else if (baseTypeDef.Namespace == "System.Collections" && baseTypeDef.TypeParameterCount == 0) {
-						return CurrentContext.Compilation.FindType (KnownTypeCode.Object);
+						tmp = CurrentContext.Compilation.FindType (KnownTypeCode.Object);
 					}
 				}
 			}
-			return new UnknownType ("", "", 0);
+			return tmp == null ? new UnknownType ("", "", 0) : tmp;
 		}