Skip to content

Commit f83e754

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into ownJsonParsing
2 parents c7744a8 + bfc10ca commit f83e754

460 files changed

Lines changed: 75367 additions & 66700 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.

‎.mailmap‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,45 @@ zhongsp <patrick.zhongsp@gmail.com> # Patrick Zhong
172172
T18970237136 <T18970237136@users.noreply.github.com> # @T18970237136
173173
JBerger <JBerger@melco.com>
174174
bootstraponline <code@bootstraponline.com> # @bootstraponline
175-
yortus <yortus@gmail.com> # @yortus
175+
yortus <yortus@gmail.com> # @yortus
176+
András Parditka <andraaspar@gmail.com>
177+
Anton Khlynovskiy <subzey@gmail.com>
178+
Charly POLY <cpoly55@gmail.com>
179+
Cotton Hou <himcotton@gmail.com>
180+
Ethan Resnick <ethan.resnick@gmail.com>
181+
Marius Schulz <marius.schulz@me.com>
182+
Mattias Buelens <mattias.buelens@gmail.com>
183+
Myles Megyesi <mylesmegyesi@users.noreply.github.com>
184+
Tim Lancina <tim@ionic.io>
185+
Aaron Holmes <aaron@aaronholmes.net> Aaron Holmes <aholmes@bltomato.com>
186+
Akshar Patel <akshar.patel.47@gmail.com>
187+
Ali Sabzevari <alisabzevari@gmail.com>
188+
Aliaksandr Radzivanovich <aradzivanovich@gmail.com>
189+
BuildTools <FranklinWhale@users.noreply.github.com> # Franklin Tse
190+
ChogyDan <danielhollocher@gmail.com> # Daniel Hollocher
191+
Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> Daniel Rosenwasser <drosen@microsoft.com>
192+
David Kmenta <david.kmenta@lmc.eu>
193+
E020873 <nicolas.henry-partner@arcelormittal.com> # Nicolas Henry
194+
Elisée Maurer <elisee@sparklinlabs.com>
195+
Emilio García-Pumarino <emili.tfe@gmail.com> dashaus <emili.tfe@gmail.com>
196+
Guilherme Oenning <me@goenning.net>
197+
Herrington Darkholme <nonamesheep1@gmail.com>
198+
Ivo Gabe de Wolff <ivogabe@ivogabe.nl>
199+
Joey Wilson <joey.wilson.a@gmail.com>
200+
Jonathon Smith <failing@crashdive.co.uk>
201+
Juan Luis Boya García <ntrrgc@gmail.com>
202+
Kagami Sascha Rosylight <saschanaz@outlook.com>
203+
Lucien Greathouse <me@lpghatguy.com>
204+
Martin Vseticka <vseticka.martin@gmail.com>
205+
Mattias Buelens <mattias.buelens@opentelly.com>
206+
Michael Bromley <michael@michaelbromley.co.uk>
207+
Paul Jolly <paul@myitcv.org.uk>
208+
Perry Jiang <jiangperry@gmail.com>
209+
Peter Burns <rictic@google.com>
210+
Robert Coie <rac@intrigue.com>
211+
Thomas Loubiou <t.loubiou@systonic.fr>
212+
Tim Perry <tim.perry@softwire.com>
213+
Vidar Tonaas Fauske <vidartf@gmail.com>
214+
Viktor Zozulyak <zozulyakviktor@gmail.com>
215+
rix <rix@rixs-MacBook-Pro.local> # Richard Sentino
216+
rohitverma007 <rohitverma@live.ca> # Rohit Verma

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: node_js
22

33
node_js:
44
- 'stable'
5+
- '6'
56
- '4'
67

78
sudo: false

‎AUTHORS.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
TypeScript is authored by:
2+
* Aaron Holmes
23
* Abubaker Bashir
34
* Adam Freidin
45
* Adi Dahiya
56
* Ahmad Farid
7+
* Akshar Patel
68
* Alex Eagle
79
* Alexander Kuvaev
810
* Alexander Rusakov
11+
* Ali Sabzevari
12+
* Aliaksandr Radzivanovich
913
* Anatoly Ressin
1014
* Anders Hejlsberg
1115
* Andrej Baran
1216
* Andrew Z Allen
17+
* András Parditka
1318
* Andy Hanson
1419
* Anil Anar
20+
* Anton Khlynovskiy
1521
* Anton Tolmachev
1622
* Arnav Singh
1723
* Arthur Ozga
@@ -27,16 +33,20 @@ TypeScript is authored by:
2733
* Brett Mayen
2834
* Bryan Forbes
2935
* Caitlin Potter
36+
* Charly POLY
3037
* Chris Bubernak
3138
* Christophe Vidal
3239
* Chuck Jazdzewski
3340
* Colby Russell
3441
* Colin Snover
42+
* Cotton Hou
3543
* Cyrus Najmabadi
3644
* Dafrok Zhang
3745
* Dan Corder
3846
* Dan Quirk
47+
* Daniel Hollocher
3948
* Daniel Rosenwasser
49+
* David Kmenta
4050
* David Li
4151
* David Souther
4252
* Denis Nedelyaev
@@ -45,21 +55,26 @@ TypeScript is authored by:
4555
* Dirk Holtwick
4656
* Dom Chen
4757
* Doug Ilijev
58+
* Elisée Maurer
59+
* Emilio García-Pumarino
4860
* Eric Tsang
4961
* Erik Edrosa
62+
* Ethan Resnick
5063
* Ethan Rubio
5164
* Evan Martin
5265
* Evan Sebastian
5366
* Eyas Sharaiha
5467
* Fabian Cook
5568
* @falsandtru
5669
* Frank Wallis
70+
* Franklin Tse
5771
* František Žiacik
5872
* Gabe Moothart
5973
* Gabriel Isenberg
6074
* Gilad Peleg
6175
* Godfrey Chan
6276
* Graeme Wicksted
77+
* Guilherme Oenning
6378
* Guillaume Salles
6479
* Guy Bedford
6580
* Harald Niesche
@@ -78,12 +93,14 @@ TypeScript is authored by:
7893
* Jeffrey Morlan
7994
* Jesse Schalken
8095
* Jiri Tobisek
96+
* Joey Wilson
8197
* Johannes Rieken
8298
* John Vilk
8399
* Jonathan Bond-Caron
84100
* Jonathan Park
85101
* Jonathan Toland
86102
* Jonathan Turner
103+
* Jonathon Smith
87104
* Josh Abernathy
88105
* Josh Kalderimis
89106
* Josh Soref
@@ -102,15 +119,21 @@ TypeScript is authored by:
102119
* Lucien Greathouse
103120
* Lukas Elmer
104121
* Marin Marinov
122+
* Marius Schulz
105123
* Martin Vseticka
106124
* Masahiro Wakame
107125
* Matt McCutchen
126+
* Mattias Buelens
127+
* Mattias Buelens
108128
* Max Deepfield
109129
* Micah Zoltu
110130
* Michael
131+
* Michael Bromley
111132
* Mohamed Hegazy
133+
* Myles Megyesi
112134
* Nathan Shively-Sanders
113135
* Nathan Yee
136+
* Nicolas Henry
114137
* Nima Zahedi
115138
* Noah Chen
116139
* Noj Vek
@@ -119,9 +142,12 @@ TypeScript is authored by:
119142
* Omer Sheikh
120143
* Oskar Segersva¨rd
121144
* Patrick Zhong
145+
* Paul Jolly
122146
* Paul van Brenk
123147
* @pcbro
124148
* Pedro Maltez
149+
* Perry Jiang
150+
* Peter Burns
125151
* Philip Bulley
126152
* Piero Cangianiello
127153
* @piloopin
@@ -130,6 +156,9 @@ TypeScript is authored by:
130156
* Punya Biswal
131157
* Rado Kirov
132158
* Richard Knoll
159+
* Richard Sentino
160+
* Robert Coie
161+
* Rohit Verma
133162
* Ron Buckton
134163
* Rostislav Galimsky
135164
* Rowan Wyborn
@@ -152,7 +181,9 @@ TypeScript is authored by:
152181
* @T18970237136
153182
* Tarik Ozket
154183
* Tetsuharu Ohzeki
184+
* Thomas Loubiou
155185
* Tien Hoanhtien
186+
* Tim Lancina
156187
* Tim Perry
157188
* Tim Viiding-Spader
158189
* Tingan Ho
@@ -161,6 +192,8 @@ TypeScript is authored by:
161192
* Tomas Grubliauskas
162193
* Torben Fitschen
163194
* TruongSinh Tran-Nguyen
195+
* Vidar Tonaas Fauske
196+
* Viktor Zozulyak
164197
* Vilic Vane
165198
* Vladimir Matveev
166199
* Wesley Wigham

‎Jakefile.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ var harnessSources = harnessCoreSources.concat([
252252
"convertToBase64.ts",
253253
"transpile.ts",
254254
"reuseProgramStructure.ts",
255+
"textStorage.ts",
255256
"cachingInServerLSHost.ts",
256257
"moduleResolution.ts",
257258
"tsconfigParsing.ts",
@@ -354,19 +355,16 @@ function prependFile(prefixFile, destinationFile) {
354355
// concatenate a list of sourceFiles to a destinationFile
355356
function concatenateFiles(destinationFile, sourceFiles) {
356357
var temp = "temptemp";
357-
// Copy the first file to temp
358-
if (!fs.existsSync(sourceFiles[0])) {
359-
fail(sourceFiles[0] + " does not exist!");
360-
}
361-
jake.cpR(sourceFiles[0], temp, { silent: true });
362358
// append all files in sequence
363-
for (var i = 1; i < sourceFiles.length; i++) {
359+
var text = "";
360+
for (var i = 0; i < sourceFiles.length; i++) {
364361
if (!fs.existsSync(sourceFiles[i])) {
365362
fail(sourceFiles[i] + " does not exist!");
366363
}
367-
fs.appendFileSync(temp, "\n\n");
368-
fs.appendFileSync(temp, fs.readFileSync(sourceFiles[i]));
364+
if (i > 0) { text += "\n\n"; }
365+
text += fs.readFileSync(sourceFiles[i]).toString().replace(/\r?\n/g, "\n");
369366
}
367+
fs.writeFileSync(temp, text);
370368
// Move the file to the final destination
371369
fs.renameSync(temp, destinationFile);
372370
}

‎lib/.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text eol=lf

‎lib/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Read This!
2-
3-
**These files are not meant to be edited by hand.**
4-
If you need to make modifications, the respective files should be changed within the repository's top-level `src` directory.
5-
Running `jake LKG` will then appropriately update the files in this directory.
1+
# Read This!
2+
3+
**These files are not meant to be edited by hand.**
4+
If you need to make modifications, the respective files should be changed within the repository's top-level `src` directory.
5+
Running `jake LKG` will then appropriately update the files in this directory.

‎lib/cancellationToken.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
/*! *****************************************************************************
2-
Copyright (c) Microsoft Corporation. All rights reserved.
3-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
4-
this file except in compliance with the License. You may obtain a copy of the
5-
License at http://www.apache.org/licenses/LICENSE-2.0
6-
7-
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
8-
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
9-
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
10-
MERCHANTABLITY OR NON-INFRINGEMENT.
11-
12-
See the Apache Version 2.0 License for specific language governing permissions
13-
and limitations under the License.
14-
***************************************************************************** */
15-
1+
/*! *****************************************************************************
2+
Copyright (c) Microsoft Corporation. All rights reserved.
3+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
4+
this file except in compliance with the License. You may obtain a copy of the
5+
License at http://www.apache.org/licenses/LICENSE-2.0
6+
7+
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
8+
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
9+
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
10+
MERCHANTABLITY OR NON-INFRINGEMENT.
11+
12+
See the Apache Version 2.0 License for specific language governing permissions
13+
and limitations under the License.
14+
***************************************************************************** */
15+
1616
"use strict";
1717
var fs = require("fs");
1818
function createCancellationToken(args) {

0 commit comments

Comments
 (0)