Merge branch 'transforms' into transforms-generators

This commit is contained in:
Ron Buckton
2016-06-15 11:04:21 -07:00
6 changed files with 41 additions and 42 deletions

View File

@@ -1575,10 +1575,10 @@ namespace ts {
* @param node The type node.
*/
function getRestParameterElementType(node: TypeNode) {
if (node.kind === SyntaxKind.ArrayType) {
if (node && node.kind === SyntaxKind.ArrayType) {
return (<ArrayTypeNode>node).elementType;
}
else if (node.kind === SyntaxKind.TypeReference) {
else if (node && node.kind === SyntaxKind.TypeReference) {
return singleOrUndefined((<TypeReferenceNode>node).typeArguments);
}
else {
@@ -1623,6 +1623,9 @@ namespace ts {
if (isFunctionLike(node) && node.type) {
return serializeTypeNode(node.type);
}
else if (isAsyncFunctionLike(node)) {
return createIdentifier("Promise");
}
return createVoidZero();
}