Skip to content

Commit 4c87375

Browse files
DanielRosenwasserDanielRosenwasser
committed
Merge branch 'master' into braceYourselves
2 parents 1842dd0 + 5a33707 commit 4c87375

17 files changed

Lines changed: 8556 additions & 7328 deletions

‎Jakefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ var harnessSources = [
6363
"sourceMapRecorder.ts",
6464
"harnessLanguageService.ts",
6565
"fourslash.ts",
66-
"external/json2.ts",
6766
"runnerbase.ts",
6867
"compilerRunner.ts",
6968
"typeWriter.ts",
@@ -318,7 +317,7 @@ function exec(cmd, completeHandler) {
318317
complete();
319318
})
320319
try{
321-
ex.run();
320+
ex.run();
322321
} catch(e) {
323322
console.log('Exception: ' + e)
324323
}
@@ -342,7 +341,7 @@ function cleanTestDirs() {
342341
function writeTestConfigFile(tests, testConfigFile) {
343342
console.log('Running test(s): ' + tests);
344343
var testConfigContents = '{\n' + '\ttest: [\'' + tests + '\']\n}';
345-
fs.writeFileSync('test.config', testConfigContents);
344+
fs.writeFileSync('test.config', testConfigContents);
346345
}
347346

348347
function deleteTemporaryProjectOutput() {
@@ -385,7 +384,7 @@ desc("Generates code coverage data via instanbul")
385384
task("generate-code-coverage", ["tests", builtLocalDirectory], function () {
386385
var cmd = 'istanbul cover node_modules/mocha/bin/_mocha -- -R min -t ' + testTimeout + ' ' + run;
387386
console.log(cmd);
388-
exec(cmd);
387+
exec(cmd);
389388
}, { async: true });
390389

391390
// Browser tests

‎ThirdPartyNoticeText.txt‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -19,67 +19,6 @@ limitations under the License.
1919
---------------------------------------------
2020
Third Party Code Components
2121
--------------------------------------------
22-
---- Mozilla Developer Code---------
23-
The following Mozilla Developer Code is under Public Domain as updated after Aug. 20, 2012, see, https://developer.mozilla.org/en-US/docs/Project:Copyrights
24-
1. Array filter Compatibility Method,
25-
Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/filter
26-
Any copyright is dedicated to the Public Domain.
27-
28-
2. Array forEach Compatibility Method,
29-
Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/forEach
30-
Any copyright is dedicated to the Public Domain.
31-
32-
3. Array indexOf Compatibility Method,
33-
Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/indexOf
34-
Any copyright is dedicated to the Public Domain.
35-
36-
4. Array map Compatibility Method,
37-
Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/map
38-
Any copyright is dedicated to the Public Domain.
39-
40-
5. Array Reduce Compatibility Method,
41-
Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/Reduce
42-
Any copyright is dedicated to the Public Domain.
43-
44-
6. String Trim Compatibility Method,
45-
Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/String/Trim
46-
Any copyright is dedicated to the Public Domain.
47-
48-
7. Date now Compatibility Method,
49-
Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Date/now
50-
Any copyright is dedicated to the Public Domain.
51-
52-
------------JSON2 Script------------------------
53-
json2.js 2012-10-08
54-
Public Domain.
55-
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
56-
See, http://www.JSON.org/js.html
57-
58-
--------------r.js----------------------
59-
Copyright (c) 2010-2011 Dojo Foundation. All Rights Reserved.
60-
Originally License under MIT License
61-
-------------------------------------------------------------------------
62-
Provided for Informational Purposes Only
63-
MIT License
64-
65-
Permission is hereby granted, free of charge, to any person obtaining
66-
a copy of this software and associated documentation files (the
67-
"Software"), to deal in the Software without restriction, including
68-
without limitation the rights to use, copy, modify, merge, publish,
69-
distribute, sublicense, and/or sell copies of the Software, and to
70-
permit persons to whom the Software is furnished to do so, subject to
71-
the following conditions:
72-
73-
The above copyright notice and this permission notice shall be
74-
included in all copies or substantial portions of the Software.
75-
76-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
77-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
78-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
79-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
80-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
81-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
82-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
8322

8423
------------------- DefinitelyTyped --------------------
8524
This file is based on or incorporates material from the projects listed below (collectively ?Third Party Code?). Microsoft is not the original author of the Third Party Code. The original copyright notice and the license, under which Microsoft received such Third Party Code, are set forth below. Such licenses and notices are provided for informational purposes only. Microsoft, not the third party, licenses the Third Party Code to you under the terms set forth in the EULA for the Microsoft Product. Microsoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise.

‎bin/lib.d.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,14 +1182,14 @@ interface Int8Array extends ArrayBufferView {
11821182

11831183
/**
11841184
* Sets a value or an array of values.
1185-
* @param A typed or untyped array of values to set.
1185+
* @param array A typed or untyped array of values to set.
11861186
* @param offset The index in the current array at which the values are to be written.
11871187
*/
11881188
set(array: Int8Array, offset?: number): void;
11891189

11901190
/**
11911191
* Sets a value or an array of values.
1192-
* @param A typed or untyped array of values to set.
1192+
* @param array A typed or untyped array of values to set.
11931193
* @param offset The index in the current array at which the values are to be written.
11941194
*/
11951195
set(array: number[], offset?: number): void;
@@ -1240,14 +1240,14 @@ interface Uint8Array extends ArrayBufferView {
12401240

12411241
/**
12421242
* Sets a value or an array of values.
1243-
* @param A typed or untyped array of values to set.
1243+
* @param array A typed or untyped array of values to set.
12441244
* @param offset The index in the current array at which the values are to be written.
12451245
*/
12461246
set(array: Uint8Array, offset?: number): void;
12471247

12481248
/**
12491249
* Sets a value or an array of values.
1250-
* @param A typed or untyped array of values to set.
1250+
* @param array A typed or untyped array of values to set.
12511251
* @param offset The index in the current array at which the values are to be written.
12521252
*/
12531253
set(array: number[], offset?: number): void;
@@ -1298,14 +1298,14 @@ interface Int16Array extends ArrayBufferView {
12981298

12991299
/**
13001300
* Sets a value or an array of values.
1301-
* @param A typed or untyped array of values to set.
1301+
* @param array A typed or untyped array of values to set.
13021302
* @param offset The index in the current array at which the values are to be written.
13031303
*/
13041304
set(array: Int16Array, offset?: number): void;
13051305

13061306
/**
13071307
* Sets a value or an array of values.
1308-
* @param A typed or untyped array of values to set.
1308+
* @param array A typed or untyped array of values to set.
13091309
* @param offset The index in the current array at which the values are to be written.
13101310
*/
13111311
set(array: number[], offset?: number): void;
@@ -1356,14 +1356,14 @@ interface Uint16Array extends ArrayBufferView {
13561356

13571357
/**
13581358
* Sets a value or an array of values.
1359-
* @param A typed or untyped array of values to set.
1359+
* @param array A typed or untyped array of values to set.
13601360
* @param offset The index in the current array at which the values are to be written.
13611361
*/
13621362
set(array: Uint16Array, offset?: number): void;
13631363

13641364
/**
13651365
* Sets a value or an array of values.
1366-
* @param A typed or untyped array of values to set.
1366+
* @param array A typed or untyped array of values to set.
13671367
* @param offset The index in the current array at which the values are to be written.
13681368
*/
13691369
set(array: number[], offset?: number): void;
@@ -1414,14 +1414,14 @@ interface Int32Array extends ArrayBufferView {
14141414

14151415
/**
14161416
* Sets a value or an array of values.
1417-
* @param A typed or untyped array of values to set.
1417+
* @param array A typed or untyped array of values to set.
14181418
* @param offset The index in the current array at which the values are to be written.
14191419
*/
14201420
set(array: Int32Array, offset?: number): void;
14211421

14221422
/**
14231423
* Sets a value or an array of values.
1424-
* @param A typed or untyped array of values to set.
1424+
* @param array A typed or untyped array of values to set.
14251425
* @param offset The index in the current array at which the values are to be written.
14261426
*/
14271427
set(array: number[], offset?: number): void;
@@ -1472,14 +1472,14 @@ interface Uint32Array extends ArrayBufferView {
14721472

14731473
/**
14741474
* Sets a value or an array of values.
1475-
* @param A typed or untyped array of values to set.
1475+
* @param array A typed or untyped array of values to set.
14761476
* @param offset The index in the current array at which the values are to be written.
14771477
*/
14781478
set(array: Uint32Array, offset?: number): void;
14791479

14801480
/**
14811481
* Sets a value or an array of values.
1482-
* @param A typed or untyped array of values to set.
1482+
* @param array A typed or untyped array of values to set.
14831483
* @param offset The index in the current array at which the values are to be written.
14841484
*/
14851485
set(array: number[], offset?: number): void;
@@ -1530,14 +1530,14 @@ interface Float32Array extends ArrayBufferView {
15301530

15311531
/**
15321532
* Sets a value or an array of values.
1533-
* @param A typed or untyped array of values to set.
1533+
* @param array A typed or untyped array of values to set.
15341534
* @param offset The index in the current array at which the values are to be written.
15351535
*/
15361536
set(array: Float32Array, offset?: number): void;
15371537

15381538
/**
15391539
* Sets a value or an array of values.
1540-
* @param A typed or untyped array of values to set.
1540+
* @param array A typed or untyped array of values to set.
15411541
* @param offset The index in the current array at which the values are to be written.
15421542
*/
15431543
set(array: number[], offset?: number): void;
@@ -1588,14 +1588,14 @@ interface Float64Array extends ArrayBufferView {
15881588

15891589
/**
15901590
* Sets a value or an array of values.
1591-
* @param A typed or untyped array of values to set.
1591+
* @param array A typed or untyped array of values to set.
15921592
* @param offset The index in the current array at which the values are to be written.
15931593
*/
15941594
set(array: Float64Array, offset?: number): void;
15951595

15961596
/**
15971597
* Sets a value or an array of values.
1598-
* @param A typed or untyped array of values to set.
1598+
* @param array A typed or untyped array of values to set.
15991599
* @param offset The index in the current array at which the values are to be written.
16001600
*/
16011601
set(array: number[], offset?: number): void;

‎bin/lib.dom.d.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ interface Int8Array extends ArrayBufferView {
7979

8080
/**
8181
* Sets a value or an array of values.
82-
* @param A typed or untyped array of values to set.
82+
* @param array A typed or untyped array of values to set.
8383
* @param offset The index in the current array at which the values are to be written.
8484
*/
8585
set(array: Int8Array, offset?: number): void;
8686

8787
/**
8888
* Sets a value or an array of values.
89-
* @param A typed or untyped array of values to set.
89+
* @param array A typed or untyped array of values to set.
9090
* @param offset The index in the current array at which the values are to be written.
9191
*/
9292
set(array: number[], offset?: number): void;
@@ -137,14 +137,14 @@ interface Uint8Array extends ArrayBufferView {
137137

138138
/**
139139
* Sets a value or an array of values.
140-
* @param A typed or untyped array of values to set.
140+
* @param array A typed or untyped array of values to set.
141141
* @param offset The index in the current array at which the values are to be written.
142142
*/
143143
set(array: Uint8Array, offset?: number): void;
144144

145145
/**
146146
* Sets a value or an array of values.
147-
* @param A typed or untyped array of values to set.
147+
* @param array A typed or untyped array of values to set.
148148
* @param offset The index in the current array at which the values are to be written.
149149
*/
150150
set(array: number[], offset?: number): void;
@@ -195,14 +195,14 @@ interface Int16Array extends ArrayBufferView {
195195

196196
/**
197197
* Sets a value or an array of values.
198-
* @param A typed or untyped array of values to set.
198+
* @param array A typed or untyped array of values to set.
199199
* @param offset The index in the current array at which the values are to be written.
200200
*/
201201
set(array: Int16Array, offset?: number): void;
202202

203203
/**
204204
* Sets a value or an array of values.
205-
* @param A typed or untyped array of values to set.
205+
* @param array A typed or untyped array of values to set.
206206
* @param offset The index in the current array at which the values are to be written.
207207
*/
208208
set(array: number[], offset?: number): void;
@@ -253,14 +253,14 @@ interface Uint16Array extends ArrayBufferView {
253253

254254
/**
255255
* Sets a value or an array of values.
256-
* @param A typed or untyped array of values to set.
256+
* @param array A typed or untyped array of values to set.
257257
* @param offset The index in the current array at which the values are to be written.
258258
*/
259259
set(array: Uint16Array, offset?: number): void;
260260

261261
/**
262262
* Sets a value or an array of values.
263-
* @param A typed or untyped array of values to set.
263+
* @param array A typed or untyped array of values to set.
264264
* @param offset The index in the current array at which the values are to be written.
265265
*/
266266
set(array: number[], offset?: number): void;
@@ -311,14 +311,14 @@ interface Int32Array extends ArrayBufferView {
311311

312312
/**
313313
* Sets a value or an array of values.
314-
* @param A typed or untyped array of values to set.
314+
* @param array A typed or untyped array of values to set.
315315
* @param offset The index in the current array at which the values are to be written.
316316
*/
317317
set(array: Int32Array, offset?: number): void;
318318

319319
/**
320320
* Sets a value or an array of values.
321-
* @param A typed or untyped array of values to set.
321+
* @param array A typed or untyped array of values to set.
322322
* @param offset The index in the current array at which the values are to be written.
323323
*/
324324
set(array: number[], offset?: number): void;
@@ -369,14 +369,14 @@ interface Uint32Array extends ArrayBufferView {
369369

370370
/**
371371
* Sets a value or an array of values.
372-
* @param A typed or untyped array of values to set.
372+
* @param array A typed or untyped array of values to set.
373373
* @param offset The index in the current array at which the values are to be written.
374374
*/
375375
set(array: Uint32Array, offset?: number): void;
376376

377377
/**
378378
* Sets a value or an array of values.
379-
* @param A typed or untyped array of values to set.
379+
* @param array A typed or untyped array of values to set.
380380
* @param offset The index in the current array at which the values are to be written.
381381
*/
382382
set(array: number[], offset?: number): void;
@@ -427,14 +427,14 @@ interface Float32Array extends ArrayBufferView {
427427

428428
/**
429429
* Sets a value or an array of values.
430-
* @param A typed or untyped array of values to set.
430+
* @param array A typed or untyped array of values to set.
431431
* @param offset The index in the current array at which the values are to be written.
432432
*/
433433
set(array: Float32Array, offset?: number): void;
434434

435435
/**
436436
* Sets a value or an array of values.
437-
* @param A typed or untyped array of values to set.
437+
* @param array A typed or untyped array of values to set.
438438
* @param offset The index in the current array at which the values are to be written.
439439
*/
440440
set(array: number[], offset?: number): void;
@@ -485,14 +485,14 @@ interface Float64Array extends ArrayBufferView {
485485

486486
/**
487487
* Sets a value or an array of values.
488-
* @param A typed or untyped array of values to set.
488+
* @param array A typed or untyped array of values to set.
489489
* @param offset The index in the current array at which the values are to be written.
490490
*/
491491
set(array: Float64Array, offset?: number): void;
492492

493493
/**
494494
* Sets a value or an array of values.
495-
* @param A typed or untyped array of values to set.
495+
* @param array A typed or untyped array of values to set.
496496
* @param offset The index in the current array at which the values are to be written.
497497
*/
498498
set(array: number[], offset?: number): void;

0 commit comments

Comments
 (0)