Skip to content
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.

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

Instance of else clause #5092

Merged
merged 2 commits into from
Nov 7, 2015
Merged

Conversation

tinganho
Copy link
Contributor

@tinganho tinganho commented Oct 3, 2015

Fixes #1719.

@@ -5976,6 +5977,13 @@ namespace ts {
}

if (targetType) {
if (!assumeTrue) {
if (type.flags & TypeFlags.Union) {
return getUnionType(filter((<UnionType>type).types, t => !isTypeSubtypeOf(t, targetType)));
Copy link
Member

Choose a reason for hiding this comment

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

@RyanCavanaugh what happened with the idea that if the RHS type isn't a subtype of any types in the union, that we just discard the LHS type and take the RHS type? Is that something that we eventually went with?

Copy link
Member

Choose a reason for hiding this comment

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

I don't remember what we decided on that.

@RyanCavanaugh
Copy link
Member

@tinganho can you address the merge conflict?

@RyanCavanaugh
Copy link
Member

What happened to the tsxAttributeResolution9 baselines?

@tinganho tinganho force-pushed the instanceOfElseClause branch from c91c905 to dd54b7a Compare October 6, 2015 11:02
@tinganho
Copy link
Contributor Author

tinganho commented Oct 6, 2015

@RyanCavanaugh I fixed the merge conflict. And tsxAttributeResolution9 doesn't appear as deleted anymore when I rebased my solution.

@RyanCavanaugh
Copy link
Member

@mhegazy good with this?

@DanielRosenwasser
Copy link
Member

👍

@mhegazy
Copy link
Contributor

mhegazy commented Nov 7, 2015

Sorry for the delay. 👍

mhegazy added a commit that referenced this pull request Nov 7, 2015
@mhegazy mhegazy merged commit c3df289 into microsoft:master Nov 7, 2015
@mhegazy
Copy link
Contributor

mhegazy commented Nov 7, 2015

thanks!

@tinganho
Copy link
Contributor Author

tinganho commented Nov 8, 2015

👍

@microsoft microsoft locked and limited conversation to collaborators Jun 19, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants