(require|disallow)TrailingComma: fixed error location

Fixes #1018
Closes gh-1019

Author: Alexej Yaroshevich

lib/token-assert.js

@@ -152,8 +152,8 @@ TokenAssert.prototype.tokenBefore = function(options) {
         }
         this.emit('error', {
             message: message,
-            line: token.loc.start.line,
-            column: token.loc.start.column
+            line: actualTokenBefore.loc.end.line,
+            column: actualTokenBefore.loc.end.column
         });
     }
 };
@@ -177,8 +177,8 @@ TokenAssert.prototype.noTokenBefore = function(options) {
     ) {
         this.emit('error', {
             message: options.message || 'Illegal ' + expectedTokenBefore.value + ' was found before ' + token.value,
-            line: token.loc.start.line,
-            column: token.loc.start.column
+            line: actualTokenBefore.loc.end.line,
+            column: actualTokenBefore.loc.end.column
         });
     }
 };

test/rules/disallow-trailing-comma.js

@@ -24,4 +24,14 @@ describe('rules/disallow-trailing-comma', function() {
         assert(checker.checkString('var x = [1, 2,\n]').getErrorCount() === 1);
     });
 
+    it('should report right location for trailing comma in object (#1018)', function() {
+        var errs = checker.checkString('var obj = {\n    foo: "foo",\n};').getErrorList();
+        assert.equal(errs[0].line + ':' + errs[0].column, '2:15');
+    });
+
+    it('should report right location for trailing comma in array (#1018)', function() {
+        var errs = checker.checkString('var arr = [\n    \'foo\',\n];').getErrorList();
+        assert.equal(errs[0].line + ':' + errs[0].column, '2:10');
+    });
+
 });

test/rules/require-trailing-comma.js

@@ -45,6 +45,16 @@ describe('rules/require-trailing-comma', function() {
         it('should not report array access (#368)', function() {
             assert(checker.checkString('var foo = [\'Hello World\',\n];\nvar bar = foo[0];').getErrorCount() === 0);
         });
+
+        it('should report right location for no trailing comma in object (#1018)', function() {
+            var errs = checker.checkString('var obj = {\n    foo: "foo"\n};').getErrorList();
+            assert.equal(errs[0].line + ':' + errs[0].column, '2:14');
+        });
+
+        it('should report right location for no trailing comma in array (#1018)', function() {
+            var errs = checker.checkString('var arr = [\n    \'foo\'\n];').getErrorList();
+            assert.equal(errs[0].line + ':' + errs[0].column, '2:9');
+        });
     });
 
     describe('ignoreSingleValue', function() {