microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-30 01:04:49 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Update baselines and fix failure when merged with master (#9172)

Browse Source
This commit is contained in:
Yui
2016-06-15 11:02:29 -07:00
committed by GitHub
parent beb72f4057
commit 03d273ea5c
6 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/transformers/ts.ts
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();
}