do not handle whitespace in comma-delimited binary expressions

ovr · Aug 1, 2013 · e6bd303 · e6bd303
1 parent d5205bb
commit e6bd303
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/bin/tslint-cli.js b/bin/tslint-cli.js
@@ -27323,11 +27323,14 @@ var Lint;
             };
 
             WhitespaceWalker.prototype.visitBinaryExpression = function (node) {
-                var position = this.positionAfter(node.left);
-                this.checkForLeadingSpace(position, node.left.trailingTrivia());
+                var operator = node.operatorToken;
+                if (operator.kind() !== TypeScript.SyntaxKind.CommaToken) {
+                    var position = this.positionAfter(node.left);
+                    this.checkForLeadingSpace(position, node.left.trailingTrivia());
 
-                position += node.operatorToken.fullWidth();
-                this.checkForLeadingSpace(position, node.operatorToken.trailingTrivia());
+                    position += operator.fullWidth();
+                    this.checkForLeadingSpace(position, operator.trailingTrivia());
+                }
 
                 _super.prototype.visitBinaryExpression.call(this, node);
             };

diff --git a/lib/tslint.js b/lib/tslint.js
@@ -27323,11 +27323,14 @@ var Lint;
             };
 
             WhitespaceWalker.prototype.visitBinaryExpression = function (node) {
-                var position = this.positionAfter(node.left);
-                this.checkForLeadingSpace(position, node.left.trailingTrivia());
+                var operator = node.operatorToken;
+                if (operator.kind() !== TypeScript.SyntaxKind.CommaToken) {
+                    var position = this.positionAfter(node.left);
+                    this.checkForLeadingSpace(position, node.left.trailingTrivia());
 
-                position += node.operatorToken.fullWidth();
-                this.checkForLeadingSpace(position, node.operatorToken.trailingTrivia());
+                    position += operator.fullWidth();
+                    this.checkForLeadingSpace(position, operator.trailingTrivia());
+                }
 
                 _super.prototype.visitBinaryExpression.call(this, node);
             };

diff --git a/src/rules/whitespaceRule.ts b/src/rules/whitespaceRule.ts
@@ -56,13 +56,16 @@ module Lint.Rules {
             }
         }
 
-        // check for spaces between the operator symbol
+        // check for spaces between the operator symbol (except in the case of comma statements)
         public visitBinaryExpression(node: TypeScript.BinaryExpressionSyntax): void {
-            var position = this.positionAfter(node.left);
-            this.checkForLeadingSpace(position, node.left.trailingTrivia());
+            var operator = node.operatorToken;
+            if(operator.kind() !== TypeScript.SyntaxKind.CommaToken) {
+                var position = this.positionAfter(node.left);
+                this.checkForLeadingSpace(position, node.left.trailingTrivia());
 
-            position += node.operatorToken.fullWidth();
-            this.checkForLeadingSpace(position, node.operatorToken.trailingTrivia());
+                position += operator.fullWidth();
+                this.checkForLeadingSpace(position, operator.trailingTrivia());
+            }
 
             super.visitBinaryExpression(node);
         }