JavaScriptBench
diff --git a/Collapse file
‎src/services/formatting/rules.ts‎
Copy file name to clipboardExpand all lines: src/services/formatting/rules.ts
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/services/formatting/rules.ts‎
Copy file name to clipboardExpand all lines: src/services/formatting/rules.ts
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎tests/cases/fourslash/spaceBeforeAndAfterBinaryOperators.ts‎
Copy file name to clipboard
+32Lines changed: 32 additions & 0 deletions b/Collapse file
‎tests/cases/fourslash/spaceBeforeAndAfterBinaryOperators.ts‎
Copy file name to clipboard
+32Lines changed: 32 additions & 0 deletions
@@ -433,9 +433,9 @@ namespace ts.formatting {
     }
 
     function isBinaryOpContext(context: FormattingContext): boolean {
-
         switch (context.contextNode.kind) {
             case SyntaxKind.BinaryExpression:
+                return (<BinaryExpression>context.contextNode).operatorToken.kind !== SyntaxKind.CommaToken;
             case SyntaxKind.ConditionalExpression:
             case SyntaxKind.ConditionalType:
             case SyntaxKind.AsExpression:
 
@@ -0,0 +1,32 @@
+/// <reference path="fourslash.ts"/>
+
+////let i = 0;
+/////*1*/(i++,i++);
+/////*2*/(i++,++i);
+/////*3*/(1,2);
+/////*4*/(i++,2);
+/////*5*/(i++,i++,++i,i--,2);
+
+////let s = 'foo';
+/////*6*/for (var i = 0,ii = 2; i < s.length; ii++,i++) {
+////}
+
+format.document();
+
+goTo.marker("1");
+verify.currentLineContentIs(`(i++, i++);`);
+
+goTo.marker("2");
+verify.currentLineContentIs(`(i++, ++i);`);
+
+goTo.marker("3");
+verify.currentLineContentIs(`(1, 2);`);
+
+goTo.marker("4");
+verify.currentLineContentIs(`(i++, 2);`);
+
+goTo.marker("5");
+verify.currentLineContentIs(`(i++, i++, ++i, i--, 2);`);
+
+goTo.marker("6");
+verify.currentLineContentIs(`for (var i = 0, ii = 2; i < s.length; ii++, i++) {`);