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

Fix both new enum assignability predicates

Browse Source 
And update error reporting baseline (new error is less elaborate)
This commit is contained in:
Nathan Shively-Sanders
2016-09-08 15:30:29 -07:00
parent 570433e5a0
commit 5f0ada1164
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/checker.ts
View File

@@ -6234,13 +6234,15 @@ namespace ts {
if (source.flags & TypeFlags.Null && (!strictNullChecks || target.flags & TypeFlags.Null)) return true;
if (relation === assignableRelation || relation === comparableRelation) {
if (source.flags & TypeFlags.Any) return true;
if (source.flags & (TypeFlags.Number | TypeFlags.NumberLiteral) && target.flags & TypeFlags.Enum) return true;
if (source.flags & (TypeFlags.Number | TypeFlags.NumberLiteral) &&
target.flags & TypeFlags.Union &&
forEach((target as UnionType).types, t => t.flags & TypeFlags.EnumLike)) return true;
if (source.flags & (TypeFlags.NumberLiteral | TypeFlags.EnumLiteral) &&
if (source.flags & (TypeFlags.Number | TypeFlags.NumberLiteral) && target.flags & TypeFlags.EnumLike) return true;
if (source.flags & TypeFlags.NumberLiteral && target.flags & TypeFlags.EnumLiteral && (<LiteralType>source).text === (<LiteralType>target).text) return true;
if (source.flags & TypeFlags.EnumLiteral &&
target.flags & TypeFlags.EnumLiteral &&
(<LiteralType>source).text === (<LiteralType>target).text) return true;
(<LiteralType>source).text === (<LiteralType>target).text &&
(<EnumLiteralType>source).baseType.symbol.name === (<EnumLiteralType>target).baseType.symbol.name &&
!isConstEnumSymbol((<EnumLiteralType>source).baseType.symbol) && !isConstEnumSymbol((<EnumLiteralType>target).baseType.symbol)) {
return true;
}
}
return false;
}