Skip to content

Commit 084b94c

Browse files
riknollriknoll
committed
Merge branch 'master' into glob2
Conflicts: Jakefile.js src/compiler/commandLineParser.ts src/compiler/core.ts src/compiler/sys.ts src/harness/harness.ts src/server/editorServices.ts src/services/shims.ts tests/cases/unittests/cachingInServerLSHost.ts
2 parents c1205eb + a28501e commit 084b94c

4,836 files changed

Lines changed: 363171 additions & 91912 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ tests/cases/perf/*
66
!tests/cases/webharness/compilerToString.js
77
test-args.txt
88
~*.docx
9+
\#*\#
10+
.\#*
911
tests/baselines/local/*
1012
tests/services/baselines/local/*
1113
tests/baselines/prototyping/local/*
@@ -26,11 +28,13 @@ rwc-report.html
2628
*.swp
2729
build.json
2830
*.actual
31+
tests/webTestServer.js
32+
tests/webTestServer.js.map
2933
tests/webhost/*.d.ts
3034
tests/webhost/webtsc.js
31-
tests/*.js
32-
tests/*.js.map
33-
tests/*.d.ts
35+
tests/cases/**/*.js
36+
tests/cases/**/*.js.map
37+
tests/cases/**/*.d.ts
3438
*.config
3539
scripts/debug.bat
3640
scripts/run.bat
@@ -42,5 +46,6 @@ coverage/
4246
internal/
4347
**/.DS_Store
4448
.settings
45-
.vscode/*
46-
!.vscode/tasks.json
49+
**/.vs
50+
**/.vscode
51+
!**/.vscode/tasks.json

‎.npmignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
built
22
doc
3+
internal
4+
issue_template.md
35
lib/README.md
6+
pull_request_template.md
47
scripts
58
src
69
tests
7-
internal
810
tslint.json
911
Jakefile.js
1012
.editorconfig

‎AUTHORS.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ TypeScript is authored by:
22

33
* Adam Freidin
44
* Ahmad Farid
5+
* Akshar Patel
56
* Anders Hejlsberg
67
* Arnav Singh
78
* Arthur Ozga
9+
* Asad Saeeduddin
810
* Basarat Ali Syed
911
* Ben Duffield
1012
* Bill Ticehurst
@@ -15,52 +17,67 @@ TypeScript is authored by:
1517
* Colby Russell
1618
* Colin Snover
1719
* Cyrus Najmabadi
20+
* Dan Corder
1821
* Dan Quirk
1922
* Daniel Rosenwasser
23+
* @dashaus
2024
* David Li
2125
* Denis Nedelyaev
2226
* Dick van den Brink
2327
* Dirk Bäumer
28+
* Dirk Holtwick
2429
* Eyas Sharaiha
30+
* @falsandtru
2531
* Frank Wallis
2632
* Gabriel Isenberg
2733
* Gilad Peleg
2834
* Graeme Wicksted
2935
* Guillaume Salles
36+
* Guy Bedford
3037
* Harald Niesche
38+
* Iain Monro
3139
* Ingvar Stepanyan
3240
* Ivo Gabe de Wolff
3341
* James Whitney
3442
* Jason Freeman
43+
* Jason Killian
3544
* Jason Ramsay
3645
* Jed Mao
46+
* Jeffrey Morlan
3747
* Johannes Rieken
3848
* John Vilk
3949
* Jonathan Bond-Caron
4050
* Jonathan Park
4151
* Jonathan Turner
52+
* Jonathon Smith
4253
* Josh Kalderimis
4354
* Julian Williams
4455
* Kagami Sascha Rosylight
4556
* Keith Mashinter
4657
* Ken Howard
4758
* Kenji Imamula
4859
* Lorant Pinter
60+
* Lucien Greathouse
4961
* Martin Všetička
5062
* Masahiro Wakame
63+
* Mattias Buelens
5164
* Max Deepfield
5265
* Micah Zoltu
5366
* Mohamed Hegazy
5467
* Nathan Shively-Sanders
68+
* Nathan Yee
5569
* Oleg Mihailik
5670
* Oleksandr Chekhovskyi
5771
* Paul van Brenk
72+
* @pcbro
5873
* Pedro Maltez
5974
* Philip Bulley
6075
* piloopin
6176
* @progre
6277
* Punya Biswal
78+
* Richard Sentino
6379
* Ron Buckton
80+
* Rowan Wyborn
6481
* Ryan Cavanaugh
6582
* Ryohei Ikegami
6683
* Sébastien Arod
@@ -71,7 +88,9 @@ TypeScript is authored by:
7188
* Solal Pirelli
7289
* Stan Thomas
7390
* Steve Lucco
91+
* Thomas Loubiou
7492
* Tien Hoanhtien
93+
* Tim Perry
7594
* Tingan Ho
7695
* togru
7796
* Tomas Grubliauskas
@@ -81,5 +100,6 @@ TypeScript is authored by:
81100
* Wesley Wigham
82101
* York Yao
83102
* Yui Tanglertsampan
103+
* Yuichi Nukiyama
84104
* Zev Spitz
85105
* Zhengbo Li

‎CONTRIBUTING.md‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
# Instructions for Logging Issues
2+
3+
## 1. Read the FAQ
4+
5+
Please [read the FAQ](https://github.com/Microsoft/TypeScript/wiki/FAQ) before logging new issues, even if you think you have found a bug.
6+
7+
Issues that ask questions answered in the FAQ will be closed without elaboration.
8+
9+
## 2. Search for Duplicates
10+
11+
[Search the existing issues](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) before logging a new one.
12+
13+
## 3. Do you have a question?
14+
15+
The issue tracker is for **issues**, in other words, bugs and suggestions.
16+
If you have a *question*, please use [Stack Overflow](http://stackoverflow.com/questions/tagged/typescript), [Gitter](https://gitter.im/Microsoft/TypeScript), your favorite search engine, or other resources.
17+
Due to increased traffic, we can no longer answer questions in the issue tracker.
18+
19+
## 4. Did you find a bug?
20+
21+
When logging a bug, please be sure to include the following:
22+
* What version of TypeScript you're using (run `tsc --v`)
23+
* If at all possible, an *isolated* way to reproduce the behavior
24+
* The behavior you expect to see, and the actual behavior
25+
26+
You can try out the nightly build of TypeScript (`npm install typescript@next`) to see if the bug has already been fixed.
27+
28+
## 5. Do you have a suggestion?
29+
30+
We also accept suggestions in the issue tracker.
31+
Be sure to [check the FAQ](https://github.com/Microsoft/TypeScript/wiki/FAQ) and [search](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) first.
32+
33+
In general, things we find useful when reviewing suggestions are:
34+
* A description of the problem you're trying to solve
35+
* An overview of the suggested solution
36+
* Examples of how the suggestion would work in various places
37+
* Code examples showing e.g. "this would be an error, this wouldn't"
38+
* Code examples showing the generated JavaScript (if applicable)
39+
* If relevant, precedent in other languages can be useful for establishing context and expected behavior
40+
41+
# Instructions for Contributing Code
42+
143
## Contributing bug fixes
244

345
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.
@@ -29,7 +71,7 @@ Your pull request should:
2971
* Tests should include reasonable permutations of the target fix/change
3072
* Include baseline changes with your change
3173
* All changed code must have 100% code coverage
32-
* Follow the code conventions descriped in [Coding guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines)
74+
* Follow the code conventions described in [Coding guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines)
3375
* To avoid line ending issues, set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration
3476

3577
## Contributing `lib.d.ts` fixes

0 commit comments

Comments
 (0)