Remove usage of context deprecated methods

jsx-eslint · Feb 12, 2016 · 442d20b · 442d20b
1 parent efa2630
commit 442d20b
Show file tree

Hide file tree

Showing 35 changed files with 236 additions and 87 deletions.
diff --git a/lib/rules/display-name.js b/lib/rules/display-name.js
@@ -12,6 +12,7 @@ var Components = require('../util/Components');
 
 module.exports = Components.detect(function(context, components, utils) {
 
+  var sourceCode = context.getSourceCode();
   var config = context.options[0] || {};
   var acceptTranspilerName = config.acceptTranspilerName || false;
 
@@ -26,7 +27,7 @@ module.exports = Components.detect(function(context, components, utils) {
     // Special case for class properties
     // (babel-eslint does not expose property name so we have to rely on tokens)
     if (node.type === 'ClassProperty') {
-      var tokens = context.getFirstTokens(node, 2);
+      var tokens = sourceCode.getFirstTokens(node, 2);
       if (
         tokens[0].value === 'displayName' ||
         (tokens[1] && tokens[1].value === 'displayName')
@@ -57,12 +58,13 @@ module.exports = Components.detect(function(context, components, utils) {
    * @param {Object} component The component to process
    */
   function reportMissingDisplayName(component) {
-    context.report(
-      component.node,
-      MISSING_MESSAGE, {
+    context.report({
+      node: component.node,
+      message: MISSING_MESSAGE,
+      data: {
         component: component.name
       }
-    );
+    });
   }
 
   /**

diff --git a/lib/rules/forbid-prop-types.js b/lib/rules/forbid-prop-types.js
@@ -75,7 +75,10 @@ module.exports = function(context) {
         target = value.name;
       }
       if (isForbidden(target)) {
-        context.report(declaration, 'Prop type `' + target + '` is forbidden');
+        context.report({
+          node: declaration,
+          message: 'Prop type `' + target + '` is forbidden'
+        });
       }
     });
   }

diff --git a/lib/rules/jsx-closing-bracket-location.js b/lib/rules/jsx-closing-bracket-location.js
@@ -19,6 +19,7 @@ module.exports = function(context) {
   };
   var DEFAULT_LOCATION = 'tag-aligned';
 
+  var sourceCode = context.getSourceCode();
   var config = context.options[0];
   var options = {
     nonEmpty: DEFAULT_LOCATION,
@@ -115,18 +116,18 @@ module.exports = function(context) {
    * prop and start of opening line.
    */
   function getTokensLocations(node) {
-    var opening = context.getFirstToken(node).loc.start;
-    var closing = context.getLastTokens(node, node.selfClosing ? 2 : 1)[0].loc.start;
-    var tag = context.getFirstToken(node.name).loc.start;
+    var opening = sourceCode.getFirstToken(node).loc.start;
+    var closing = sourceCode.getLastTokens(node, node.selfClosing ? 2 : 1)[0].loc.start;
+    var tag = sourceCode.getFirstToken(node.name).loc.start;
     var lastProp;
     if (node.attributes.length) {
       lastProp = node.attributes[node.attributes.length - 1];
       lastProp = {
-        column: context.getFirstToken(lastProp).loc.start.column,
-        line: context.getLastToken(lastProp).loc.end.line
+        column: sourceCode.getFirstToken(lastProp).loc.start.column,
+        line: sourceCode.getLastToken(lastProp).loc.end.line
       };
     }
-    var openingLine = context.getSourceCode().lines[opening.line - 1];
+    var openingLine = sourceCode.lines[opening.line - 1];
     var openingStartOfLine = {
       column: /^\s*/.exec(openingLine)[0].length,
       line: opening.line

diff --git a/lib/rules/jsx-curly-spacing.js b/lib/rules/jsx-curly-spacing.js
@@ -15,6 +15,8 @@
 // ------------------------------------------------------------------------------
 
 module.exports = function(context) {
+
+  var sourceCode = context.getSourceCode();
   var spaced = context.options[0] === 'always';
   var multiline = context.options[1] ? context.options[1].allowMultiline : true;
 
@@ -192,8 +194,8 @@ module.exports = function(context) {
     JSXExpressionContainer: function(node) {
       var first = context.getFirstToken(node);
       var second = context.getFirstToken(node, 1);
-      var penultimate = context.getLastToken(node, 1);
-      var last = context.getLastToken(node);
+      var penultimate = sourceCode.getLastToken(node, 1);
+      var last = sourceCode.getLastToken(node);
 
       if (first === penultimate && second === last) {
         return;

diff --git a/lib/rules/jsx-equals-spacing.js b/lib/rules/jsx-equals-spacing.js
@@ -40,22 +40,34 @@ module.exports = function(context) {
           default:
           case 'never':
             if (spacedBefore) {
-              context.report(attrNode, equalToken.loc.start,
-                'There should be no space before \'=\'');
+              context.report({
+                node: attrNode,
+                loc: equalToken.loc.start,
+                message: 'There should be no space before \'=\''
+              });
             }
             if (spacedAfter) {
-              context.report(attrNode, equalToken.loc.start,
-                'There should be no space after \'=\'');
+              context.report({
+                node: attrNode,
+                loc: equalToken.loc.start,
+                message: 'There should be no space after \'=\''
+              });
             }
             break;
           case 'always':
             if (!spacedBefore) {
-              context.report(attrNode, equalToken.loc.start,
-                'A space is required before \'=\'');
+              context.report({
+                node: attrNode,
+                loc: equalToken.loc.start,
+                message: 'A space is required before \'=\''
+              });
             }
             if (!spacedAfter) {
-              context.report(attrNode, equalToken.loc.start,
-                'A space is required after \'=\'');
+              context.report({
+                node: attrNode,
+                loc: equalToken.loc.start,
+                message: 'A space is required after \'=\''
+              });
             }
             break;
         }

diff --git a/lib/rules/jsx-handler-names.js b/lib/rules/jsx-handler-names.js
@@ -10,6 +10,7 @@
 
 module.exports = function(context) {
 
+  var sourceCode = context.getSourceCode();
   var configuration = context.options[0] || {};
   var eventHandlerPrefix = configuration.eventHandlerPrefix || 'handle';
   var eventHandlerPropPrefix = configuration.eventHandlerPropPrefix || 'on';
@@ -25,7 +26,7 @@ module.exports = function(context) {
       }
 
       var propKey = typeof node.name === 'object' ? node.name.name : node.name;
-      var propValue = context.getSource(node.value.expression).replace(/^this\./, '');
+      var propValue = sourceCode.getText(node.value.expression).replace(/^this\./, '');
 
       if (propKey === 'ref') {
         return;
@@ -35,15 +36,15 @@ module.exports = function(context) {
       var propFnIsNamedCorrectly = EVENT_HANDLER_REGEX.test(propValue);
 
       if (propIsEventHandler && !propFnIsNamedCorrectly) {
-        context.report(
-          node,
-          'Handler function for ' + propKey + ' prop key must begin with \'' + eventHandlerPrefix + '\''
-        );
+        context.report({
+          node: node,
+          message: 'Handler function for ' + propKey + ' prop key must begin with \'' + eventHandlerPrefix + '\''
+        });
       } else if (propFnIsNamedCorrectly && !propIsEventHandler) {
-        context.report(
-          node,
-          'Prop key for ' + propValue + ' must begin with \'' + eventHandlerPropPrefix + '\''
-        );
+        context.report({
+          node: node,
+          message: 'Prop key for ' + propValue + ' must begin with \'' + eventHandlerPropPrefix + '\''
+        });
       }
     }
   };

diff --git a/lib/rules/jsx-indent-props.js b/lib/rules/jsx-indent-props.js
@@ -40,6 +40,8 @@ module.exports = function(context) {
   var indentType = 'space';
   var indentSize = 4;
 
+  var sourceCode = context.getSourceCode();
+
   if (context.options.length) {
     if (context.options[0] === 'tab') {
       indentSize = 1;
@@ -66,9 +68,18 @@ module.exports = function(context) {
     };
 
     if (loc) {
-      context.report(node, loc, MESSAGE, msgContext);
+      context.report({
+        node: node,
+        loc: loc,
+        message: MESSAGE,
+        data: msgContext
+      });
     } else {
-      context.report(node, MESSAGE, msgContext);
+      context.report({
+        node: node,
+        message: MESSAGE,
+        data: msgContext
+      });
     }
   }
 
@@ -83,7 +94,7 @@ module.exports = function(context) {
     byLastLine = byLastLine || false;
     excludeCommas = excludeCommas || false;
 
-    var src = context.getSource(node, node.loc.start.column + extraColumnStart);
+    var src = sourceCode.getText(node, node.loc.start.column + extraColumnStart);
     var lines = src.split('\n');
     if (byLastLine) {
       src = lines[lines.length - 1];
@@ -111,7 +122,7 @@ module.exports = function(context) {
    * @return {Boolean} true if its the first in the its start line
    */
   function isNodeFirstInLine(node, byEndLocation) {
-    var firstToken = byEndLocation === true ? context.getLastToken(node, 1) : context.getTokenBefore(node);
+    var firstToken = byEndLocation === true ? sourceCode.getLastToken(node, 1) : sourceCode.getTokenBefore(node);
     var startLine = byEndLocation === true ? node.loc.end.line : node.loc.start.line;
     var endLine = firstToken ? firstToken.loc.end.line : -1;
 

diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
@@ -40,6 +40,8 @@ module.exports = function(context) {
   var indentType = 'space';
   var indentSize = 4;
 
+  var sourceCode = context.getSourceCode();
+
   if (context.options.length) {
     if (context.options[0] === 'tab') {
       indentSize = 1;
@@ -66,9 +68,18 @@ module.exports = function(context) {
     };
 
     if (loc) {
-      context.report(node, loc, MESSAGE, msgContext);
+      context.report({
+        node: node,
+        loc: loc,
+        message: MESSAGE,
+        data: msgContext
+      });
     } else {
-      context.report(node, MESSAGE, msgContext);
+      context.report({
+        node: node,
+        message: MESSAGE,
+        data: msgContext
+      });
     }
   }
 
@@ -83,7 +94,7 @@ module.exports = function(context) {
     byLastLine = byLastLine || false;
     excludeCommas = excludeCommas || false;
 
-    var src = context.getSource(node, node.loc.start.column + extraColumnStart);
+    var src = sourceCode.getText(node, node.loc.start.column + extraColumnStart);
     var lines = src.split('\n');
     if (byLastLine) {
       src = lines[lines.length - 1];
@@ -112,7 +123,7 @@ module.exports = function(context) {
   function isNodeFirstInLine(node) {
     var token = node;
     do {
-      token = context.getTokenBefore(token);
+      token = sourceCode.getTokenBefore(token);
     } while (token.type === 'JSXText');
     var startLine = node.loc.start.line;
     var endLine = token ? token.loc.end.line : -1;

diff --git a/lib/rules/jsx-key.js b/lib/rules/jsx-key.js
@@ -23,7 +23,10 @@ module.exports = function(context) {
 
   function checkIteratorElement(node) {
     if (node.type === 'JSXElement' && !hasKeyProp(node)) {
-      context.report(node, 'Missing "key" prop for element in iterator');
+      context.report({
+        node: node,
+        message: 'Missing "key" prop for element in iterator'
+      });
     }
   }
 
@@ -40,7 +43,10 @@ module.exports = function(context) {
       }
 
       if (node.parent.type === 'ArrayExpression') {
-        context.report(node, 'Missing "key" prop for element in array');
+        context.report({
+          node: node,
+          message: 'Missing "key" prop for element in array'
+        });
       }
     },
 

diff --git a/lib/rules/jsx-max-props-per-line.js b/lib/rules/jsx-max-props-per-line.js
@@ -11,12 +11,13 @@
 
 module.exports = function (context) {
 
+  var sourceCode = context.getSourceCode();
   var configuration = context.options[0] || {};
   var maximum = configuration.maximum || 1;
 
   function getPropName(propNode) {
     if (propNode.type === 'JSXSpreadAttribute') {
-      return context.getSource(propNode.argument);
+      return sourceCode.getText(propNode.argument);
     }
     return propNode.name.name;
   }
@@ -40,7 +41,10 @@ module.exports = function (context) {
         }
         if (props[line].length > maximum) {
           var name = getPropName(props[line][maximum]);
-          context.report(props[line][maximum], 'Prop `' + name + '` must be placed on a new line');
+          context.report({
+            node: props[line][maximum],
+            message: 'Prop `' + name + '` must be placed on a new line'
+          });
           break;
         }
       }

diff --git a/lib/rules/jsx-no-bind.js b/lib/rules/jsx-no-bind.js
@@ -25,12 +25,18 @@ module.exports = function(context) {
         valueNode.callee.type === 'MemberExpression' &&
         valueNode.callee.property.name === 'bind'
       ) {
-        context.report(node, 'JSX props should not use .bind()');
+        context.report({
+          node: node,
+          message: 'JSX props should not use .bind()'
+        });
       } else if (
         !configuration.allowArrowFunctions &&
         valueNode.type === 'ArrowFunctionExpression'
       ) {
-        context.report(node, 'JSX props should not use arrow functions');
+        context.report({
+          node: node,
+          message: 'JSX props should not use arrow functions'
+        });
       }
     }
   };

diff --git a/lib/rules/jsx-no-duplicate-props.js b/lib/rules/jsx-no-duplicate-props.js
@@ -30,7 +30,10 @@ module.exports = function (context) {
         }
 
         if (props.hasOwnProperty(name)) {
-          context.report(decl, 'No duplicate props allowed');
+          context.report({
+            node: decl,
+            message: 'No duplicate props allowed'
+          });
         } else {
           props[name] = 1;
         }

diff --git a/lib/rules/jsx-no-literals.js b/lib/rules/jsx-no-literals.js
@@ -11,7 +11,10 @@
 module.exports = function(context) {
 
   function reportLiteralNode(node) {
-    context.report(node, 'Missing JSX expression container around literal string');
+    context.report({
+      node: node,
+      message: 'Missing JSX expression container around literal string'
+    });
   }
 
   // --------------------------------------------------------------------------

diff --git a/lib/rules/jsx-no-undef.js b/lib/rules/jsx-no-undef.js
@@ -50,7 +50,10 @@ module.exports = function(context) {
       }
     }
 
-    context.report(node, '\'' + node.name + '\' is not defined.');
+    context.report({
+      node: node,
+      message: '\'' + node.name + '\' is not defined.'
+    });
   }
 
   return {

diff --git a/lib/rules/jsx-pascal-case.js b/lib/rules/jsx-pascal-case.js
@@ -38,7 +38,10 @@ module.exports = function(context) {
       var isCompatTag = COMPAT_TAG_REGEX.test(node.name);
 
       if (!isPascalCase && !isCompatTag) {
-        context.report(node, 'Imported JSX component ' + node.name + ' must be in PascalCase');
+        context.report({
+          node: node,
+          message: 'Imported JSX component ' + node.name + ' must be in PascalCase'
+        });
       }
     }
   };