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

Filter for enum members only.

Browse source
This commit is contained in:
Nathan Shively-Sanders 2015-12-11 09:56:13 -08:00
parent da8e19e191
commit 8202576ab2
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/compiler/checker.ts
View file

@ -5762,10 +5762,8 @@ namespace ts {
target.symbol.flags & SymbolFlags.ConstEnum) {
return Ternary.False;
}
const sourceMembers = resolveStructuredTypeMembers(getTypeOfSymbol(source.symbol)).properties;
const targetMembers = resolveStructuredTypeMembers(getTypeOfSymbol(target.symbol)).properties;
const targetNames = arrayToMap(targetMembers, member => member.name);
for (const member of sourceMembers) {
const targetNames = arrayToMap(getEnumMembersOfEnumType(target), member => member.name);
for (const member of getEnumMembersOfEnumType(source)) {
if (!hasProperty(targetNames, member.name)) {
reportError(Diagnostics.Property_0_is_missing_in_type_1,
member.name,
@ -5775,6 +5773,11 @@ namespace ts {
}
return Ternary.True;
}
function getEnumMembersOfEnumType(type: Type) {
return filter(resolveStructuredTypeMembers(getTypeOfSymbol(type.symbol)).properties,
property => !!(property.flags & SymbolFlags.EnumMember));
}
}
// Return true if the given type is part of a deeply nested chain of generic instantiations. We consider this to be the case