Skip to content

do not apply subtype reduction if type set contains enum literals fro… #11368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vladima merged 4 commits into from
Oct 4, 2016
Merged

do not apply subtype reduction if type set contains enum literals fro… #11368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbb5280
do not apply subtype reduction if type set contains enum literals fro…
vladima Oct 4, 2016
7edab1e
do not re-read symbol for the first enum
vladima Oct 4, 2016
0e6c32a
Merge remote-tracking branch 'origin/master' into vladima/do-not-redu…
vladima Oct 4, 2016
8ca5861
addressed PR feedback
vladima Oct 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5446,7 +5446,26 @@ namespace ts {
return false;
}

function isSetOfLiteralsFromSameEnum(types: TypeSet): boolean {
const first = types[0];
if (first.flags & TypeFlags.EnumLiteral) {
const firstEnum = getParentOfSymbol(first.symbol);
for (let i = 1; i < types.length; i++) {
const other = types[i];
if (!(other.flags & TypeFlags.EnumLiteral) || (firstEnum !== getParentOfSymbol(other.symbol))) {
return false;
}
}
Copy link
Copy Markdown
Contributor

@mhegazy mhegazy Oct 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can propably cache this getParentOfSymbol(first.symbol)

return true;
}

return false;
}

function removeSubtypes(types: TypeSet) {
if (types.length === 0 || isSetOfLiteralsFromSameEnum(types)) {
return;
Copy link
Copy Markdown
Member

@ahejlsberg ahejlsberg Oct 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe extract this logic into a separate isSetOfLiteralsFromSameEnum function and call that here. Otherwise, looks good to me.

}
let i = types.length;
while (i > 0) {
i--;
Expand Down
Loading