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 master into release-2.1 #12440

Merged
merged 61 commits into from
Nov 22, 2016
Merged

Merge master into release-2.1 #12440

merged 61 commits into from
Nov 22, 2016

Conversation

mhegazy
Copy link
Contributor

@mhegazy mhegazy commented Nov 22, 2016

Ports #12425

And changes to tslint, rwc as well.

sandersn and others added 30 commits November 11, 2016 15:58
Fix functions that were unused (getJsDocComments), redundant (append) or badly named
(getJSDocCommentsFromText)
1. Get rid of parent check.
2. Use a couple of nested functions, one of them a recursive worker.
And delete its near-duplicate which was much less correct. The callers
that had to switch are slightly more complex and more correct now.
Cache only uses one property now. getJSDocs isn't generic and doesn't
take a function parameter any more. The code is overall easier to read.
Codegen: Do not subtract 0 in arguments to rest array loop
That is, without --noImplicitAny
Higher order type relations for mapped types
Fixes for #12291 and  #12326: Declaration emit when there are errors in the source file
…implicit-any

Disable evolving types with implicit any
vladima and others added 26 commits November 19, 2016 10:58
Minor fixes for 'keyof T' and indexed acces types
* add locale options to tsserver

* make sys an argument

* fix mistakes and address code review
recompute character to column when comparing indentations
Make "exclude" default to empty if "include" is present.
Change 'keyof T' to always be string-like
@mhegazy mhegazy merged commit 77613eb into release-2.1 Nov 22, 2016
@mhegazy mhegazy deleted the mergeMaster11222016 branch November 22, 2016 18:59
@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.

9 participants