maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix function name

Browse source
This commit is contained in:
Mohamed Hegazy 2016-11-29 00:13:04 -08:00
parent f2e30f6693
commit 5c10764d9b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/compiler/checker.ts
View file

@ -3098,7 +3098,7 @@ namespace ts {
let type: Type; let type: Type;
if (pattern.kind === SyntaxKind.ObjectBindingPattern) { if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
if (declaration.dotDotDotToken) { if (declaration.dotDotDotToken) {
if (isInvalidValidSpreadType(parentType)) { if (isInvalidSpreadType(parentType)) {
error(declaration, Diagnostics.Rest_types_may_only_be_created_from_object_types); error(declaration, Diagnostics.Rest_types_may_only_be_created_from_object_types);
return unknownType; return unknownType;
} }
@ -11449,7 +11449,7 @@ namespace ts {
typeFlags = 0; typeFlags = 0;
} }
const type = checkExpression((memberDecl as SpreadAssignment).expression); const type = checkExpression((memberDecl as SpreadAssignment).expression);
if (!(type.flags & TypeFlags.Any) && isInvalidValidSpreadType(type)) { if (!(type.flags & TypeFlags.Any) && isInvalidSpreadType(type)) {
error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types); error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types);
return unknownType; return unknownType;
} }
@ -11527,12 +11527,12 @@ namespace ts {
} }
} }
function isInvalidValidSpreadType(type: Type): boolean { function isInvalidSpreadType(type: Type): boolean {
if (type.flags & TypeFlags.Object) { if (type.flags & TypeFlags.Object) {
return isGenericMappedType(type); return isGenericMappedType(type);
} }
else if (type.flags & TypeFlags.UnionOrIntersection) { else if (type.flags & TypeFlags.UnionOrIntersection) {
return forEach((<UnionOrIntersectionType>type).types, isInvalidValidSpreadType); return forEach((<UnionOrIntersectionType>type).types, isInvalidSpreadType);
} }
return true; return true;
} }