Skip to content

Commit 6b27eaf

Browse files
committed
Merge branch 'master' of https://github.com/SaschaNaz/TypeScript into shorterParamListIndentFix
2 parents 2fc9c73 + 3202d59 commit 6b27eaf

File tree

1,205 files changed

+41845
-45793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,205 files changed

+41845
-45793
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ tests/baselines/reference/projectOutput/*
1717
tests/baselines/local/projectOutput/*
1818
tests/services/baselines/prototyping/local/*
1919
tests/services/browser/typescriptServices.js
20+
scripts/authors.js
2021
scripts/configureNightly.js
2122
scripts/processDiagnosticMessages.d.ts
2223
scripts/processDiagnosticMessages.js
@@ -50,3 +51,4 @@ internal/
5051
!**/.vscode/tasks.json
5152
!tests/cases/projects/projectOption/**/node_modules
5253
!tests/cases/projects/NodeModulesSearch/**/*
54+
!tests/baselines/reference/project/nodeModules*/**/*

.mailmap

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+

2+
Alexander <alexander@kuvaev.me># Alexander Kuvaev
3+
AbubakerB <abubaker_bashir@hotmail.com> # Abubaker Bashir
4+
Adam Freidin <adam.freidin@gmail.com> Adam Freidin <afreidin@adobe.com>
5+
Adi Dahiya <adahiya@palantir.com> Adi Dahiya <adi.dahiya14@gmail.com>
6+
Ahmad Farid <ahfarid@microsoft.com> ahmad-farid <ahfarid@microsoft.com>
7+
Alex Eagle <alexeagle@google.com>
8+
Anders Hejlsberg <andersh@microsoft.com> unknown <andersh@AndersX1.NOE.Nokia.com> unknown <andersh@andersh-yoga.redmond.corp.microsoft.com>
9+
Andrew Z Allen <me@andrewzallen.com>
10+
Andy Hanson <anhans@microsoft.com> Andy <anhans@microsoft.com>
11+
Anil Anar <anilanar@hotmail.com>
12+
Anton Tolmachev <myste@mail.ru>
13+
Arnavion <arnavion@gmail.com> # Arnav Singh
14+
Arthur Ozga <aozgaa@umich.edu> Arthur Ozga <t-arthoz@microsoft.com>
15+
Asad Saeeduddin <masaeedu@gmail.com>
16+
Schmavery <avery.schmavery@gmail.com> # Avery Morin
17+
Basarat Ali Syed <basaratali@gmail.com> Basarat Syed <basaratali@gmail.com> basarat <basaratali@gmail.com>
18+
Bill Ticehurst <billti@hotmail.com> Bill Ticehurst <billti@microsoft.com>
19+
Ben Duffield <jebavarde@gmail.com>
20+
Blake Embrey <hello@blakeembrey.com>
21+
Bowden Kelly <wilkelly@microsoft.com>
22+
Brett Mayen <bmayen@midnightsnacks.net>
23+
Bryan Forbes <bryan@reigndropsfall.net>
24+
Caitlin Potter <caitpotter88@gmail.com>
25+
ChrisBubernak <chris.bubernak@gmail.com> unknown <chrbub@chrbub1.redmond.corp.microsoft.com> # Chris Bubernak
26+
Chuck Jazdzewski <chuckj@google.com>
27+
Colby Russell <mr@colbyrussell.com>
28+
Colin Snover <github.com@zetafleet.com>
29+
Cyrus Najmabadi <cyrusn@microsoft.com> CyrusNajmabadi <cyrusn@microsoft.com> unknown <cyrusn@cylap.ntdev.corp.microsoft.com>
30+
Dan Corder <dev@dancorder.com>
31+
Dan Quirk <danquirk@microsoft.com> Dan Quirk <danquirk@users.noreply.github.com> nknown <danquirk@DANQUIRK1.redmond.corp.microsoft.com>
32+
Daniel Rosenwasser <drosen@microsoft.com> Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> Daniel Rosenwasser <DanielRosenwasser@gmail.com> Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com> Daniel Rosenwasser <DanielRosenwasser@microsoft.com>
33+
David Li <jiawei.davidli@gmail.com>
34+
David Souther <davidsouther@gmail.com>
35+
Denis Nedelyaev <denvned@gmail.com>
36+
Dick van den Brink <d_vandenbrink@outlook.com> unknown <d_vandenbrink@outlook.com> unknown <d_vandenbrink@live.com>
37+
Dirk Baeumer <dirkb@microsoft.com> Dirk Bäumer <dirkb@microsoft.com> # Dirk Bäumer
38+
Dirk Holtwick <dirk.holtwick@gmail.com>
39+
Doug Ilijev <dilijev@users.noreply.github.com>
40+
Erik Edrosa <erik.edrosa@gmail.com>
41+
Ethan Rubio <ethanrubio@users.noreply.github.com>
42+
Evan Martin <martine@danga.com>
43+
Evan Sebastian <evanlhoini@gmail.com>
44+
Eyas <eyas.sharaiha@gmail.com> # Eyas Sharaiha
45+
falsandtru <falsandtru@users.noreply.github.com> # @falsandtru
46+
Frank Wallis <fwallis@outlook.com>
47+
František Žiačik <fziacik@gratex.com> František Žiačik <ziacik@gmail.com>
48+
Gabriel Isenberg <gisenberg@gmail.com>
49+
Gilad Peleg <giladp007@gmail.com>
50+
Graeme Wicksted <graeme.wicksted@gmail.com>
51+
Guillaume Salles <guillaume.salles@me.com>
52+
Guy Bedford <guybedford@gmail.com> guybedford <guybedford@gmail.com>
53+
Harald Niesche <harald@niesche.de>
54+
Iain Monro <iain.monro@softwire.com>
55+
Ingvar Stepanyan <me@rreverser.com>
56+
impinball <impinball@gmail.com> # Isiah Meadows
57+
Ivo Gabe de Wolff <ivogabe@ivogabe.nl>
58+
James Whitney <james@whitney.io>
59+
Jason Freeman <jfreeman@microsoft.com> Jason Freeman <JsonFreeman@users.noreply.github.com>
60+
Jason Killian <jkillian@palantir.com>
61+
Jason Ramsay <jasonra@microsoft.com> jramsay <jramsay@users.noreply.github.com>
62+
Jed Mao <jed.hunsaker@gmail.com>
63+
Jeffrey Morlan <jmmorlan@sonic.net>
64+
tobisek <jiri@wix.com> # Jiri Tobisek
65+
Johannes Rieken <jrieken@microsoft.com>
66+
John Vilk <jvilk@cs.umass.edu>
67+
jbondc <jbondc@gdesolutions.com> jbondc <jbondc@golnetwork.com> jbondc <jbondc@openmv.com> # Jonathan Bond-Caron
68+
Jonathan Park <jpark@daptiv.com>
69+
Jonathan Turner <jont@microsoft.com> Jonathan Turner <probata@hotmail.com>
70+
Jonathan Toland <toland@dnalot.com>
71+
Jesse Schalken <me@jesseschalken.com>
72+
Josh Kalderimis <josh.kalderimis@gmail.com>
73+
Josh Soref <jsoref@users.noreply.github.com>
74+
Juan Luis Boya García <ntrrgc@gmail.com>
75+
Julian Williams <julianjw92@gmail.com>
76+
Herrington Darkholme <nonamesheep1@gmail.com>
77+
Kagami Sascha Rosylight <saschanaz@outlook.com> SaschaNaz <saschanaz@outlook.com>
78+
Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui <yuit@users.noreply.github.com>
79+
Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui T <yuisu@microsoft.com>
80+
Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui <yuit@users.noreply.github.com>
81+
Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui <yuisu@microsoft.com>
82+
Kanchalai Tanglertsampan <yuisu@microsoft.com> yui T <yuisu@microsoft.com>
83+
Keith Mashinter <kmashint@yahoo.com> kmashint <kmashint@yahoo.com>
84+
Ken Howard <ken@simplicatedweb.com>
85+
kimamula <kenji.imamula@gmail.com> # Kenji Imamula
86+
Kyle Kelley <rgbkrk@gmail.com>
87+
Lorant Pinter <lorant.pinter@prezi.com>
88+
Lucien Greathouse <me@lpghatguy.com>
89+
Martin Vseticka <vseticka.martin@gmail.com> Martin Všeticka <vseticka.martin@gmail.com> MartyIX <vseticka.martin@gmail.com>
90+
vvakame <vvakame+dev@gmail.com> # Masahiro Wakame
91+
Matt McCutchen <rmccutch@mit.edu>
92+
Max Deepfield <maxdeepfield@absolutefreakout.com>
93+
Micah Zoltu <micah@zoltu.net>
94+
Mohamed Hegazy <mhegazy@microsoft.com>
95+
Nathan Shively-Sanders <nathansa@microsoft.com>
96+
Nathan Yee <ny.nathan.yee@gmail.com>
97+
Nima Zahedi <nima.zahedee@gmail.com>
98+
Noj Vek <nojvek@gmail.com>
99+
mihailik <mihailik@gmail.com> # Oleg Mihailik
100+
Oleksandr Chekhovskyi <oleksandr.chekhovskyi@hansoft.com>
101+
Paul van Brenk <paul.van.brenk@microsoft.com> Paul van Brenk <paul.van.brenk@outlook.com> unknown <paul.van.brenk@microsoft.com> unknown <paul.van.brenk@microsoft.com> unknown <pvanbren@pvbvsproai.redmond.corp.microsoft.com>
102+
Oskar Segersva¨rd <oskar.segersvard@widespace.com>
103+
pcan <piero.cangianiello@gmail.com> # Piero Cangianiello
104+
pcbro <2bux89+dk3zspjmuh16o@sharklasers.com> # @pcbro
105+
Pedro Maltez <pedro@pedro.ac> # Pedro Maltez
106+
piloopin <piloopin@gmail.com> # @piloopin
107+
milkisevil <philip@milkisevil.com> # Philip Bulley
108+
progre <djyayutto@gmail.com> # @progre
109+
Prayag Verma <prayag.verma@gmail.com>
110+
Punya Biswal <pbiswal@palantir.com>
111+
Rado Kirov <radokirov@google.com>
112+
Ron Buckton <rbuckton@microsoft.com> Ron Buckton <ron.buckton@microsoft.com>
113+
Richard Knoll <riknoll@users.noreply.github.com> Richard Knoll <riknoll@microsoft.com>
114+
Rowan Wyborn <rwyborn@internode.on.net>
115+
Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com> Ryan Cavanaugh <ryan.cavanaugh@microsoft.com> Ryan Cavanaugh <ryanca@microsoft.com>
116+
Ryohei Ikegami <iofg2100@gmail.com>
117+
Sarangan Rajamanickam <sarajama@microsoft.com>
118+
Sébastien Arod <sebastien.arod@gmail.com>
119+
Sheetal Nandi <shkamat@microsoft.com>
120+
Shengping Zhong <zhongsp@users.noreply.github.com>
121+
shyyko.serhiy@gmail.com <shyyko.serhiy@gmail.com> # Shyyko Serhiy
122+
Simon Hürlimann <simon.huerlimann@cyt.ch>
123+
Solal Pirelli <solal.pirelli@gmail.com>
124+
Stan Thomas <stmsdn@norvil.net>
125+
Stanislav Sysoev <d4rkr00t@gmail.com>
126+
Steve Lucco <steveluc@users.noreply.github.com> steveluc <steveluc@microsoft.com>
127+
Tarik <tarik@pushmote.com> # Tarik Ozket
128+
Tetsuharu OHZEKI <saneyuki.snyk@gmail.com> # Tetsuharu Ohzeki
129+
Tien Nguyen <tihoanh@microsoft.com> tien <hoanhtien@users.noreply.github.com> unknown <tihoanh@microsoft.com> #Tien Hoanhtien
130+
Tim Perry <pimterry@gmail.com>
131+
Tim Viiding-Spader <viispade@users.noreply.github.com>
132+
Tingan Ho <tingan87@gmail.com>
133+
togru <v3nomzxgt8@gmail.com> # togru
134+
Tomas Grubliauskas <tgrubliauskas@gmail.com>
135+
ToddThomson <achilles@telus.net> # Todd Thomson
136+
TruongSinh Tran-Nguyen <i@truongsinh.pro>
137+
vilicvane <i@vilic.info> # Vilic Vane
138+
Vladimir Matveev <vladima@microsoft.com> vladima <vladima@microsoft.com> v2m <desco.by@gmail.com>
139+
Wesley Wigham <t-weswig@microsoft.com> Wesley Wigham <wwigham@gmail.com>
140+
York Yao <plantain-00@users.noreply.github.com> york yao <yaoao12306@outlook.com> yaoyao <yaoyao12306@163.com>
141+
Yuichi Nukiyama <oscar.wilde84@hotmail.co.jp> YuichiNukiyama <oscar.wilde84@hotmail.co.jp>
142+
Zev Spitz <shivisi@etrog.net.il>
143+
Zhengbo Li <zhengbli@microsoft.com> zhengbli <zhengbli@microsoft.com> Zhengbo Li <Zhengbo Li> Zhengbo Li <zhengbli@mirosoft.com> tinza123 <li.zhengbo@outlook.com> unknown <zhengbli@zhengblit430.redmond.corp.microsoft.com> Zhengbo Li <Zhengbo Li>
144+
zhongsp <patrick.zhongsp@gmail.com> # Patrick Zhong
145+
T18970237136 <T18970237136@users.noreply.github.com> # @T18970237136
146+
JBerger <JBerger@melco.com>

.travis.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,34 @@ node_js:
66
- '0.10'
77

88
sudo: false
9+
10+
env:
11+
- workerCount=3
12+
13+
matrix:
14+
fast_finish: true
15+
include:
16+
- os: osx
17+
node_js: stable
18+
osx_image: xcode7.3
19+
env: workerCount=2
20+
allow_failures:
21+
- os: osx
22+
23+
branches:
24+
only:
25+
- master
26+
- transforms
27+
28+
install:
29+
- npm uninstall typescript
30+
- npm uninstall tslint
31+
- npm install
32+
- npm update
33+
34+
cache:
35+
directories:
36+
- node_modules
37+
38+
git:
39+
depth: 1

AUTHORS.md

Lines changed: 73 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,141 @@
11
TypeScript is authored by:
2-
2+
* Abubaker Bashir
33
* Adam Freidin
4-
* Ahmad Farid
5-
* Akshar Patel
4+
* Adi Dahiya
5+
* Ahmad Farid
6+
* Alex Eagle
7+
* Alexander Kuvaev
68
* Anders Hejlsberg
9+
* Andrew Z Allen
10+
* Andy Hanson
11+
* Anil Anar
12+
* Anton Tolmachev
713
* Arnav Singh
814
* Arthur Ozga
915
* Asad Saeeduddin
10-
* Basarat Ali Syed
16+
* Avery Morin
17+
* Basarat Ali Syed
1118
* Ben Duffield
12-
* Bill Ticehurst
19+
* Bill Ticehurst
20+
* Blake Embrey
21+
* Bowden Kelly
1322
* Brett Mayen
14-
* Bryan Forbes
15-
* Caitlin Potter
23+
* Bryan Forbes
24+
* Caitlin Potter
1625
* Chris Bubernak
17-
* Colby Russell
26+
* Chuck Jazdzewski
27+
* Colby Russell
1828
* Colin Snover
1929
* Cyrus Najmabadi
2030
* Dan Corder
21-
* Dan Quirk
31+
* Dan Quirk
2232
* Daniel Rosenwasser
23-
* @dashaus
24-
* David Li
33+
* David Li
34+
* David Souther
2535
* Denis Nedelyaev
2636
* Dick van den Brink
2737
* Dirk Bäumer
2838
* Dirk Holtwick
39+
* Doug Ilijev
40+
* Erik Edrosa
41+
* Ethan Rubio
42+
* Evan Martin
43+
* Evan Sebastian
2944
* Eyas Sharaiha
3045
* @falsandtru
31-
* Frank Wallis
46+
* Frank Wallis
47+
* František Žiačik
3248
* Gabriel Isenberg
33-
* Gilad Peleg
49+
* Gilad Peleg
3450
* Graeme Wicksted
35-
* Guillaume Salles
51+
* Guillaume Salles
3652
* Guy Bedford
3753
* Harald Niesche
54+
* Herrington Darkholme
3855
* Iain Monro
3956
* Ingvar Stepanyan
40-
* Ivo Gabe de Wolff
41-
* James Whitney
57+
* Isiah Meadows
58+
* Ivo Gabe de Wolff
59+
* James Whitney
4260
* Jason Freeman
4361
* Jason Killian
44-
* Jason Ramsay
62+
* Jason Ramsay
63+
* JBerger
4564
* Jed Mao
4665
* Jeffrey Morlan
47-
* Johannes Rieken
66+
* Jesse Schalken
67+
* Jiri Tobisek
68+
* Johannes Rieken
4869
* John Vilk
4970
* Jonathan Bond-Caron
5071
* Jonathan Park
72+
* Jonathan Toland
5173
* Jonathan Turner
52-
* Jonathon Smith
5374
* Josh Kalderimis
75+
* Josh Soref
76+
* Juan Luis Boya García
5477
* Julian Williams
5578
* Kagami Sascha Rosylight
79+
* Kanchalai Tanglertsampan
5680
* Keith Mashinter
5781
* Ken Howard
5882
* Kenji Imamula
59-
* Lorant Pinter
83+
* Kyle Kelley
84+
* Lorant Pinter
6085
* Lucien Greathouse
61-
* Martin Všetička
86+
* Martin Vseticka
6287
* Masahiro Wakame
63-
* Mattias Buelens
88+
* Matt McCutchen
6489
* Max Deepfield
65-
* Micah Zoltu
66-
* Mohamed Hegazy
90+
* Micah Zoltu
91+
* Mohamed Hegazy
6792
* Nathan Shively-Sanders
6893
* Nathan Yee
94+
* Nima Zahedi
95+
* Noj Vek
6996
* Oleg Mihailik
70-
* Oleksandr Chekhovskyi
71-
* Paul van Brenk
97+
* Oleksandr Chekhovskyi
98+
* Oskar Segersva¨rd
99+
* Patrick Zhong
100+
* Paul van Brenk
72101
* @pcbro
73-
* Pedro Maltez
102+
* Pedro Maltez
74103
* Philip Bulley
75-
* piloopin
104+
* Piero Cangianiello
105+
* @piloopin
106+
* Prayag Verma
76107
* @progre
77108
* Punya Biswal
78-
* Richard Sentino
79-
* Ron Buckton
109+
* Rado Kirov
110+
* Richard Knoll
111+
* Ron Buckton
80112
* Rowan Wyborn
81-
* Ryan Cavanaugh
113+
* Ryan Cavanaugh
82114
* Ryohei Ikegami
83-
* Sébastien Arod
115+
* Sarangan Rajamanickam
84116
* Sheetal Nandi
85117
* Shengping Zhong
86118
* Shyyko Serhiy
87119
* Simon Hürlimann
88120
* Solal Pirelli
89121
* Stan Thomas
122+
* Stanislav Sysoev
90123
* Steve Lucco
91-
* Thomas Loubiou
124+
* Sébastien Arod
125+
* @T18970237136
126+
* Tarik Ozket
92127
* Tien Hoanhtien
93128
* Tim Perry
129+
* Tim Viiding-Spader
94130
* Tingan Ho
131+
* Todd Thomson
95132
* togru
96133
* Tomas Grubliauskas
97134
* TruongSinh Tran-Nguyen
98-
* Viliv Vane
135+
* Vilic Vane
99136
* Vladimir Matveev
100137
* Wesley Wigham
101138
* York Yao
102-
* Yui Tanglertsampan
103139
* Yuichi Nukiyama
104-
* Zev Spitz
105-
* Zhengbo Li
140+
* Zev Spitz
141+
* Zhengbo Li

0 commit comments

Comments
 (0)