requireDictionaryWords: Add identifier options

Author: jacksonrayhamilton

lib/rules/require-dictionary-words.js

@@ -208,8 +208,10 @@ module.exports.prototype = {
 
         var wordDictionaries = ['english'];
         var allowedWords;
+        var allowedIdentifierWords;
         var allowedPropertyWords;
         var allowedNames;
+        var allowedIdentifierNames;
         var allowedPropertyNames;
         var excludedWords;
 
@@ -228,8 +230,10 @@ module.exports.prototype = {
         if (wasObject) {
             wordDictionaries = arrayOption('dictionaries') || wordDictionaries;
             allowedWords = arrayOption('allowWords');
+            allowedIdentifierWords = arrayOption('allowWordsInIdentifiers');
             allowedPropertyWords = arrayOption('allowWordsInProperties');
             allowedNames = arrayOption('allowNames');
+            allowedIdentifierNames = arrayOption('allowNamesAsIdentifiers');
             allowedPropertyNames = arrayOption('allowNamesAsProperties');
             excludedWords = arrayOption('excludeWords');
         }
@@ -257,6 +261,11 @@ module.exports.prototype = {
             this._wordDictionaries.push(allowedWords);
         }
 
+        this._identifierWordDictionaries = this._wordDictionaries.slice();
+        if (allowedIdentifierWords) {
+            this._identifierWordDictionaries.push(allowedIdentifierWords);
+        }
+
         this._propertyWordDictionaries = this._wordDictionaries.slice();
         if (allowedPropertyWords) {
             this._propertyWordDictionaries.push(allowedPropertyWords);
@@ -267,6 +276,11 @@ module.exports.prototype = {
             this._nameDictionaries.push(allowedNames);
         }
 
+        this._identifierNameDictionaries = this._nameDictionaries.slice();
+        if (allowedIdentifierNames) {
+            this._identifierNameDictionaries.push(allowedIdentifierNames);
+        }
+
         this._propertyNameDictionaries = this._nameDictionaries.slice();
         if (allowedPropertyNames) {
             this._propertyNameDictionaries.push(allowedPropertyNames);
@@ -294,10 +308,10 @@ module.exports.prototype = {
             }
         }
 
-        function checkIdentifierOrProperty(name, start) {
+        function checkIdentifier(name, start) {
             check(
-                _this._wordDictionaries,
-                _this._nameDictionaries,
+                _this._identifierWordDictionaries,
+                _this._identifierNameDictionaries,
                 name,
                 start
             );
@@ -316,7 +330,7 @@ module.exports.prototype = {
             if (!isSignificantNode(node)) {
                 return;
             }
-            checkIdentifierOrProperty(node.name, node.loc.start);
+            checkIdentifier(node.name, node.loc.start);
         });
 
         file.iterateNodesByType('MemberExpression', function(node) {