ensure assignment-in-return statements are handled as well

resolves #25
Ma27 · Jan 12, 2017 · c1cd594 · c1cd594
1 parent 5e3f092
commit c1cd594
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 1 deletion.
diff --git a/lib/util/findNextPunctuators.js b/lib/util/findNextPunctuators.js
@@ -44,6 +44,13 @@ function gatherAssignmentsFromNodes(statements, source) {
         });
 
         return list.concat(punctuators);
+      case 'ReturnStatement':
+        if (stmt.argument && stmt.argument.type === 'AssignmentExpression') {
+          list.push(source.getTokensBetween(stmt.argument.left, stmt.argument.right).shift());
+        }
+        return list;
+      case 'ExportNamedDeclaration':
+        return list;
       default:
         return list;
     }
@@ -73,7 +80,7 @@ function checkDeclaration(declaration, punctuators) {
 
 
 function checkToken(stmt, previous, start) {
-  return -1 !== ['VariableDeclaration', 'AssignmentExpression', 'ExpressionStatement'].indexOf(stmt.type)
+  return -1 !== ['VariableDeclaration', 'AssignmentExpression', 'ExpressionStatement', 'ReturnStatement', 'ExportNamedDeclaration'].indexOf(stmt.type)
     && (typeof previous === 'undefined' || (start - previous.loc.end.line) === 1);
 }
 

diff --git a/test/lib/rules/var-spacing.rule.js b/test/lib/rules/var-spacing.rule.js
@@ -661,6 +661,23 @@ ruleTester.run('var-spacing', rule, {
       '        test79 = 12;',
       '}'
     ].join('\n')
+  }, {
+    code: [
+      'var a = "b";',
+      'function foo() {',
+      '  var b    = "c";',
+      '  return a = b;',
+      '}'
+    ].join('\n')
+  }, {
+    code: [
+      'var a = "b";',
+      'function foo() {',
+      '  var b    = "c",',
+      '      d    = "f";',
+      '  return a = b;',
+      '}'
+    ].join('\n')
   }],
   invalid: [{
     code: [
@@ -1687,5 +1704,45 @@ ruleTester.run('var-spacing', rule, {
     errors: [{
       message: 'Invalid indent!'
     }]
+  }, {
+    code: [
+      'var c;',
+      'function foo() {',
+      '  var a = "b";',
+      '  return c = a;',
+      '}'
+    ].join('\n'),
+    errors: [{
+      message: 'Invalid indent!'
+    }],
+    output: [
+      'var c;',
+      'function foo() {',
+      '  var a    = "b";',
+      '  return c = a;',
+      '}'
+    ].join('\n')
+  }, {
+    code: [
+      'var a = "b";',
+      'function foo() {',
+      '  var b  = "c",',
+      '      d = "f";',
+      '  return a = b;',
+      '}'
+    ].join('\n'),
+    errors: [{
+      message: 'Invalid indent!'
+    }, {
+      message: 'Invalid indent!'
+    }],
+    output: [
+      'var a = "b";',
+      'function foo() {',
+      '  var b    = "c",',
+      '      d    = "f";',
+      '  return a = b;',
+      '}'
+    ].join('\n')
   }]
 });