Merge branch 'binaryExprAlloc'

Conflicts:
	src/compiler/emitter.ts

Author: CyrusNajmabadi

src/compiler/emitter.ts

@@ -3088,68 +3088,17 @@ module ts {
 
                     write(tokenToString(node.operatorToken.kind));
 
-                    // We'd like to preserve newlines found in the original binary expression.  i.e. if a user has:
-                    //
-                    //      Foo() ||
-                    //          Bar();
-                    //
-                    // Then we'd like to emit it as such.  It seems like we'd only need to check for a newline and
-                    // then just indent and emit.  However, that will lead to a problem with deeply nested code.
-                    // i.e. if you have:
-                    //
-                    //      Foo() ||
-                    //          Bar() ||
-                    //          Baz();
-                    //
-                    // Then we don't want to emit it as:
-                    //
-                    //      Foo() ||
-                    //          Bar() ||
-                    //              Baz();
-                    //
-                    // So we only indent if the right side of the binary expression starts further in on the line 
-                    // versus the left.
-
-                    // Check if the right expression is on a different line versus the operator itself.  If so,
-                    // we'll emit newline.
                     if (!nodeEndIsOnSameLineAsNodeStart(node.operatorToken, node.right)) {
-                        var rightStart = getLineAndCharacterOfPosition(currentSourceFile, skipTrivia(currentSourceFile.text, node.right.pos));
-
-                        // Also, if the right expression starts further in on the line than the left, then we'll indent.
-                        var exprStart = getLineAndCharacterOfPosition(currentSourceFile, skipTrivia(currentSourceFile.text, node.pos));
-                        var firstCharOfExpr = getFirstNonWhitespaceCharacterIndexOnLine(exprStart.line);
-                        var shouldIndent = rightStart.character > firstCharOfExpr;
-
-                        if (shouldIndent) {
-                            increaseIndent();
-                        }
-
+                        increaseIndent();
                         writeLine();
+                        emit(node.right);
+                        decreaseIndent();
                     }
                     else {
                         write(" ");
-                    }
-
-                    emit(node.right);
-
-                    if (shouldIndent) {
-                        decreaseIndent();
-                    }
-                }
-            }
-
-            function getFirstNonWhitespaceCharacterIndexOnLine(line: number): number {
-                var lineStart = getLineStarts(currentSourceFile)[line];
-                var text = currentSourceFile.text;
-
-                for (var i = lineStart; i < text.length; i++) {
-                    var ch = text.charCodeAt(i);
-                    if (!isWhiteSpace(text.charCodeAt(i)) || isLineBreak(ch)) {
-                        break;
+                        emit(node.right);
                     }
                 }
-
-                return i - lineStart;
             }
 
             function emitConditionalExpression(node: ConditionalExpression) {

tests/baselines/reference/ES5SymbolProperty1.js

@@ -13,7 +13,7 @@ obj[Symbol.foo];
 //// [ES5SymbolProperty1.js]
 var Symbol;
 var obj = (_a = {}, _a[Symbol.foo] =
-0,
-_a);
+    0,
+    _a);
 obj[Symbol.foo];
 var _a;

tests/baselines/reference/FunctionDeclaration8_es6.js

@@ -3,6 +3,6 @@ var v = { [yield]: foo }
 
 //// [FunctionDeclaration8_es6.js]
 var v = (_a = {}, _a[yield] =
-foo,
-_a);
+    foo,
+    _a);
 var _a;

tests/baselines/reference/FunctionDeclaration9_es6.js

@@ -6,7 +6,7 @@ function * foo() {
 //// [FunctionDeclaration9_es6.js]
 function foo() {
     var v = (_a = {}, _a[] =
-    foo,
-    _a);
+        foo,
+        _a);
     var _a;
 }

tests/baselines/reference/FunctionPropertyAssignments5_es6.js

@@ -3,5 +3,5 @@ var v = { *[foo()]() { } }
 
 //// [FunctionPropertyAssignments5_es6.js]
 var v = (_a = {}, _a[foo()] = function () { },
-_a);
+    _a);
 var _a;

tests/baselines/reference/asiArith.js

@@ -38,8 +38,8 @@ y
 var x = 1;
 var y = 1;
 var z = x +
-+ +y;
+    + +y;
 var a = 1;
 var b = 1;
 var c = x -
-- -y;
+    - -y;

tests/baselines/reference/computedPropertyNames10_ES5.js

@@ -21,5 +21,5 @@ var s;
 var n;
 var a;
 var v = (_a = {}, _a[s] = function () { }, _a[n] = function () { }, _a[s + s] = function () { }, _a[s + n] = function () { }, _a[+s] = function () { }, _a[""] = function () { }, _a[0] = function () { }, _a[a] = function () { }, _a[true] = function () { }, _a["hello bye"] = function () { }, _a["hello " + a + " bye"] = function () { },
-_a);
+    _a);
 var _a;

tests/baselines/reference/computedPropertyNames11_ES5.js

@@ -21,5 +21,5 @@ 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);
+    _a);
 var _a;

tests/baselines/reference/computedPropertyNames18_ES5.js

@@ -8,7 +8,7 @@ function foo() {
 //// [computedPropertyNames18_ES5.js]
 function foo() {
     var obj = (_a = {}, _a[this.bar] =
-    0,
-    _a);
+        0,
+        _a);
     var _a;
 }

tests/baselines/reference/computedPropertyNames19_ES5.js

@@ -9,7 +9,7 @@ module M {
 var M;
 (function (M) {
     var obj = (_a = {}, _a[this.bar] =
-    0,
-    _a);
+        0,
+        _a);
     var _a;
 })(M || (M = {}));