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

Address review comments

Browse source
This commit is contained in:
Nathan Shively-Sanders 2015-12-10 13:47:18 -08:00
parent 6ed5b59f75
commit cc1d8cf395
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/compiler/checker.ts
View file

@ -5757,15 +5757,17 @@ namespace ts {
}
function enumRelatedTo(source: Type, target: Type) {
if (source.symbol.name !== target.symbol.name) {
if (source.symbol.name !== target.symbol.name ||
source.symbol.flags & SymbolFlags.ConstEnum ||
target.symbol.flags & SymbolFlags.ConstEnum) {
return Ternary.False;
}
const sourceDecl = <EnumDeclaration>getMergedSymbol(source.symbol).valueDeclaration;
const targetDecl = <EnumDeclaration>getMergedSymbol(target.symbol).valueDeclaration;
const sourceDecl = <EnumDeclaration>getDeclarationOfKind(source.symbol, SyntaxKind.EnumDeclaration);
const targetDecl = <EnumDeclaration>getDeclarationOfKind(target.symbol, SyntaxKind.EnumDeclaration);
const targetMembers = arrayToMap(targetDecl.members, member => getTextOfPropertyName(<PropertyName>member.name));
for (const member of sourceDecl.members) {
const name = getTextOfPropertyName(<PropertyName>member.name);
if (!targetMembers[name]) {
if (!hasProperty(targetMembers, name)) {
reportError(Diagnostics.Property_0_is_missing_in_type_1,
name,
typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType));