Fix: js-file - make parser not confuse token types

Fixes #1855
Closes gh-1864

Author: markelog

lib/js-file.js

@@ -929,7 +929,7 @@ JsFile.prototype = {
     },
 
     /**
-     * Temporary fix (I hope, two years and counting :-) for esprima tokenizer
+     * Temporary fix (I hope, two years and counting :-) for esprima/babylon tokenizer
      * (https://github.com/jquery/esprima/issues/317)
      * Fixes #83, #180
      *
@@ -938,11 +938,14 @@ JsFile.prototype = {
     _fixEsprimaIdentifiers: function() {
         var _this = this;
 
-        this.iterateNodesByType(['Property', 'MemberExpression'], function(node) {
+        this.iterateNodesByType(['Property', 'MethodDefinition', 'MemberExpression'], function(node) {
             switch (node.type) {
                 case 'Property':
                     convertKeywordToIdentifierIfRequired(node.key);
                     break;
+                case 'MethodDefinition':
+                    convertKeywordToIdentifierIfRequired(node.key);
+                    break;
                 case 'MemberExpression':
                     convertKeywordToIdentifierIfRequired(node.property);
                     break;
@@ -951,6 +954,7 @@ JsFile.prototype = {
 
         function convertKeywordToIdentifierIfRequired(node) {
             var token = _this.getTokenByRangeStart(node.range[0]);
+
             if (token.type === 'Keyword') {
                 token.type = 'Identifier';
             }

test/specs/js-file.js

@@ -1,10 +1,15 @@
+var fs = require('fs');
+
 var expect = require('chai').expect;
+var sinon = require('sinon');
+
 var esprima = require('esprima');
 var babelJscs = require('babel-jscs');
-var JsFile = require('../../lib/js-file');
-var sinon = require('sinon');
-var fs = require('fs');
+
 var assign = require('lodash').assign;
+var keywords = Object.keys(require('reserved-words').KEYWORDS[6]);
+
+var JsFile = require('../../lib/js-file');
 
 describe('js-file', function() {
 
@@ -62,6 +67,24 @@ describe('js-file', function() {
                 });
             });
 
+            it('should affect method definition tokens', function() {
+                var str = keywords.map(function(token) {
+                    return token + '() {}';
+                });
+
+                str = 'class test {\n' + str.join('\n') + '\n}';
+
+                createJsFile(str).getTokens().forEach(function(token, i) {
+
+                    // Exclude first "class"
+                    if (i === 0) {
+                        return;
+                    }
+
+                    expect(token.type).to.not.equal('Keyword');
+                });
+            });
+
             it('should affect member access tokens', function() {
                 var str = 'o.break(); o.export(); o.return(); o.case(); o.for(); o.switch(); o.comment();' +
                     'o.function(); o.this(); o.continue(); o.if(); o.typeof(); o.default(); o.import();' +