Skip to content

Commit a1b6260

Browse files
author
Kanchalai Tanglertsampan
committed
Merge branch 'master' into mergemaster_0711
# Conflicts: # src/compiler/checker.ts # src/compiler/commandLineParser.ts # src/compiler/core.ts # src/compiler/diagnosticMessages.json # src/compiler/emitter.ts # src/compiler/parser.ts # src/compiler/program.ts # src/compiler/scanner.ts # src/compiler/sys.ts # src/compiler/tsconfig.json # src/compiler/types.ts # src/compiler/utilities.ts # src/harness/fourslash.ts # src/harness/harness.ts # src/harness/harnessLanguageService.ts # src/harness/loggedIO.ts # src/harness/projectsRunner.ts # src/lib/dom.generated.d.ts # src/lib/webworker.generated.d.ts # src/services/navigationBar.ts # src/services/tsconfig.json # tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js # tests/baselines/reference/transpile/Rename dependencies - System.js # tests/baselines/reference/transpile/Rename dependencies - UMD.js # tests/baselines/reference/transpile/Sets module name.js # tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js # tests/baselines/reference/tsxUnionTypeComponent2.js # tests/cases/fourslash/fourslash.ts # tests/cases/fourslash/referencesInComment.ts # tests/cases/unittests/cachingInServerLSHost.ts # tests/cases/unittests/jsDocParsing.ts # tests/cases/unittests/matchFiles.ts # tests/cases/unittests/transpile.ts
2 parents cfc20a9 + 1d202f6 commit a1b6260

File tree

798 files changed

+39400
-15438
lines changed

Some content is hidden

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

798 files changed

+39400
-15438
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ tests/baselines/local/projectOutput/*
1919
tests/baselines/reference/testresults.tap
2020
tests/services/baselines/prototyping/local/*
2121
tests/services/browser/typescriptServices.js
22+
scripts/authors.js
2223
scripts/configureNightly.js
2324
scripts/processDiagnosticMessages.d.ts
2425
scripts/processDiagnosticMessages.js
@@ -51,3 +52,5 @@ internal/
5152
**/.vscode
5253
!**/.vscode/tasks.json
5354
!tests/cases/projects/projectOption/**/node_modules
55+
!tests/cases/projects/NodeModulesSearch/**/*
56+
!tests/baselines/reference/project/nodeModules*/**/*

‎.mailmap

+146
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+

2+
Alexander <[email protected]># Alexander Kuvaev
3+
AbubakerB <[email protected]> # Abubaker Bashir
4+
Adam Freidin <[email protected]> Adam Freidin <[email protected]>
5+
Adi Dahiya <[email protected]> Adi Dahiya <[email protected]>
6+
Ahmad Farid <[email protected]> ahmad-farid <[email protected]>
7+
Alex Eagle <[email protected]>
8+
Anders Hejlsberg <[email protected]> unknown <[email protected]> unknown <[email protected]>
9+
Andrew Z Allen <[email protected]>
10+
Andy Hanson <[email protected]> Andy <[email protected]>
11+
Anil Anar <[email protected]>
12+
Anton Tolmachev <[email protected]>
13+
Arnavion <[email protected]> # Arnav Singh
14+
Arthur Ozga <[email protected]> Arthur Ozga <[email protected]>
15+
Asad Saeeduddin <[email protected]>
16+
Schmavery <[email protected]> # Avery Morin
17+
Basarat Ali Syed <[email protected]> Basarat Syed <[email protected]> basarat <[email protected]>
18+
Bill Ticehurst <[email protected]> Bill Ticehurst <[email protected]>
19+
Ben Duffield <[email protected]>
20+
Blake Embrey <[email protected]>
21+
Bowden Kelly <[email protected]>
22+
Brett Mayen <[email protected]>
23+
Bryan Forbes <[email protected]>
24+
Caitlin Potter <[email protected]>
25+
ChrisBubernak <[email protected]> unknown <[email protected]> # Chris Bubernak
26+
Chuck Jazdzewski <[email protected]>
27+
Colby Russell <[email protected]>
28+
Colin Snover <[email protected]>
29+
Cyrus Najmabadi <[email protected]> CyrusNajmabadi <[email protected]> unknown <[email protected]>
30+
Dan Corder <[email protected]>
31+
Dan Quirk <[email protected]> Dan Quirk <[email protected]> nknown <[email protected]>
32+
Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]>
33+
David Li <[email protected]>
34+
David Souther <[email protected]>
35+
Denis Nedelyaev <[email protected]>
36+
Dick van den Brink <[email protected]> unknown <[email protected]> unknown <[email protected]>
37+
Dirk Baeumer <[email protected]> Dirk Bäumer <[email protected]> # Dirk Bäumer
38+
Dirk Holtwick <[email protected]>
39+
Doug Ilijev <[email protected]>
40+
Erik Edrosa <[email protected]>
41+
Ethan Rubio <[email protected]>
42+
Evan Martin <[email protected]>
43+
Evan Sebastian <[email protected]>
44+
Eyas <[email protected]> # Eyas Sharaiha
45+
falsandtru <[email protected]> # @falsandtru
46+
Frank Wallis <[email protected]>
47+
František Žiačik <[email protected]> František Žiačik <[email protected]>
48+
Gabriel Isenberg <[email protected]>
49+
Gilad Peleg <[email protected]>
50+
Graeme Wicksted <[email protected]>
51+
Guillaume Salles <[email protected]>
52+
Guy Bedford <[email protected]> guybedford <[email protected]>
53+
Harald Niesche <[email protected]>
54+
Iain Monro <[email protected]>
55+
Ingvar Stepanyan <[email protected]>
56+
impinball <[email protected]> # Isiah Meadows
57+
Ivo Gabe de Wolff <[email protected]>
58+
James Whitney <[email protected]>
59+
Jason Freeman <[email protected]> Jason Freeman <[email protected]>
60+
Jason Killian <[email protected]>
61+
Jason Ramsay <[email protected]> jramsay <[email protected]>
62+
Jed Mao <[email protected]>
63+
Jeffrey Morlan <[email protected]>
64+
tobisek <[email protected]> # Jiri Tobisek
65+
Johannes Rieken <[email protected]>
66+
John Vilk <[email protected]>
67+
jbondc <[email protected]> jbondc <[email protected]> jbondc <[email protected]> # Jonathan Bond-Caron
68+
Jonathan Park <[email protected]>
69+
Jonathan Turner <[email protected]> Jonathan Turner <[email protected]>
70+
Jonathan Toland <[email protected]>
71+
Jesse Schalken <[email protected]>
72+
Josh Kalderimis <[email protected]>
73+
Josh Soref <[email protected]>
74+
Juan Luis Boya García <[email protected]>
75+
Julian Williams <[email protected]>
76+
Herrington Darkholme <[email protected]>
77+
Kagami Sascha Rosylight <[email protected]> SaschaNaz <[email protected]>
78+
Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
79+
Kanchalai Tanglertsampan <[email protected]> Yui T <[email protected]>
80+
Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
81+
Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
82+
Kanchalai Tanglertsampan <[email protected]> yui T <[email protected]>
83+
Keith Mashinter <[email protected]> kmashint <[email protected]>
84+
Ken Howard <[email protected]>
85+
kimamula <[email protected]> # Kenji Imamula
86+
Kyle Kelley <[email protected]>
87+
Lorant Pinter <[email protected]>
88+
Lucien Greathouse <[email protected]>
89+
Martin Vseticka <[email protected]> Martin Všeticka <[email protected]> MartyIX <[email protected]>
90+
vvakame <[email protected]> # Masahiro Wakame
91+
Matt McCutchen <[email protected]>
92+
Max Deepfield <[email protected]>
93+
Micah Zoltu <[email protected]>
94+
Mohamed Hegazy <[email protected]>
95+
Nathan Shively-Sanders <[email protected]>
96+
Nathan Yee <[email protected]>
97+
Nima Zahedi <[email protected]>
98+
Noj Vek <[email protected]>
99+
mihailik <[email protected]> # Oleg Mihailik
100+
Oleksandr Chekhovskyi <[email protected]>
101+
Paul van Brenk <[email protected]> Paul van Brenk <[email protected]> unknown <[email protected]> unknown <[email protected]> unknown <[email protected]>
102+
Oskar Segersva¨rd <[email protected]>
103+
pcan <[email protected]> # Piero Cangianiello
104+
pcbro <[email protected]> # @pcbro
105+
Pedro Maltez <[email protected]> # Pedro Maltez
106+
piloopin <[email protected]> # @piloopin
107+
milkisevil <[email protected]> # Philip Bulley
108+
progre <[email protected]> # @progre
109+
Prayag Verma <[email protected]>
110+
Punya Biswal <[email protected]>
111+
Rado Kirov <[email protected]>
112+
Ron Buckton <[email protected]> Ron Buckton <[email protected]>
113+
Richard Knoll <[email protected]> Richard Knoll <[email protected]>
114+
Rowan Wyborn <[email protected]>
115+
Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
116+
Ryohei Ikegami <[email protected]>
117+
Sarangan Rajamanickam <[email protected]>
118+
Sébastien Arod <[email protected]>
119+
Sheetal Nandi <[email protected]>
120+
Shengping Zhong <[email protected]>
121+
[email protected] <[email protected]> # Shyyko Serhiy
122+
Simon Hürlimann <[email protected]>
123+
Solal Pirelli <[email protected]>
124+
Stan Thomas <[email protected]>
125+
Stanislav Sysoev <[email protected]>
126+
Steve Lucco <[email protected]> steveluc <[email protected]>
127+
Tarik <[email protected]> # Tarik Ozket
128+
Tetsuharu OHZEKI <[email protected]> # Tetsuharu Ohzeki
129+
Tien Nguyen <[email protected]> tien <[email protected]> unknown <[email protected]> #Tien Hoanhtien
130+
Tim Perry <[email protected]>
131+
Tim Viiding-Spader <[email protected]>
132+
Tingan Ho <[email protected]>
133+
togru <[email protected]> # togru
134+
Tomas Grubliauskas <[email protected]>
135+
ToddThomson <[email protected]> # Todd Thomson
136+
TruongSinh Tran-Nguyen <[email protected]>
137+
vilicvane <[email protected]> # Vilic Vane
138+
Vladimir Matveev <[email protected]> vladima <[email protected]> v2m <[email protected]>
139+
Wesley Wigham <[email protected]> Wesley Wigham <[email protected]>
140+
York Yao <[email protected]> york yao <[email protected]> yaoyao <[email protected]>
141+
Yuichi Nukiyama <[email protected]> YuichiNukiyama <[email protected]>
142+
Zev Spitz <[email protected]>
143+
Zhengbo Li <[email protected]> zhengbli <[email protected]> Zhengbo Li <Zhengbo Li> Zhengbo Li <[email protected]> tinza123 <[email protected]> unknown <[email protected]> Zhengbo Li <Zhengbo Li>
144+
zhongsp <[email protected]> # Patrick Zhong
145+
T18970237136 <[email protected]> # @T18970237136
146+
JBerger <[email protected]>

‎.vscode/tasks.json

+1-20
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// ${cwd}: the current working directory of the spawned process
88
{
99
"version": "0.1.0",
10-
"command": "jake",
10+
"command": "gulp",
1111
"isShellCommand": true,
1212
"showOutput": "silent",
1313
"tasks": [
@@ -18,25 +18,6 @@
1818
"problemMatcher": [
1919
"$tsc"
2020
]
21-
},
22-
{
23-
"taskName": "lint-server",
24-
"args": [],
25-
"problemMatcher": {
26-
"owner": "typescript",
27-
"fileLocation": ["relative", "${workspaceRoot}"],
28-
"pattern": {
29-
"regexp": "^(warning|error)\\s+([^(]+)\\s+\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(.*)$",
30-
"severity": 1,
31-
"file": 2,
32-
"location": 3,
33-
"message": 4
34-
},
35-
"watchedTaskBeginsRegExp": "^\\*\\*\\*Lint failure\\*\\*\\*$",
36-
"watchedTaskEndsRegExp": "^\\*\\*\\* Total \\d+ failures\\.$"
37-
},
38-
"showOutput": "always",
39-
"isWatching": true
4021
}
4122
]
4223
}

‎AUTHORS.md

+73-37
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

‎CONTRIBUTING.md

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ In general, things we find useful when reviewing suggestions are:
4040

4141
# Instructions for Contributing Code
4242

43+
## Code of Conduct
44+
45+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
46+
4347
## Contributing bug fixes
4448

4549
TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.

0 commit comments

Comments
 (0)