Fix: disallowSpaceAfterObjectKeys - Allow no space after key with align option.

Fixes #1818
Closes gh-1857

Author: Andrey Ermakov

lib/rules/disallow-space-after-object-keys.js

@@ -163,9 +163,26 @@ module.exports.prototype = {
                 tokens.push(keyToken);
             });
 
+            var noSpace = true;
+            if (exceptAligned) {
+                var withoutSpace = 0;
+                var alignedOnColon = 0;
+                tokens.forEach(function(key) {
+                    var colon = file.getNextToken(key);
+                    var spaces = Math.abs(colon.range[0] - key.range[1]);
+                    if (spaces === 0) {
+                        withoutSpace++;
+                    } else if (spaces === maxKeyEndPos - key.loc.end.column) {
+                        alignedOnColon++;
+                    }
+                });
+
+                noSpace = withoutSpace > alignedOnColon;
+            }
+
             tokens.forEach(function(key) {
                 var colon = file.getNextToken(key);
-                var spaces = exceptAligned ? maxKeyEndPos - key.loc.end.column : 0;
+                var spaces = (exceptAligned && !noSpace) ? maxKeyEndPos - key.loc.end.column : 0;
                 errors.assert.spacesBetween({
                     token: key,
                     nextToken: colon,

test/specs/rules/disallow-space-after-object-keys.js

@@ -150,6 +150,25 @@ describe('rules/disallow-space-after-object-keys', function() {
                         '};'
                     )).to.have.no.errors();
                 });
+
+                it('should not report keys with no space after them #1818', function() {
+                    expect(checker.checkString(
+                        'var f = {\n' +
+                        '  "name": 1,\n' +
+                        '  "x": 2\n' +
+                        '};'
+                    )).to.have.no.errors();
+                });
+
+                it('should report objects with both keys without spaces and aligned on colon #1818', function() {
+                    expect(checker.checkString(
+                      'var f = {\n' +
+                      '  "n": 1,\n' +
+                      '  "xasdf"   : 2,\n' +
+                      '  "fyfyasdf": 0\n' +
+                      '};'
+                    )).to.have.error.count.equal(1);
+                });
             });
 
             describe('with method value', function() {

test/specs/rules/require-aligned-object-values.js

@@ -157,7 +157,7 @@ describe('rules/require-aligned-object-values', function() {
                     'bcd : 2\n' +
                 '};',
                 output: 'var x = {\n' +
-                    'a  : 1,\n' +
+                    'a: 1,\n' +
                     'foo: function() {},\n' +
                     'bcd: 2\n' +
                 '};'