Merge pull request #1 from codesmithtools/master

pwelter34 · pwelter34 · commit 353d72685eed · 2015-04-13T19:32:51.000-05:00
Some updates to ensure generation succeeds.
diff --git a/Generator.cs b/Generator.cs
@@ -84,7 +84,7 @@ public static TypeReference GetUnderlyingType(this TypeReference type)
         if (genericDefinition.GenericParameters.Count != 1 && genericDefinition.FullName != "System.Nullable`1")
             return type;
 
-        return genericType.GenericArguments.Single();
+        return genericType.GenericArguments.FirstOrDefault() ?? type;
     }
 
     public static bool HasInterface(this TypeReference typeReference, string fullName)
@@ -143,7 +143,7 @@ public static bool IsEnumerable(this TypeReference typeReference, out TypeRefere
             return false;
 
         //NOTE issue with custom implementation and matching up argument position
-        elementType = genericCollectionType.GenericArguments.Single();
+        elementType = genericCollectionType.GenericArguments.FirstOrDefault();
         return true;
     }
 
@@ -160,7 +160,7 @@ public static bool IsCollection(this TypeReference typeReference, out TypeRefere
             return false;
 
         //NOTE issue with custom implementation and matching up argument position
-        elementType = genericCollectionType.GenericArguments.Single();
+        elementType = genericCollectionType.GenericArguments.FirstOrDefault();
         return true;
     }
 
diff --git a/TypeScript.Interface.cst b/TypeScript.Interface.cst
@@ -1,4 +1,4 @@
-﻿<%@ Template Language="C#" TargetLanguage="JavaScript" %>
+﻿<%@ Template Language="C#" TargetLanguage="TypeScript" %>
 
 
 <%@ Assembly Name="CodeSmith.CustomProperties" %>

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public static TypeReference GetUnderlyingType(this TypeReference type)`
`84`	`84`	if (genericDefinition.GenericParameters.Count != 1 && genericDefinition.FullName != "System.Nullable`1")
`85`	`85`	`return type;`
`86`	`86`
`87`		`- return genericType.GenericArguments.Single();`
	`87`	`+ return genericType.GenericArguments.FirstOrDefault() ?? type;`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public static bool HasInterface(this TypeReference typeReference, string fullName)`
`@@ -143,7 +143,7 @@ public static bool IsEnumerable(this TypeReference typeReference, out TypeRefere`
`143`	`143`	`return false;`
`144`	`144`
`145`	`145`	`//NOTE issue with custom implementation and matching up argument position`
`146`		`- elementType = genericCollectionType.GenericArguments.Single();`
	`146`	`+ elementType = genericCollectionType.GenericArguments.FirstOrDefault();`
`147`	`147`	`return true;`
`148`	`148`	`}`
`149`	`149`
`@@ -160,7 +160,7 @@ public static bool IsCollection(this TypeReference typeReference, out TypeRefere`
`160`	`160`	`return false;`
`161`	`161`
`162`	`162`	`//NOTE issue with custom implementation and matching up argument position`
`163`		`- elementType = genericCollectionType.GenericArguments.Single();`
	`163`	`+ elementType = genericCollectionType.GenericArguments.FirstOrDefault();`
`164`	`164`	`return true;`
`165`	`165`	`}`
`166`	`166`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<%@ Template Language="C#" TargetLanguage="JavaScript" %>`
	`1`	`+<%@ Template Language="C#" TargetLanguage="TypeScript" %>`
`2`	`2`
`3`	`3`
`4`	`4`	`<%@ Assembly Name="CodeSmith.CustomProperties" %>`