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

Merge master1128 #12546

Merged
merged 33 commits into from
Nov 29, 2016
Merged

Merge master1128 #12546

merged 33 commits into from
Nov 29, 2016

Conversation

mhegazy
Copy link
Contributor

@mhegazy mhegazy commented Nov 29, 2016

mariusschulz and others added 30 commits November 19, 2016 22:30
…ation

When __decorator applied to method, the last parameter (descriptor)
is null, not undefined
Make 'keyof T' a literal contextual type
…tDecorationExpression-documentation

doc(compiler/ts): fix documentation typo in generateClassElementDecorationExpression()
Fix issues related to 'keyof' with 'for-in' and 'in' operator
Include mapped types in type inference infinite recursion check
# Conflicts:
#	src/compiler/checker.ts
Removes number from all the keyof types, and adds a test that numeric
indexes are ignored.
Deduplicate intersections before distributing over unions
ahejlsberg and others added 3 commits November 28, 2016 13:30
Type inference for isomorphic mapped types
…pes-with-leading-operator

Union and intersection types with leading operator
@mhegazy mhegazy merged commit 6e2db6c into release-2.1 Nov 29, 2016
@mhegazy mhegazy deleted the mergeMaster1128 branch November 29, 2016 00:44
@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.

6 participants