Skip to content

Commit 2885eb2

Browse files
weswighamweswigham
committed
Merge branch 'master' into this-type-guards
2 parents bc01b16 + ecfeb21 commit 2885eb2

File tree

3,567 files changed

+7564
-7515
lines changed

Some content is hidden

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

3,567 files changed

+7564
-7515
lines changed

Diff for: ‎src/compiler/emitter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5260,11 +5260,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
52605260
writeLine();
52615261
emitToken(SyntaxKind.CloseBraceToken, node.members.end);
52625262
emitStart(node);
5263-
write(")(");
5263+
write("(");
52645264
if (baseTypeNode) {
52655265
emit(baseTypeNode.expression);
52665266
}
5267-
write(")");
5267+
write("))");
52685268
if (node.kind === SyntaxKind.ClassDeclaration) {
52695269
write(";");
52705270
}

Diff for: ‎tests/baselines/reference/2dArrays.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ var Cell = (function () {
2020
function Cell() {
2121
}
2222
return Cell;
23-
})();
23+
}());
2424
var Ship = (function () {
2525
function Ship() {
2626
}
2727
return Ship;
28-
})();
28+
}());
2929
var Board = (function () {
3030
function Board() {
3131
}
3232
Board.prototype.allShipsSunk = function () {
3333
return this.ships.every(function (val) { return val.isSunk; });
3434
};
3535
return Board;
36-
})();
36+
}());

Diff for: ‎tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var A;
3131
this.y = y;
3232
}
3333
return Point;
34-
})();
34+
}());
3535
A.Point = Point;
3636
})(A || (A = {}));
3737
//// [test.js]

Diff for: ‎tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var clodule1 = (function () {
5555
function clodule1() {
5656
}
5757
return clodule1;
58-
})();
58+
}());
5959
var clodule1;
6060
(function (clodule1) {
6161
function f(x) { }
@@ -64,21 +64,21 @@ var clodule2 = (function () {
6464
function clodule2() {
6565
}
6666
return clodule2;
67-
})();
67+
}());
6868
var clodule2;
6969
(function (clodule2) {
7070
var x;
7171
var D = (function () {
7272
function D() {
7373
}
7474
return D;
75-
})();
75+
}());
7676
})(clodule2 || (clodule2 = {}));
7777
var clodule3 = (function () {
7878
function clodule3() {
7979
}
8080
return clodule3;
81-
})();
81+
}());
8282
var clodule3;
8383
(function (clodule3) {
8484
clodule3.y = { id: T };
@@ -87,12 +87,12 @@ var clodule4 = (function () {
8787
function clodule4() {
8888
}
8989
return clodule4;
90-
})();
90+
}());
9191
var clodule4;
9292
(function (clodule4) {
9393
var D = (function () {
9494
function D() {
9595
}
9696
return D;
97-
})();
97+
}());
9898
})(clodule4 || (clodule4 = {}));

Diff for: ‎tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var clodule = (function () {
2121
}
2222
clodule.fn = function (id) { };
2323
return clodule;
24-
})();
24+
}());
2525
var clodule;
2626
(function (clodule) {
2727
// error: duplicate identifier expected

Diff for: ‎tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var clodule = (function () {
2121
}
2222
clodule.fn = function (id) { };
2323
return clodule;
24-
})();
24+
}());
2525
var clodule;
2626
(function (clodule) {
2727
// error: duplicate identifier expected

Diff for: ‎tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var clodule = (function () {
2121
}
2222
clodule.sfn = function (id) { return 42; };
2323
return clodule;
24-
})();
24+
}());
2525
var clodule;
2626
(function (clodule) {
2727
// error: duplicate identifier expected

Diff for: ‎tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var Point = (function () {
3030
}
3131
Point.Origin = function () { return { x: 0, y: 0 }; }; // unexpected error here bug 840246
3232
return Point;
33-
})();
33+
}());
3434
var Point;
3535
(function (Point) {
3636
function Origin() { return null; }
@@ -45,7 +45,7 @@ var A;
4545
}
4646
Point.Origin = function () { return { x: 0, y: 0 }; }; // unexpected error here bug 840246
4747
return Point;
48-
})();
48+
}());
4949
A.Point = Point;
5050
var Point;
5151
(function (Point) {

Diff for: ‎tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var Point = (function () {
3030
}
3131
Point.Origin = function () { return { x: 0, y: 0 }; };
3232
return Point;
33-
})();
33+
}());
3434
var Point;
3535
(function (Point) {
3636
function Origin() { return ""; } // not an error, since not exported
@@ -44,7 +44,7 @@ var A;
4444
}
4545
Point.Origin = function () { return { x: 0, y: 0 }; };
4646
return Point;
47-
})();
47+
}());
4848
A.Point = Point;
4949
var Point;
5050
(function (Point) {

Diff for: ‎tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var Point = (function () {
3030
}
3131
Point.Origin = { x: 0, y: 0 };
3232
return Point;
33-
})();
33+
}());
3434
var Point;
3535
(function (Point) {
3636
Point.Origin = ""; //expected duplicate identifier error
@@ -44,7 +44,7 @@ var A;
4444
}
4545
Point.Origin = { x: 0, y: 0 };
4646
return Point;
47-
})();
47+
}());
4848
A.Point = Point;
4949
var Point;
5050
(function (Point) {

Diff for: ‎tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var Point = (function () {
3030
}
3131
Point.Origin = { x: 0, y: 0 };
3232
return Point;
33-
})();
33+
}());
3434
var Point;
3535
(function (Point) {
3636
var Origin = ""; // not an error, since not exported
@@ -44,7 +44,7 @@ var A;
4444
}
4545
Point.Origin = { x: 0, y: 0 };
4646
return Point;
47-
})();
47+
}());
4848
A.Point = Point;
4949
var Point;
5050
(function (Point) {

Diff for: ‎tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var X;
5151
this.y = y;
5252
}
5353
return Point;
54-
})();
54+
}());
5555
Y.Point = Point;
5656
})(Y = X.Y || (X.Y = {}));
5757
})(X || (X = {}));
@@ -75,7 +75,7 @@ var A = (function () {
7575
function A() {
7676
}
7777
return A;
78-
})();
78+
}());
7979
var A;
8080
(function (A) {
8181
A.Instance = new A();

Diff for: ‎tests/baselines/reference/ClassDeclaration10.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ var C = (function () {
99
function C() {
1010
}
1111
return C;
12-
})();
12+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration11.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ var C = (function () {
1010
}
1111
C.prototype.foo = function () { };
1212
return C;
13-
})();
13+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration13.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ var C = (function () {
1010
}
1111
C.prototype.bar = function () { };
1212
return C;
13-
})();
13+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration14.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ var C = (function () {
99
function C() {
1010
}
1111
return C;
12-
})();
12+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration15.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ var C = (function () {
99
function C() {
1010
}
1111
return C;
12-
})();
12+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration21.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ var C = (function () {
1010
}
1111
C.prototype[1] = function () { };
1212
return C;
13-
})();
13+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration22.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ var C = (function () {
1010
}
1111
C.prototype["bar"] = function () { };
1212
return C;
13-
})();
13+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration24.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ var any = (function () {
77
function any() {
88
}
99
return any;
10-
})();
10+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration25.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ var List = (function () {
1414
function List() {
1515
}
1616
return List;
17-
})();
17+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration26.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ var C = (function () {
1111
this.foo = 10;
1212
}
1313
return C;
14-
})();
14+
}());
1515
var constructor = function () { };

Diff for: ‎tests/baselines/reference/ClassDeclaration8.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ var C = (function () {
88
function C() {
99
}
1010
return C;
11-
})();
11+
}());

Diff for: ‎tests/baselines/reference/ClassDeclaration9.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ var C = (function () {
88
function C() {
99
}
1010
return C;
11-
})();
11+
}());

Diff for: ‎tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ var AtomicNumbers = (function () {
99
}
1010
AtomicNumbers.H = 1;
1111
return AtomicNumbers;
12-
})();
12+
}());

Diff for: ‎tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ var C = (function () {
1010
this.x = 10;
1111
}
1212
return C;
13-
})();
13+
}());

Diff for: ‎tests/baselines/reference/ES5For-ofTypeCheck10.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ var StringIterator = (function () {
3232
return this;
3333
};
3434
return StringIterator;
35-
})();
35+
}());

Diff for: ‎tests/baselines/reference/ES5SymbolProperty2.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var M;
1919
}
2020
C.prototype[Symbol.iterator] = function () { };
2121
return C;
22-
})();
22+
}());
2323
M.C = C;
2424
(new C)[Symbol.iterator];
2525
})(M || (M = {}));

Diff for: ‎tests/baselines/reference/ES5SymbolProperty3.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ var C = (function () {
1414
}
1515
C.prototype[Symbol.iterator] = function () { };
1616
return C;
17-
})();
17+
}());
1818
(new C)[Symbol.iterator];

Diff for: ‎tests/baselines/reference/ES5SymbolProperty4.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ var C = (function () {
1414
}
1515
C.prototype[Symbol.iterator] = function () { };
1616
return C;
17-
})();
17+
}());
1818
(new C)[Symbol.iterator];

Diff for: ‎tests/baselines/reference/ES5SymbolProperty5.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ var C = (function () {
1414
}
1515
C.prototype[Symbol.iterator] = function () { };
1616
return C;
17-
})();
17+
}());
1818
(new C)[Symbol.iterator](0); // Should error

Diff for: ‎tests/baselines/reference/ES5SymbolProperty6.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ var C = (function () {
1111
}
1212
C.prototype[Symbol.iterator] = function () { };
1313
return C;
14-
})();
14+
}());
1515
(new C)[Symbol.iterator];

Diff for: ‎tests/baselines/reference/ES5SymbolProperty7.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ var C = (function () {
1414
}
1515
C.prototype[Symbol.iterator] = function () { };
1616
return C;
17-
})();
17+
}());
1818
(new C)[Symbol.iterator];

Diff for: ‎tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var enumdule;
3030
this.y = y;
3131
}
3232
return Point;
33-
})();
33+
}());
3434
enumdule.Point = Point;
3535
})(enumdule || (enumdule = {}));
3636
var x;

Diff for: ‎tests/baselines/reference/ExportAssignment7.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ var C = (function () {
1010
function C() {
1111
}
1212
return C;
13-
})();
13+
}());
1414
exports.C = C;

Diff for: ‎tests/baselines/reference/ExportAssignment8.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ var C = (function () {
1010
function C() {
1111
}
1212
return C;
13-
})();
13+
}());
1414
exports.C = C;

Diff for: ‎tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ var A;
3131
return 1;
3232
};
3333
return Point2d;
34-
})();
34+
}());
3535
A.Point2d = Point2d;
3636
})(A || (A = {}));

0 commit comments

Comments
 (0)