Update tests.

2026-02-09 02:30:15 -06:00 · 2015-02-21 14:43:45 -08:00 · 2015-02-21 14:43:45 -08:00 · 23e66303fa
commit 23e66303fa
parent d928baf9d4
61 changed files with 139 additions and 269 deletions
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@ -1964,6 +1964,8 @@ function compile(fileNames, options) {
 }
 exports.compile = compile;
 compile(process.argv.slice(2), {
-    noEmitOnError: true, noImplicitAny: true,
-    target: 1 /* ES5 */, module: 1 /* CommonJS */
+    noEmitOnError: true,
+    noImplicitAny: true,
+    target: 1 /* ES5 */,
+    module: 1 /* CommonJS */
 });
--- a/tests/baselines/reference/YieldExpression10_es6.js
+++ b/tests/baselines/reference/YieldExpression10_es6.js
@ -7,6 +7,5 @@ var v = { * foo() {

 //// [YieldExpression10_es6.js]
 var v = { foo: function () {
-        ;
-    }
-};
+    ;
+} };
--- a/tests/baselines/reference/classExpression.js
+++ b/tests/baselines/reference/classExpression.js
@ -20,7 +20,9 @@ var C = (function () {
    return C;
 })();
 var y = {
-    foo: , class: C2 }, _a = void 0;
+    foo: ,
+    class: C2
+}, _a = void 0;
 var M;
 (function (M) {
    var z = ;
--- a/tests/baselines/reference/computedPropertyNames11_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames11_ES5.js
@ -20,17 +20,5 @@ var v = {
 var s;
 var n;
 var a;
-var v = (_a = {}, _a[s] = Object.defineProperty({ get: function () {
-    return 0;
-}, enumerable: true, configurable: true }), _a[n] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a[s + s] = Object.defineProperty({ get: function () {
-    return 0;
-}, enumerable: true, configurable: true }), _a[s + n] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a[+s] = Object.defineProperty({ get: function () {
-    return 0;
-}, enumerable: true, configurable: true }), _a[""] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a[0] = Object.defineProperty({ get: function () {
-    return 0;
-}, enumerable: true, configurable: true }), _a[a] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a[true] = Object.defineProperty({ get: function () {
-    return 0;
-}, enumerable: true, configurable: true }), _a["hello bye"] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a["hello " + a + " bye"] = Object.defineProperty({ get: function () {
-    return 0;
-}, enumerable: true, configurable: true }), _a);
+var v = (_a = {}, _a[s] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), _a[n] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a[s + s] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), _a[s + n] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a[+s] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), _a[""] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a[0] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), _a[a] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a[true] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), _a["hello bye"] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a["hello " + a + " bye"] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), _a);
 var _a;
--- a/tests/baselines/reference/computedPropertyNames16_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames16_ES5.js
@ -24,9 +24,7 @@ var C = (function () {
    function C() {
    }
    Object.defineProperty(C.prototype, s, {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
@ -36,9 +34,7 @@ var C = (function () {
        configurable: true
    });
    Object.defineProperty(C, s + s, {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
@ -48,9 +44,7 @@ var C = (function () {
        configurable: true
    });
    Object.defineProperty(C.prototype, +s, {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
@ -60,9 +54,7 @@ var C = (function () {
        configurable: true
    });
    Object.defineProperty(C.prototype, 0, {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
@ -72,9 +64,7 @@ var C = (function () {
        configurable: true
    });
    Object.defineProperty(C, true, {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
@ -84,9 +74,7 @@ var C = (function () {
        configurable: true
    });
    Object.defineProperty(C.prototype, "hello " + a + " bye", {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNames17_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames17_ES6.js
@ -15,9 +15,7 @@ var C = (function () {
    function C() {
    }
    Object.defineProperty(C.prototype, b, {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
@ -27,9 +25,7 @@ var C = (function () {
        configurable: true
    });
    Object.defineProperty(C.prototype, [], {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
@ -39,9 +35,7 @@ var C = (function () {
        configurable: true
    });
    Object.defineProperty(C, undefined, {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNames1_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames1_ES5.js
@ -5,7 +5,5 @@ var v = {
 }

 //// [computedPropertyNames1_ES5.js]
-var v = (_a = {}, _a[0 + 1] = Object.defineProperty({ get: function () {
-    return 0;
-}, enumerable: true, configurable: true }), _a[0 + 1] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a);
+var v = (_a = {}, _a[0 + 1] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), _a[0 + 1] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), _a);
 var _a;
--- a/tests/baselines/reference/computedPropertyNames32_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames32_ES5.js
@ -7,15 +7,8 @@ class C<T> {
    [foo<T>()]() { }
 }

-<<<<<<< HEAD:tests/baselines/reference/computedPropertyNames32.js
-//// [computedPropertyNames32.js]
-function foo() { return ''; }
-=======
 //// [computedPropertyNames32_ES5.js]
-function foo() {
-    return '';
-}
->>>>>>> master:tests/baselines/reference/computedPropertyNames32_ES5.js
+function foo() { return ''; }
 var C = (function () {
    function C() {
    }
--- a/tests/baselines/reference/computedPropertyNames32_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames32_ES6.js
@ -8,9 +8,7 @@ class C<T> {
 }

 //// [computedPropertyNames32_ES6.js]
-function foo() {
-    return '';
-}
+function foo() { return ''; }
 var C = (function () {
    function C() {
    }
--- a/tests/baselines/reference/computedPropertyNames33_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames33_ES5.js
@ -10,9 +10,7 @@ class C<T> {
 }

 //// [computedPropertyNames33_ES5.js]
-function foo() {
-    return '';
-}
+function foo() { return ''; }
 var C = (function () {
    function C() {
    }
--- a/tests/baselines/reference/computedPropertyNames33_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames33_ES6.js
@ -9,15 +9,8 @@ class C<T> {
    }
 }

-<<<<<<< HEAD:tests/baselines/reference/computedPropertyNames33.js
-//// [computedPropertyNames33.js]
-function foo() { return ''; }
-=======
 //// [computedPropertyNames33_ES6.js]
-function foo() {
-    return '';
-}
->>>>>>> master:tests/baselines/reference/computedPropertyNames33_ES6.js
+function foo() { return ''; }
 var C = (function () {
    function C() {
    }
--- a/tests/baselines/reference/computedPropertyNames34_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames34_ES5.js
@ -10,9 +10,7 @@ class C<T> {
 }

 //// [computedPropertyNames34_ES5.js]
-function foo() {
-    return '';
-}
+function foo() { return ''; }
 var C = (function () {
    function C() {
    }
--- a/tests/baselines/reference/computedPropertyNames34_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames34_ES6.js
@ -9,15 +9,8 @@ class C<T> {
    }
 }

-<<<<<<< HEAD:tests/baselines/reference/computedPropertyNames34.js
-//// [computedPropertyNames34.js]
-function foo() { return ''; }
-=======
 //// [computedPropertyNames34_ES6.js]
-function foo() {
-    return '';
-}
->>>>>>> master:tests/baselines/reference/computedPropertyNames34_ES6.js
+function foo() { return ''; }
 var C = (function () {
    function C() {
    }
--- a/tests/baselines/reference/computedPropertyNames35_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames35_ES5.js
@ -5,12 +5,5 @@ interface I<T> {
    [foo<T>()](): void;
 }

-<<<<<<< HEAD:tests/baselines/reference/computedPropertyNames35.js
-//// [computedPropertyNames35.js]
-function foo() { return ''; }
-=======
 //// [computedPropertyNames35_ES5.js]
-function foo() {
-    return '';
-}
->>>>>>> master:tests/baselines/reference/computedPropertyNames35_ES5.js
+function foo() { return ''; }
--- a/tests/baselines/reference/computedPropertyNames35_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames35_ES6.js
@ -6,6 +6,4 @@ interface I<T> {
 }

 //// [computedPropertyNames35_ES6.js]
-function foo() {
-    return '';
-}
+function foo() { return ''; }
--- a/tests/baselines/reference/computedPropertyNames36_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames36_ES6.js
@ -26,9 +26,7 @@ var C = (function () {
    }
    Object.defineProperty(C.prototype, "get1", {
        // Computed properties
-        get: function () {
-            return new Foo;
-        },
+        get: function () { return new Foo; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNames37_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames37_ES6.js
@ -26,9 +26,7 @@ var C = (function () {
    }
    Object.defineProperty(C.prototype, "get1", {
        // Computed properties
-        get: function () {
-            return new Foo;
-        },
+        get: function () { return new Foo; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNames38_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames38_ES6.js
@ -26,9 +26,7 @@ var C = (function () {
    }
    Object.defineProperty(C.prototype, 1 << 6, {
        // Computed properties
-        get: function () {
-            return new Foo;
-        },
+        get: function () { return new Foo; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNames39_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames39_ES6.js
@ -26,9 +26,7 @@ var C = (function () {
    }
    Object.defineProperty(C.prototype, 1 << 6, {
        // Computed properties
-        get: function () {
-            return new Foo;
-        },
+        get: function () { return new Foo; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNames40_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames40_ES6.js
@ -25,11 +25,7 @@ var C = (function () {
    function C() {
    }
    // Computed properties
-    C.prototype[""] = function () {
-        return new Foo;
-    };
-    C.prototype[""] = function () {
-        return new Foo2;
-    };
+    C.prototype[""] = function () { return new Foo; };
+    C.prototype[""] = function () { return new Foo2; };
    return C;
 })();
--- a/tests/baselines/reference/computedPropertyNames41_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames41_ES6.js
@ -24,8 +24,6 @@ var C = (function () {
    function C() {
    }
    // Computed properties
-    C[""] = function () {
-        return new Foo;
-    };
+    C[""] = function () { return new Foo; };
    return C;
 })();
--- a/tests/baselines/reference/computedPropertyNames43_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames43_ES6.js
@ -41,9 +41,7 @@ var D = (function (_super) {
    }
    Object.defineProperty(D.prototype, "get1", {
        // Computed properties
-        get: function () {
-            return new Foo;
-        },
+        get: function () { return new Foo; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNames44_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames44_ES6.js
@ -32,9 +32,7 @@ var C = (function () {
    function C() {
    }
    Object.defineProperty(C.prototype, "get1", {
-        get: function () {
-            return new Foo;
-        },
+        get: function () { return new Foo; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNames45_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames45_ES6.js
@ -33,9 +33,7 @@ var C = (function () {
    function C() {
    }
    Object.defineProperty(C.prototype, "get1", {
-        get: function () {
-            return new Foo;
-        },
+        get: function () { return new Foo; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js
@ -10,7 +10,5 @@ var o: I = {
 }

 //// [computedPropertyNamesContextualType1_ES5.js]
-var o = (_a = {}, _a["" + 0] = function (y) {
-    return y.length;
-}, _a["" + 1] = function (y) { return y.length; }, _a);
+var o = (_a = {}, _a["" + 0] = function (y) { return y.length; }, _a["" + 1] = function (y) { return y.length; }, _a);
 var _a;
--- a/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js
@ -10,7 +10,5 @@ var o: I = {
 }

 //// [computedPropertyNamesContextualType2_ES5.js]
-var o = (_a = {}, _a[+"foo"] = function (y) {
-    return y.length;
-}, _a[+"bar"] = function (y) { return y.length; }, _a);
+var o = (_a = {}, _a[+"foo"] = function (y) { return y.length; }, _a[+"bar"] = function (y) { return y.length; }, _a);
 var _a;
--- a/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js
@ -9,7 +9,5 @@ var o: I = {
 }

 //// [computedPropertyNamesContextualType3_ES5.js]
-var o = (_a = {}, _a[+"foo"] = function (y) {
-    return y.length;
-}, _a[+"bar"] = function (y) { return y.length; }, _a);
+var o = (_a = {}, _a[+"foo"] = function (y) { return y.length; }, _a[+"bar"] = function (y) { return y.length; }, _a);
 var _a;
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES6.js
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES6.js
@ -11,9 +11,7 @@ var C = (function () {
    }
    C.prototype["" + ""] = function () { };
    Object.defineProperty(C.prototype, "" + "", {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES6.js
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES6.js
@ -11,9 +11,7 @@ var C = (function () {
    }
    C["" + ""] = function () { };
    Object.defineProperty(C, "" + "", {
-        get: function () {
-            return 0;
-        },
+        get: function () { return 0; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js
@ -7,9 +7,7 @@ var v = {
 }

 //// [computedPropertyNamesDeclarationEmit5_ES5.js]
-var v = (_a = {}, _a["" + ""] = 0, _a["" + ""] = function () { }, _a["" + ""] = Object.defineProperty({ get: function () {
-    return 0;
-}, enumerable: true, configurable: true }), _a["" + ""] = Object.defineProperty({ set: function (x) { }, enumerable: true, configurable: true }), _a);
+var v = (_a = {}, _a["" + ""] = 0, _a["" + ""] = function () { }, _a["" + ""] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), _a["" + ""] = Object.defineProperty({ set: function (x) { }, enumerable: true, configurable: true }), _a);
 var _a;


--- a/tests/baselines/reference/contextualTypeWithUnionTypeMembers.js
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeMembers.js
@ -150,27 +150,26 @@ var i1Ori2 = {
    propertyOnlyInI2: "Hello"
 };
 var arrayI1OrI2 = [i1, i2, {
-        commonPropertyType: "hello",
-        commonMethodType: function (a) { return a; },
-        commonMethodWithTypeParameter: function (a) { return a; },
-        methodOnlyInI1: function (a) { return a; },
-        propertyOnlyInI1: "Hello"
-    },
-    {
-        commonPropertyType: "hello",
-        commonMethodType: function (a) { return a; },
-        commonMethodWithTypeParameter: function (a) { return a; },
-        methodOnlyInI2: function (a) { return a; },
-        propertyOnlyInI2: "Hello"
-    }, {
-        commonPropertyType: "hello",
-        commonMethodType: function (a) { return a; },
-        commonMethodWithTypeParameter: function (a) { return a; },
-        methodOnlyInI1: function (a) { return a; },
-        propertyOnlyInI1: "Hello",
-        methodOnlyInI2: function (a) { return a; },
-        propertyOnlyInI2: "Hello"
-    }];
+    commonPropertyType: "hello",
+    commonMethodType: function (a) { return a; },
+    commonMethodWithTypeParameter: function (a) { return a; },
+    methodOnlyInI1: function (a) { return a; },
+    propertyOnlyInI1: "Hello"
+}, {
+    commonPropertyType: "hello",
+    commonMethodType: function (a) { return a; },
+    commonMethodWithTypeParameter: function (a) { return a; },
+    methodOnlyInI2: function (a) { return a; },
+    propertyOnlyInI2: "Hello"
+}, {
+    commonPropertyType: "hello",
+    commonMethodType: function (a) { return a; },
+    commonMethodWithTypeParameter: function (a) { return a; },
+    methodOnlyInI1: function (a) { return a; },
+    propertyOnlyInI1: "Hello",
+    methodOnlyInI2: function (a) { return a; },
+    propertyOnlyInI2: "Hello"
+}];
 var i11;
 var i21;
 var i11Ori21 = i11;
@ -192,17 +191,17 @@ var i11Ori21 = {
    commonPropertyDifferentType: 10
 };
 var arrayOrI11OrI21 = [i11, i21, i11 || i21, {
-        // Like i1
-        commonMethodDifferentReturnType: function (a, b) {
-            var z = a.charAt(b);
-            return z;
-        },
-        commonPropertyDifferentType: "hello"
-    }, {
-        // Like i2
-        commonMethodDifferentReturnType: function (a, b) {
-            var z = a.charCodeAt(b);
-            return z;
-        },
-        commonPropertyDifferentType: 10
-    }];
+    // Like i1
+    commonMethodDifferentReturnType: function (a, b) {
+        var z = a.charAt(b);
+        return z;
+    },
+    commonPropertyDifferentType: "hello"
+}, {
+    // Like i2
+    commonMethodDifferentReturnType: function (a, b) {
+        var z = a.charCodeAt(b);
+        return z;
+    },
+    commonPropertyDifferentType: 10
+}];
--- a/tests/baselines/reference/enumBasics.js
+++ b/tests/baselines/reference/enumBasics.js
@ -150,9 +150,21 @@ var E9;
 // (refer to .js to validate)
 // Enum constant members are propagated
 var doNotPropagate = [
-    E8.B, E7.A, E4.Z, E3.X, E3.Y, E3.Z
+    E8.B,
+    E7.A,
+    E4.Z,
+    E3.X,
+    E3.Y,
+    E3.Z
 ];
 // Enum computed members are not propagated
 var doPropagate = [
-    0 /* A */, E9.B, 0 /* B */, 1 /* C */, 0 /* A */, 0 /* A */, 3 /* B */, 4 /* C */
+    0 /* A */,
+    E9.B,
+    0 /* B */,
+    1 /* C */,
+    0 /* A */,
+    0 /* A */,
+    3 /* B */,
+    4 /* C */
 ];
--- a/tests/baselines/reference/genericsManyTypeParameters.js
+++ b/tests/baselines/reference/genericsManyTypeParameters.js
@ -61,22 +61,5 @@ function Foo<

 //// [genericsManyTypeParameters.js]
 function Foo(x1, y1, z1, a1, b1, c1, x2, y2, z2, a2, b2, c2, x3, y3, z3, a3, b3, c3, x4, y4, z4, a4, b4, c4, x5, y5, z5, a5, b5, c5, x6, y6, z6, a6, b6, c6, x7, y7, z7, a7, b7, c7, x8, y8, z8, a8, b8, c8, x9, y9, z9, a9, b9, c9, x10, y12, z10, a10, b10, c10, x11, y13, z11, a11, b11, c11, x12, y14, z12, a12, b12, c12, x13, y15, z13, a13, b13, c13, x14, y16, z14, a14, b14, c14, x15, y17, z15, a15, b15, c15, x16, y18, z16, a16, b16, c16, x17, y19, z17, a17, b17, c17, x18, y10, z18, a18, b18, c18) {
-    return [x1, y1, z1, a1, b1, c1,
-        x2, y2, z2, a2, b2, c2,
-        x3, y3, z3, a3, b3, c3,
-        x4, y4, z4, a4, b4, c4,
-        x5, y5, z5, a5, b5, c5,
-        x6, y6, z6, a6, b6, c6,
-        x7, y7, z7, a7, b7, c7,
-        x8, y8, z8, a8, b8, c8,
-        x9, y9, z9, a9, b9, c9,
-        x10, y12, z10, a10, b10, c10,
-        x11, y13, z11, a11, b11, c11,
-        x12, y14, z12, a12, b12, c12,
-        x13, y15, z13, a13, b13, c13,
-        x14, y16, z14, a14, b14, c14,
-        x15, y17, z15, a15, b15, c15,
-        x16, y18, z16, a16, b16, c16,
-        x17, y19, z17, a17, b17, c17,
-        x18, y10, z18, a18, b18, c18];
+    return [x1, y1, z1, a1, b1, c1, x2, y2, z2, a2, b2, c2, x3, y3, z3, a3, b3, c3, x4, y4, z4, a4, b4, c4, x5, y5, z5, a5, b5, c5, x6, y6, z6, a6, b6, c6, x7, y7, z7, a7, b7, c7, x8, y8, z8, a8, b8, c8, x9, y9, z9, a9, b9, c9, x10, y12, z10, a10, b10, c10, x11, y13, z11, a11, b11, c11, x12, y14, z12, a12, b12, c12, x13, y15, z13, a13, b13, c13, x14, y16, z14, a14, b14, c14, x15, y17, z15, a15, b15, c15, x16, y18, z16, a16, b16, c16, x17, y19, z17, a17, b17, c17, x18, y10, z18, a18, b18, c18];
 }
--- a/tests/baselines/reference/nestedClassDeclaration.js
+++ b/tests/baselines/reference/nestedClassDeclaration.js
@ -37,4 +37,5 @@ var C3 = (function () {
    return C3;
 })();
 var x = {
-    class: C4 }, _a = void 0;
+    class: C4
+}, _a = void 0;
--- a/tests/baselines/reference/objectLiteralWithSemicolons4.js
+++ b/tests/baselines/reference/objectLiteralWithSemicolons4.js
@ -5,4 +5,5 @@ var v = {

 //// [objectLiteralWithSemicolons4.js]
 var v = {
-    a:  };
+    a: 
+};
--- a/tests/baselines/reference/objectTypesWithOptionalProperties2.js
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.js
@ -42,5 +42,6 @@ var C2 = (function () {
    return C2;
 })();
 var b = {
-    x: function () { }, 1:  // error
+    x: function () { },
+    1:  // error
 };
--- a/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression1.js
+++ b/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression1.js
@ -3,5 +3,4 @@ var v = [1, 2, 3
 4, 5, 6, 7];

 //// [parserErrorRecoveryArrayLiteralExpression1.js]
-var v = [1, 2, 3,
-    4, 5, 6, 7];
+var v = [1, 2, 3, 4, 5, 6, 7];
--- a/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression2.js
+++ b/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression2.js
@ -5,5 +5,4 @@ var points = [-0.6961439251899719, 1.207661509513855, 0.19374050199985504, -0


 //// [parserErrorRecoveryArrayLiteralExpression2.js]
-var points = [-0.6961439251899719, 1.207661509513855, 0.19374050199985504, -0,
-    .7042760848999023, 1.1955541372299194, 0.19600726664066315, -0.7120069861412048];
+var points = [-0.6961439251899719, 1.207661509513855, 0.19374050199985504, -0, .7042760848999023, 1.1955541372299194, 0.19600726664066315, -0.7120069861412048];
--- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js
+++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js
@ -3,5 +3,4 @@ var v = { a
 return;

 //// [parserErrorRecovery_ObjectLiteral2.js]
-var v = { a: ,
-    return:  };
+var v = { a: , return:  };
--- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js
+++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js
@ -3,5 +3,4 @@ var v = { a:
 return;

 //// [parserErrorRecovery_ObjectLiteral3.js]
-var v = { a: ,
-    return:  };
+var v = { a: , return:  };
--- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js
+++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js
@ -3,5 +3,4 @@ var v = { a: 1
 return;

 //// [parserErrorRecovery_ObjectLiteral4.js]
-var v = { a: 1,
-    return:  };
+var v = { a: 1, return:  };
--- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js
+++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js
@ -3,5 +3,4 @@ var v = { a: 1,
 return;

 //// [parserErrorRecovery_ObjectLiteral5.js]
-var v = { a: 1,
-    return:  };
+var v = { a: 1, return:  };
--- a/tests/baselines/reference/parserharness.js
+++ b/tests/baselines/reference/parserharness.js
@ -2627,7 +2627,9 @@ var Harness;
                    var description = b.description + (prop ? ": " + prop : '');
                    emitLog('testStart', { desc: description });
                    emitLog('pass', {
-                        desc: description, pass: true, perfResults: {
+                        desc: description,
+                        pass: true,
+                        perfResults: {
                            mean: b.results[prop].mean(),
                            min: b.results[prop].min(),
                            max: b.results[prop].max(),
--- a/tests/baselines/reference/privateIndexer2.js
+++ b/tests/baselines/reference/privateIndexer2.js
@ -11,12 +11,6 @@ var y: {

 //// [privateIndexer2.js]
 // private indexers not allowed
-<<<<<<< HEAD
-var x = {
-    [x]: string, string: 
-};
-=======
 var x = (_a = {}, _a[x] = string, _a.string = , _a);
->>>>>>> master
 var y;
 var _a;
--- a/tests/baselines/reference/symbolDeclarationEmit10.js
+++ b/tests/baselines/reference/symbolDeclarationEmit10.js
@ -6,9 +6,7 @@ var obj = {

 //// [symbolDeclarationEmit10.js]
 var obj = {
-    get [Symbol.isConcatSpreadable]() {
-        return '';
-    },
+    get [Symbol.isConcatSpreadable]() { return ''; },
    set [Symbol.isConcatSpreadable](x) { }
 };

--- a/tests/baselines/reference/symbolDeclarationEmit11.js
+++ b/tests/baselines/reference/symbolDeclarationEmit11.js
@ -12,9 +12,7 @@ var C = (function () {
    }
    C[Symbol.toPrimitive] = function () { };
    Object.defineProperty(C, Symbol.isRegExp, {
-        get: function () {
-            return "";
-        },
+        get: function () { return ""; },
        set: function (x) { },
        enumerable: true,
        configurable: true
--- a/tests/baselines/reference/symbolDeclarationEmit12.js
+++ b/tests/baselines/reference/symbolDeclarationEmit12.js
@ -23,9 +23,7 @@ var M;
            return undefined;
        };
        Object.defineProperty(C.prototype, Symbol.isRegExp, {
-            get: function () {
-                return undefined;
-            },
+            get: function () { return undefined; },
            set: function (x) { },
            enumerable: true,
            configurable: true
--- a/tests/baselines/reference/symbolDeclarationEmit13.js
+++ b/tests/baselines/reference/symbolDeclarationEmit13.js
@ -9,9 +9,7 @@ var C = (function () {
    function C() {
    }
    Object.defineProperty(C.prototype, Symbol.isRegExp, {
-        get: function () {
-            return "";
-        },
+        get: function () { return ""; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/symbolDeclarationEmit14.js
+++ b/tests/baselines/reference/symbolDeclarationEmit14.js
@ -9,16 +9,12 @@ var C = (function () {
    function C() {
    }
    Object.defineProperty(C.prototype, Symbol.isRegExp, {
-        get: function () {
-            return "";
-        },
+        get: function () { return ""; },
        enumerable: true,
        configurable: true
    });
    Object.defineProperty(C.prototype, Symbol.toStringTag, {
-        get: function () {
-            return "";
-        },
+        get: function () { return ""; },
        enumerable: true,
        configurable: true
    });
--- a/tests/baselines/reference/symbolDeclarationEmit4.js
+++ b/tests/baselines/reference/symbolDeclarationEmit4.js
@ -9,9 +9,7 @@ var C = (function () {
    function C() {
    }
    Object.defineProperty(C.prototype, Symbol.isRegExp, {
-        get: function () {
-            return "";
-        },
+        get: function () { return ""; },
        set: function (x) { },
        enumerable: true,
        configurable: true
--- a/tests/baselines/reference/symbolProperty18.js
+++ b/tests/baselines/reference/symbolProperty18.js
@ -12,9 +12,7 @@ i[Symbol.toPrimitive] = false;
 //// [symbolProperty18.js]
 var i = {
    [Symbol.iterator]: 0,
-    [Symbol.toStringTag]() {
-        return "";
-    },
+    [Symbol.toStringTag]() { return ""; },
    set [Symbol.toPrimitive](p) { }
 };
 var it = i[Symbol.iterator];
--- a/tests/baselines/reference/symbolProperty19.js
+++ b/tests/baselines/reference/symbolProperty19.js
@ -10,9 +10,7 @@ var str = i[Symbol.toStringTag]();
 //// [symbolProperty19.js]
 var i = {
    [Symbol.iterator]: { p: null },
-    [Symbol.toStringTag]() {
-        return { p: undefined };
-    }
+    [Symbol.toStringTag]() { return { p: undefined }; }
 };
 var it = i[Symbol.iterator];
 var str = i[Symbol.toStringTag]();
--- a/tests/baselines/reference/symbolProperty20.js
+++ b/tests/baselines/reference/symbolProperty20.js
@ -12,7 +12,5 @@ var i: I = {
 //// [symbolProperty20.js]
 var i = {
    [Symbol.iterator]: s => { return s; },
-    [Symbol.toStringTag](n) {
-        return n;
-    }
+    [Symbol.toStringTag](n) { return n; }
 };
--- a/tests/baselines/reference/targetTypeTest1.js
+++ b/tests/baselines/reference/targetTypeTest1.js
@ -108,9 +108,6 @@ function C(a, b) {
    this.a = a;
    this.b = b;
 }
-C.prototype = { a: 0,
-    b: 0,
-    C1M1: function (c, d) {
-        return (this.a + c) + (this.b + d);
-    }
-};
+C.prototype = { a: 0, b: 0, C1M1: function (c, d) {
+    return (this.a + c) + (this.b + d);
+} };
--- a/tests/baselines/reference/templateStringInObjectLiteral.js
+++ b/tests/baselines/reference/templateStringInObjectLiteral.js
@ -6,5 +6,6 @@ var x = {

 //// [templateStringInObjectLiteral.js]
 var x = {
-    a: "abc" + 123 + "def" } "b";
+    a: "abc" + 123 + "def"
+} "b";
 321;
--- a/tests/baselines/reference/templateStringInObjectLiteralES6.js
+++ b/tests/baselines/reference/templateStringInObjectLiteralES6.js
@ -6,5 +6,6 @@ var x = {

 //// [templateStringInObjectLiteralES6.js]
 var x = {
-    a: `abc${123}def`, } `b`;
+    a: `abc${123}def`,
+} `b`;
 321;
--- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.js
+++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.js
@ -29,7 +29,8 @@ var menuData = [
        "type": "image",
        "link": "",
        "icon": "modules/menu/logo.svg"
-    }, {
+    },
+    {
        "id": "productName",
        "type": "default",
        "link": "",
--- a/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.js
+++ b/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.js
@ -9,8 +9,8 @@ var functions = [function () {

 //// [typeCheckingInsideFunctionExpressionInArray.js]
 var functions = [function () {
-        var k = 10;
-        k = new Object();
-        [1, 2, 3].NonexistantMethod();
-        derp();
-    }];
+    var k = 10;
+    k = new Object();
+    [1, 2, 3].NonexistantMethod();
+    derp();
+}];
--- a/tests/baselines/reference/undefinedSymbolReferencedInArrayLiteral1.js
+++ b/tests/baselines/reference/undefinedSymbolReferencedInArrayLiteral1.js
@ -11,6 +11,6 @@ var functions = [function() {
 //// [undefinedSymbolReferencedInArrayLiteral1.js]
 var tokens = [{ startIndex: deltaOffset }];
 var functions = [function () {
-        [1, 2, 3].NonexistantMethod();
-        anotherNonExistingMethod();
-    }];
+    [1, 2, 3].NonexistantMethod();
+    anotherNonExistingMethod();
+}];
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints3.js
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints3.js
@ -30,6 +30,6 @@ var C = (function () {
 })();
 var c = new C({ length: 2 });
 var r = c.foo({ length: 3, charAt: function (x) {
-        '';
-    } });
+    '';
+} });
 var r2 = r('');
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints4.js
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints4.js
@ -28,5 +28,5 @@ var C = (function () {
 var c = new C({ length: 2 });
 var r = c.foo('');
 var r2 = r({ length: 3, charAt: function (x) {
-        '';
-    } }); // error
+    '';
+} }); // error