Chore: Replace deprecated calls to context - batch 2 (refs #6029) (#6049

)
eslint · May 3, 2016 · cd1b057 · cd1b057
1 parent a3a6e06
commit cd1b057
Show file tree

Hide file tree

Showing 20 changed files with 83 additions and 54 deletions.
diff --git a/lib/rules/newline-after-var.js b/lib/rules/newline-after-var.js
@@ -35,7 +35,7 @@ module.exports = {
         var mode = context.options[0] === "never" ? "never" : "always";
 
         // Cache starting and ending line numbers of comments for faster lookup
-        var commentEndLine = context.getAllComments().reduce(function(result, token) {
+        var commentEndLine = sourceCode.getAllComments().reduce(function(result, token) {
             result[token.loc.start.line] = token.loc.end.line;
             return result;
         }, {});

diff --git a/lib/rules/newline-per-chained-call.js b/lib/rules/newline-per-chained-call.js
@@ -36,6 +36,8 @@ module.exports = {
         var options = context.options[0] || {},
             ignoreChainWithDepth = options.ignoreChainWithDepth || 2;
 
+        var sourceCode = context.getSourceCode();
+
         return {
             "CallExpression:exit": function(node) {
                 if (!node.callee || node.callee.type !== "MemberExpression") {
@@ -55,7 +57,7 @@ module.exports = {
                     context.report(
                         callee.property,
                         callee.property.loc.start,
-                        "Expected line break after `" + context.getSource(callee.object).replace(/\r\n|\r|\n/g, "\\n") + "`."
+                        "Expected line break after `" + sourceCode.getText(callee.object).replace(/\r\n|\r|\n/g, "\\n") + "`."
                     );
                 }
             }

diff --git a/lib/rules/no-cond-assign.js b/lib/rules/no-cond-assign.js
@@ -34,6 +34,8 @@ module.exports = {
 
         var prohibitAssign = (context.options[0] || "except-parens");
 
+        var sourceCode = context.getSourceCode();
+
         /**
          * Check whether an AST node is the test expression for a conditional statement.
          * @param {!Object} node The node to test.
@@ -68,8 +70,8 @@ module.exports = {
          * @returns {boolean} `true` if the code is enclosed in parentheses; otherwise, `false`.
          */
         function isParenthesised(node) {
-            var previousToken = context.getTokenBefore(node),
-                nextToken = context.getTokenAfter(node);
+            var previousToken = sourceCode.getTokenBefore(node),
+                nextToken = sourceCode.getTokenAfter(node);
 
             return previousToken.value === "(" && previousToken.range[1] <= node.range[0] &&
                 nextToken.value === ")" && nextToken.range[0] >= node.range[1];
@@ -81,8 +83,8 @@ module.exports = {
          * @returns {boolean} `true` if the code is enclosed in two sets of parentheses; otherwise, `false`.
          */
         function isParenthesisedTwice(node) {
-            var previousToken = context.getTokenBefore(node, 1),
-                nextToken = context.getTokenAfter(node, 1);
+            var previousToken = sourceCode.getTokenBefore(node, 1),
+                nextToken = sourceCode.getTokenAfter(node, 1);
 
             return isParenthesised(node) &&
                 previousToken.value === "(" && previousToken.range[1] <= node.range[0] &&

diff --git a/lib/rules/no-div-regex.js b/lib/rules/no-div-regex.js
@@ -21,11 +21,12 @@ module.exports = {
     },
 
     create: function(context) {
+        var sourceCode = context.getSourceCode();
 
         return {
 
             Literal: function(node) {
-                var token = context.getFirstToken(node);
+                var token = sourceCode.getFirstToken(node);
 
                 if (token.type === "RegularExpression" && token.value[1] === "=") {
                     context.report(node, "A regular expression literal can be confused with '/='.");

diff --git a/lib/rules/no-duplicate-case.js b/lib/rules/no-duplicate-case.js
@@ -22,13 +22,14 @@ module.exports = {
     },
 
     create: function(context) {
+        var sourceCode = context.getSourceCode();
 
         return {
             SwitchStatement: function(node) {
                 var mapping = {};
 
                 node.cases.forEach(function(switchCase) {
-                    var key = context.getSource(switchCase.test);
+                    var key = sourceCode.getText(switchCase.test);
 
                     if (mapping[key]) {
                         context.report(switchCase, "Duplicate case label.");

diff --git a/lib/rules/no-empty-character-class.js b/lib/rules/no-empty-character-class.js
@@ -39,11 +39,12 @@ module.exports = {
     },
 
     create: function(context) {
+        var sourceCode = context.getSourceCode();
 
         return {
 
             Literal: function(node) {
-                var token = context.getFirstToken(node);
+                var token = sourceCode.getFirstToken(node);
 
                 if (token.type === "RegularExpression" && !regex.test(token.value)) {
                     context.report(node, "Empty class.");

diff --git a/lib/rules/no-empty-function.js b/lib/rules/no-empty-function.js
@@ -121,6 +121,8 @@ module.exports = {
         var options = context.options[0] || {};
         var allowed = options.allow || [];
 
+        var sourceCode = context.getSourceCode();
+
         /**
          * Reports a given function node if the node matches the following patterns.
          *
@@ -139,7 +141,7 @@ module.exports = {
             if (allowed.indexOf(kind) === -1 &&
                 node.body.type === "BlockStatement" &&
                 node.body.body.length === 0 &&
-                context.getComments(node.body).trailing.length === 0
+                sourceCode.getComments(node.body).trailing.length === 0
             ) {
                 context.report({
                     node: node,

diff --git a/lib/rules/no-empty.js b/lib/rules/no-empty.js
@@ -35,6 +35,8 @@ module.exports = {
         var options = context.options[0] || {},
             allowEmptyCatch = options.allowEmptyCatch || false;
 
+        var sourceCode = context.getSourceCode();
+
         return {
             BlockStatement: function(node) {
 
@@ -53,7 +55,7 @@ module.exports = {
                 }
 
                 // any other block is only allowed to be empty, if it contains a comment
-                if (context.getComments(node).trailing.length > 0) {
+                if (sourceCode.getComments(node).trailing.length > 0) {
                     return;
                 }
 

diff --git a/lib/rules/no-extra-semi.js b/lib/rules/no-extra-semi.js
@@ -22,6 +22,7 @@ module.exports = {
     },
 
     create: function(context) {
+        var sourceCode = context.getSourceCode();
 
         /**
          * Reports an unnecessary semicolon error.
@@ -48,7 +49,7 @@ module.exports = {
         function checkForPartOfClassBody(firstToken) {
             for (var token = firstToken;
                 token.type === "Punctuator" && token.value !== "}";
-                token = context.getTokenAfter(token)
+                token = sourceCode.getTokenAfter(token)
             ) {
                 if (token.value === ";") {
                     report(token);
@@ -78,7 +79,7 @@ module.exports = {
              * @returns {void}
              */
             ClassBody: function(node) {
-                checkForPartOfClassBody(context.getFirstToken(node, 1)); // 0 is `{`.
+                checkForPartOfClassBody(sourceCode.getFirstToken(node, 1)); // 0 is `{`.
             },
 
             /**
@@ -87,7 +88,7 @@ module.exports = {
              * @returns {void}
              */
             MethodDefinition: function(node) {
-                checkForPartOfClassBody(context.getTokenAfter(node));
+                checkForPartOfClassBody(sourceCode.getTokenAfter(node));
             }
         };
 

diff --git a/lib/rules/no-implicit-coercion.js b/lib/rules/no-implicit-coercion.js
@@ -179,6 +179,8 @@ module.exports = {
         var options = parseOptions(context.options[0]),
             operatorAllowed = false;
 
+        var sourceCode = context.getSourceCode();
+
         return {
             UnaryExpression: function(node) {
 
@@ -188,7 +190,7 @@ module.exports = {
                     context.report(
                         node,
                         "use `Boolean({{code}})` instead.", {
-                            code: context.getSource(node.argument.argument)
+                            code: sourceCode.getText(node.argument.argument)
                         });
                 }
 
@@ -198,7 +200,7 @@ module.exports = {
                     context.report(
                         node,
                         "use `{{code}} !== -1` instead.", {
-                            code: context.getSource(node.argument)
+                            code: sourceCode.getText(node.argument)
                         });
                 }
 
@@ -208,7 +210,7 @@ module.exports = {
                     context.report(
                         node,
                         "use `Number({{code}})` instead.", {
-                            code: context.getSource(node.argument)
+                            code: sourceCode.getText(node.argument)
                         });
                 }
             },
@@ -224,7 +226,7 @@ module.exports = {
                     context.report(
                         node,
                         "use `Number({{code}})` instead.", {
-                            code: context.getSource(nonNumericOperand)
+                            code: sourceCode.getText(nonNumericOperand)
                         });
                 }
 
@@ -234,7 +236,7 @@ module.exports = {
                     context.report(
                         node,
                         "use `String({{code}})` instead.", {
-                            code: context.getSource(getOtherOperand(node, ""))
+                            code: sourceCode.getText(getOtherOperand(node, ""))
                         });
                 }
             },
@@ -247,7 +249,7 @@ module.exports = {
                     context.report(
                         node,
                         "use `{{code}} = String({{code}})` instead.", {
-                            code: context.getSource(getOtherOperand(node, ""))
+                            code: sourceCode.getText(getOtherOperand(node, ""))
                         });
                 }
             }

diff --git a/lib/rules/no-inline-comments.js b/lib/rules/no-inline-comments.js
@@ -22,6 +22,7 @@ module.exports = {
     },
 
     create: function(context) {
+        var sourceCode = context.getSourceCode();
 
         /**
          * Will check that comments are not on lines starting with or ending with code
@@ -32,8 +33,8 @@ module.exports = {
         function testCodeAroundComment(node) {
 
             // Get the whole line and cut it off at the start of the comment
-            var startLine = String(context.getSourceLines()[node.loc.start.line - 1]);
-            var endLine = String(context.getSourceLines()[node.loc.end.line - 1]);
+            var startLine = String(sourceCode.lines[node.loc.start.line - 1]);
+            var endLine = String(sourceCode.lines[node.loc.end.line - 1]);
 
             var preamble = startLine.slice(0, node.loc.start.column).trim();
 

diff --git a/lib/rules/no-irregular-whitespace.js b/lib/rules/no-irregular-whitespace.js
@@ -58,6 +58,8 @@ module.exports = {
         var skipRegExps = !!options.skipRegExps;
         var skipTemplates = !!options.skipTemplates;
 
+        var sourceCode = context.getSourceCode();
+
         /**
          * Removes errors that occur inside a string node
          * @param {ASTNode} node to check for matching errors.
@@ -132,7 +134,7 @@ module.exports = {
          * @private
          */
         function checkForIrregularWhitespace(node) {
-            var sourceLines = context.getSourceLines();
+            var sourceLines = sourceCode.lines;
 
             sourceLines.forEach(function(sourceLine, lineIndex) {
                 var lineNumber = lineIndex + 1,
@@ -157,8 +159,8 @@ module.exports = {
          * @private
          */
         function checkForIrregularLineTerminators(node) {
-            var source = context.getSource(),
-                sourceLines = context.getSourceLines(),
+            var source = sourceCode.getText(),
+                sourceLines = sourceCode.lines,
                 linebreaks = source.match(/\r\n|\r|\n|\u2028|\u2029/g),
                 lastLineIndex = -1,
                 lineIndex,

diff --git a/lib/rules/no-mixed-spaces-and-tabs.js b/lib/rules/no-mixed-spaces-and-tabs.js
@@ -24,6 +24,7 @@ module.exports = {
     },
 
     create: function(context) {
+        var sourceCode = context.getSourceCode();
 
         var smartTabs,
             ignoredLocs = [];
@@ -86,8 +87,8 @@ module.exports = {
                  */
                 var regex = /^(?=[\t ]*(\t | \t))/,
                     match,
-                    lines = context.getSourceLines(),
-                    comments = context.getAllComments();
+                    lines = sourceCode.lines,
+                    comments = sourceCode.getAllComments();
 
                 comments.forEach(function(comment) {
                     ignoredLocs.push(comment.loc);

diff --git a/lib/rules/no-multi-spaces.js b/lib/rules/no-multi-spaces.js
@@ -95,8 +95,9 @@ module.exports = {
         return {
             Program: function() {
 
-                var source = context.getSource(),
-                    allComments = context.getAllComments(),
+                var sourceCode = context.getSourceCode(),
+                    source = sourceCode.getText(),
+                    allComments = sourceCode.getAllComments(),
                     pattern = /[^\n\r\u2028\u2029\t ].? {2,}/g,  // note: repeating space
                     token,
                     previousToken,
@@ -121,12 +122,12 @@ module.exports = {
                     // do not flag anything inside of comments
                     if (!isIndexInComment(pattern.lastIndex, allComments)) {
 
-                        token = context.getTokenByRangeStart(pattern.lastIndex);
+                        token = sourceCode.getTokenByRangeStart(pattern.lastIndex);
                         if (token) {
-                            previousToken = context.getTokenBefore(token);
+                            previousToken = sourceCode.getTokenBefore(token);
 
                             if (hasExceptions) {
-                                parent = context.getNodeByRangeIndex(pattern.lastIndex - 1);
+                                parent = sourceCode.getNodeByRangeIndex(pattern.lastIndex - 1);
                             }
 
                             if (!parent || !exceptions[parent.type]) {

diff --git a/lib/rules/no-multiple-empty-lines.js b/lib/rules/no-multiple-empty-lines.js
@@ -56,6 +56,8 @@ module.exports = {
             maxBOF = context.options[0].maxBOF;
         }
 
+        var sourceCode = context.getSourceCode();
+
         //--------------------------------------------------------------------------
         // Public
         //--------------------------------------------------------------------------
@@ -73,7 +75,7 @@ module.exports = {
             },
 
             "Program:exit": function checkBlankLines(node) {
-                var lines = context.getSourceLines(),
+                var lines = sourceCode.lines,
                     currentLocation = -1,
                     lastLocation,
                     blankCounter = 0,

diff --git a/lib/rules/no-regex-spaces.js b/lib/rules/no-regex-spaces.js
@@ -21,11 +21,12 @@ module.exports = {
     },
 
     create: function(context) {
+        var sourceCode = context.getSourceCode();
 
         return {
 
             Literal: function(node) {
-                var token = context.getFirstToken(node),
+                var token = sourceCode.getFirstToken(node),
                     nodeType = token.type,
                     nodeValue = token.value,
                     multipleSpacesRegex = /( {2,})+?/,

diff --git a/lib/rules/no-return-assign.js b/lib/rules/no-return-assign.js
@@ -20,12 +20,12 @@ function isAssignment(node) {
 /**
  * Checks whether or not a node is enclosed in parentheses.
  * @param {Node|null} node - A node to check.
- * @param {RuleContext} context - The current context.
+ * @param {sourceCode} sourceCode - The ESLint SourceCode object.
  * @returns {boolean} Whether or not the node is enclosed in parentheses.
  */
-function isEnclosedInParens(node, context) {
-    var prevToken = context.getTokenBefore(node);
-    var nextToken = context.getTokenAfter(node);
+function isEnclosedInParens(node, sourceCode) {
+    var prevToken = sourceCode.getTokenBefore(node);
+    var nextToken = sourceCode.getTokenAfter(node);
 
     return prevToken.value === "(" && nextToken.value === ")";
 }
@@ -52,6 +52,8 @@ module.exports = {
     create: function(context) {
         var always = (context.options[0] || "except-parens") !== "except-parens";
 
+        var sourceCode = context.getSourceCode();
+
         /**
          * Check whether return statement contains assignment
          * @param {ASTNode} nodeToCheck node to check
@@ -61,7 +63,7 @@ module.exports = {
          * @private
          */
         function checkForAssignInReturn(nodeToCheck, nodeToReport, message) {
-            if (isAssignment(nodeToCheck) && (always || !isEnclosedInParens(nodeToCheck, context))) {
+            if (isAssignment(nodeToCheck) && (always || !isEnclosedInParens(nodeToCheck, sourceCode))) {
                 context.report(nodeToReport, message);
             }
         }