requireSpacesInGenerator: port improved logic, fix spelling

Author: hzoo

lib/rules/disallow-spaces-in-generator.js

@@ -89,11 +89,11 @@ module.exports.prototype = {
             }
 
             var parent = node.parentNode;
-            var shortland = false;
+            var shorthand = false;
 
             // shorthand or constructor methods
             if (parent.method || parent.type === 'MethodDefinition') {
-                shortland = true;
+                shorthand = true;
                 node = parent.key;
             }
 
@@ -103,7 +103,7 @@ module.exports.prototype = {
                 currentToken = file.getNextToken(currentToken);
             }
 
-            if (beforeStar && !shortland) {
+            if (beforeStar && !shorthand) {
                 // currentToken assigned outside of function
                 errors.assert.noWhitespaceBetween({
                     token: currentToken,
@@ -113,22 +113,18 @@ module.exports.prototype = {
             }
 
             if (afterStar) {
-                if (shortland) {
-                    errors.assert.noWhitespaceBetween({
-                        token: file.getPrevToken(currentToken),
-                        nextToken: currentToken,
-                        message: 'Illegal space after star'
-                    });
+                if (shorthand) {
+                    currentToken = file.getPrevToken(currentToken);
                 } else {
-
                     // currentToken reassigned for star token
                     currentToken = file.getNextToken(currentToken);
-                    errors.assert.noWhitespaceBetween({
-                        token: currentToken,
-                        nextToken: file.getNextToken(currentToken),
-                        message: 'Illegal space after star'
-                    });
                 }
+
+                errors.assert.noWhitespaceBetween({
+                    token: currentToken,
+                    nextToken: file.getNextToken(currentToken),
+                    message: 'Illegal space after star'
+                });
             }
         });
     }

lib/rules/require-spaces-in-generator.js

@@ -79,14 +79,11 @@ module.exports.prototype = {
             }
 
             var parent = node.parentNode;
-
-            // Ignore syntactic sugar for getters and setters.
-            if (parent.type === 'Property' && (parent.kind === 'get' || parent.kind === 'set')) {
-                return;
-            }
+            var shorthand = false;
 
             // shorthand or constructor methods
             if (parent.method || parent.type === 'MethodDefinition') {
+                shorthand = true;
                 node = parent.key;
             }
 
@@ -96,7 +93,7 @@ module.exports.prototype = {
                 currentToken = file.getNextToken(currentToken);
             }
 
-            if (beforeStar) {
+            if (beforeStar && !shorthand) {
                 // currentToken assigned outside of function
                 errors.assert.whitespaceBetween({
                     token: currentToken,
@@ -106,8 +103,13 @@ module.exports.prototype = {
             }
 
             if (afterStar) {
-                // currentToken reassigned for star token
-                currentToken = file.getNextToken(currentToken);
+                if (shorthand) {
+                    currentToken = file.getPrevToken(currentToken);
+                } else {
+                    // currentToken reassigned for star token
+                    currentToken = file.getNextToken(currentToken);
+                }
+
                 errors.assert.whitespaceBetween({
                     token: currentToken,
                     nextToken: file.getNextToken(currentToken),

test/specs/rules/disallow-spaces-in-generator.js

@@ -67,7 +67,7 @@ describe('rules/disallow-spaces-in-generator', function() {
             output: 'var x = function*asdf(){}'
         });
 
-        it('should not report shortland method (since it doesn\' makes sense)', function() {
+        it('should not report shorthand method', function() {
             expect(checker.checkString('({ * foo() {} });')).to.have.no.errors();
         });
 
@@ -163,7 +163,7 @@ describe('rules/disallow-spaces-in-generator', function() {
         });
 
         reportAndFix({
-            name: 'should report illegal space after the star for the shortland',
+            name: 'should report illegal space after the star for the shorthand',
             rules: rules,
             errors: 1,
             input: '({ * foo() {} });',

test/specs/rules/require-spaces-in-generator.js

@@ -91,15 +91,31 @@ describe('rules/require-spaces-in-generator', function() {
             output: 'var x = function * asdf(){}'
         });
 
+        reportAndFix({
+            name: 'should report missing space after the star for the shorthand',
+            rules: rules,
+            errors: 1,
+            input: '({ *foo() {} });',
+            output: '({ * foo() {} });'
+        });
+
+        it('should not report shorthand method', function() {
+            expect(checker.checkString('({ * foo() {} })')).to.have.no.errors();
+        });
+
         it('should not report missing spaces error', function() {
             expect(checker.checkString('var x = function * (){}')).to.have.no.errors();
         });
 
+        it('should bail out if this is not a generator', function() {
+            expect(checker.checkString('var x = function (){}')).to.have.no.errors();
+        });
+
         it('should not report missing spaces error with named function', function() {
             expect(checker.checkString('var x = function * asdf(){}')).to.have.no.errors();
         });
 
-        it('should not report missing spaces error with function delcaration', function() {
+        it('should not report missing spaces error with function declaration', function() {
             expect(checker.checkString('function * asdf(){}')).to.have.no.errors();
         });