Assertions: always allow new lines in whitespaceBetween

Fixes gh-791
Closes gh-794

Author: hzoo

README.md

@@ -3459,15 +3459,16 @@ function(d) {
 
 ### validateParameterSeparator
 
-Enable validation of separators between function parameters.
+Enable validation of separators between function parameters. Will ignore newlines.
 
 Type: `String`
 
 Values:
 
- - `", "`: function parameters are immediately followed by a comma then a space
- - `" ,"`: function parameters are immediately followed by a space then a comma
- - `" , "`: function parameters are immediately followed by a space, a comma then a space
+ - `","`: function parameters are immediately followed by a comma
+ - `", "`: function parameters are immediately followed by a comma and then a space
+ - `" ,"`: function parameters are immediately followed by a space and then a comma
+ - `" , "`: function parameters are immediately followed by a space, a comma, and then a space
 
 #### Example
 

lib/token-assert.js

@@ -16,7 +16,7 @@ function TokenAssert(file) {
 utils.inherits(TokenAssert, EventEmitter);
 
 /**
- * Requires to have whitespace between specified tokens.
+ * Requires to have whitespace between specified tokens. Ignores newlines.
  *
  * @param {Object} options.token
  * @param {Object} options.nextToken
@@ -28,7 +28,7 @@ TokenAssert.prototype.whitespaceBetween = function(options) {
     var nextToken = options.nextToken;
     if (options.hasOwnProperty('spaces')) {
         var spaces = options.spaces;
-        if (nextToken.loc.start.line !== token.loc.end.line ||
+        if (nextToken.loc.start.line === token.loc.end.line &&
             (nextToken.loc.start.column - token.loc.end.column) !== spaces
         ) {
             this.emit('error', {

test/rules/validate-parameter-separator.js

@@ -108,6 +108,10 @@ describe('rules/validate-parameter-separator', function() {
             assert.strictEqual(checker.checkString('function a(b\n, c) {}').getErrorCount(), 0);
         });
 
+        it('should not report any errors for function a(b,<line-break>c) {}', function() {
+            assert.strictEqual(checker.checkString('function a(b,\nc) {}').getErrorCount(), 0);
+        });
+
         it('should report errors for function a(b,<space><space>c) {}', function() {
             assert.strictEqual(checker.checkString('function a(b,  c) {}').getErrorCount(), 1);
         });
@@ -143,7 +147,11 @@ describe('rules/validate-parameter-separator', function() {
             assert.strictEqual(checker.checkString('function a(b ,c) {}').getErrorCount(), 0);
         });
 
-        it('should not report any errors for function a(b,<line-break>c) {}', function() {
+        it('should not report any errors for function a(b<line-break>,c) {}', function() {
+            assert.strictEqual(checker.checkString('function a(b\n,c) {}').getErrorCount(), 0);
+        });
+
+        it('should not report any errors for function a(b ,<line-break>c) {}', function() {
             assert.strictEqual(checker.checkString('function a(b ,\nc) {}').getErrorCount(), 0);
         });
 
@@ -182,6 +190,14 @@ describe('rules/validate-parameter-separator', function() {
             assert.strictEqual(checker.checkString('function a(b , c) {}').getErrorCount(), 0);
         });
 
+        it('should not report any errors for function a(b<line-break>, c) {}', function() {
+            assert.strictEqual(checker.checkString('function a(b\n, c) {}').getErrorCount(), 0);
+        });
+
+        it('should not report any errors for function a(b ,<line-break>c) {}', function() {
+            assert.strictEqual(checker.checkString('function a(b ,\nc) {}').getErrorCount(), 0);
+        });
+
         it('should report errors for function a(b<space>,<space><space>c) {}', function() {
             assert.strictEqual(checker.checkString('function a(b ,  c) {}').getErrorCount(), 1);
         });

test/token-assert.js

@@ -91,7 +91,7 @@ describe('modules/token-assert', function() {
             assert.equal(error.column, 1);
         });
 
-        it('should trigger error on newline between tokens', function() {
+        it('should not trigger error on newline between tokens', function() {
             var file = createJsFile('x\n=y;');
 
             var tokenAssert = new TokenAssert(file);
@@ -105,12 +105,7 @@ describe('modules/token-assert', function() {
                 spaces: 2
             });
 
-            assert(onError.calledOnce);
-
-            var error = onError.getCall(0).args[0];
-            assert.equal(error.message, '2 spaces required between x and =');
-            assert.equal(error.line, 1);
-            assert.equal(error.column, 1);
+            assert(!onError.calledOnce);
         });
 
         it('should not trigger error on valid space count between tokens', function() {