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.

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

Jump to bottom

Merge master 12/12 #12864

Merged
merged 88 commits into from
Dec 13, 2016
Merged

Merge master 12/12 #12864

merged 88 commits into from
Dec 13, 2016

Conversation

mhegazy
Copy link
Contributor

@mhegazy mhegazy commented Dec 12, 2016

Ports:

jramsay and others added 30 commits November 14, 2016 13:31
@jramsay
tsconfig.json mixed content support
da7f824
@anubmat
Add parameter type in function support comments for JS files
c970c78
@jramsay
tsconfig.json mixed content support
7dd30db
@jramsay
Merge branch 'master' into tsconfigMixedContentSupport
891173c
@jramsay
Merge branch 'master' into tsconfigMixedContentSupportRedux
464bc0e
@jramsay
Merge branch 'tsconfigMixedContentSupportRedux' into tsconfigMixedCon…
12971d2 
…tentSupport
@chicoxyzzy
Add Node.js 6 LTS to CI
41057d3
@chicoxyzzy
Drop unmaintained versions of Node.js from package.json
1c2ad3e
@sandersn
Test that sub-subclass can access protected ctor
e3fb305
@sandersn
Sub-subclasses can access protected constructor
b321d50
@vladima
use XDG base directory compatible cache location (#12676)
225d6d6 
* use XDG base directory compatible cache location

* use ~/Library/Caches on darwin
@aluanhaddad
Add ReadonlyArray<T>.includes to es2016.array.include.d.ts
ee08943
@sandersn
Merge pull request #12680 from aluanhaddad/12678
8f2d531 
Add ReadonlyArray<T>.includes to es2016.array.include.d.ts
@rbuckton
Add error for super property before super
f89156b
@rbuckton
Added more specific diagnostic message
9336886
@rbuckton
Updated baseline
e8024e4
@rbuckton
Merge pull request #12690 from Microsoft/fix12669
847b42d 
Add error for super property before super
@sheetalkamat
Write property name of destructuring pattern explicitly
7d049c2 
There wont be any symbol for the property name but we already know it is a property name
Fixes #12166
@sheetalkamat
Merge pull request #12691 from Microsoft/displayPartKind
2a65f5b 
Write property name of destructuring pattern explicitly when writing symbol display for binding element
@mhegazy
Update authors
3db1421
@mhegazy
Add authors from https://github.com/Microsoft/TSJS-lib-generator/blob…
7b10296 
…/master/AUTHORS.md
@mhegazy
Add empty types list to tsconfig.json
3d2a553
@ahejlsberg
Defer indexed access T[K] where T is generic and K is non-generic
671f7a8
@ahejlsberg
Add tests
d7908d1
@ahejlsberg
Accept new baselines
d3ea738
@mhegazy
Merge pull request #12695 from Microsoft/AddEmptyTypes
4e9bc69 
Add empty `types` list to tsconfig.json
@vladima
remove projects that were no present in the input list in openExterna…
c1ec7ef 
…lProjects (#12699)

remove projects that were no present in the input list in openExternalProjects
@anubmat
Merge remote-tracking branch 'origin/master' into correctCommentsScaf…
942c3c6 
…folding
Reuse code from convertJsonOptionOfCustomType
efa8c41
Merge pull request #12708 from Microsoft/convert_json_option
7b1fc21 
Reuse code from convertJsonOptionOfCustomType
jramsay and others added 24 commits December 9, 2016 13:36
@jramsay
Rename fileExtensionMap: fileExtensionMapItem[] to extraFileExtension…
05160ca 
…s: FileExtensionInfo[]
@vladima
mark containing project as dirty when file is closed (#12789)
798d080 
* mark containing project as dirty when file is closed

* remove debugger statement
@jramsay
Merge branch 'master' into tsconfigMixedContentSupport
30bd841
@jramsay
use localUse local updatedFileNames - this way we'll know that set of…
5829ca8 
… names is definitely cleared
@jramsay
getSupportedExtensions optimization to reduce allocations
c40508c
@jramsay
Merge pull request #12153 from Microsoft/tsconfigMixedContentSupport
f27fe0d 
Adding tsconfig.json mixed content (script block) support
@ahejlsberg
Pick<T, K> and similar mapped types propagate modifiers from T
33b5125
@ahejlsberg
Modify tests
7e974fa
@ahejlsberg
Accept new baselines
00f7d85
@ahejlsberg
Add test to verify use of Pick<T, K> with setState
7fdfcf1
@ahejlsberg
Merge pull request #12770 from Microsoft/deferIndexedAccess
57cb4ac 
Defer indexed access T[K] with non-generic K
@ahejlsberg
Merge pull request #12826 from Microsoft/mappedTypeModifiers2
7c5c664 
Improve propagation of modifiers in mapped types
@ahejlsberg
Additional tweak to mapped type property modifier propagation
5229176
@ahejlsberg
Add more tests
cedc53e
@ahejlsberg
Accept new baselines
4898b9e
Produce an error for an augmentation of an untyped module even if `mo…
83eddb5 
…duleNotFoundError` is not defined
@mhegazy
Merge pull request #12591 from chicoxyzzy/add_node6_to_ci
23ec976 
Add node6 to ci
@vladima
guard against visiting the same symbol table multiple times (#12818)
a604d84
@vladima
create new lexical environment for the body of converted loop (#12831)
496a14a
@sandersn
Merge pull request #12808 from Microsoft/self-referencing-spread-recu…
65bb78d 
…rsive-loop

Self-referencing spread recursive loop
Merge pull request #12852 from Microsoft/untyped_augmentation_2
a33e653 
Produce an error for an augmentation of an untyped module even if `moduleNotFoundError` is not defined
@vladima
elaborate check before converting fresh literal type to regular (#12595)
d050673
@ahejlsberg
Merge pull request #12843 from Microsoft/mappedTypeModifiers3
055c0af 
Additional tweak to mapped type property modifier propagation
@mhegazy
Merge branch 'master' into release-2.1
d9a2cf3
@mhegazy mhegazy changed the title Merge master1212 Merge master 12/12 Dec 12, 2016
@mhegazy mhegazy mentioned this pull request Dec 13, 2016
Merged
@mhegazy mhegazy merged commit 2f6ff9b into release-2.1 Dec 13, 2016
@mhegazy mhegazy deleted the mergeMaster1212 branch December 13, 2016 00:13
@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.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.