Skip to content

Commit 6be3329

Browse files
MatiPl01ljharb
andcommitted
[Refactor] create getAncestors util, since context.getAncestors is deprecated
Co-authored-by: Mateusz Łopaciński <[email protected]> Co-authored-by: Jordan Harband <[email protected]>
1 parent 26765f9 commit 6be3329

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

lib/rules/jsx-no-bind.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const propName = require('jsx-ast-utils/propName');
1111
const docsUrl = require('../util/docsUrl');
1212
const jsxUtil = require('../util/jsx');
1313
const report = require('../util/report');
14+
const getAncestors = require('../util/eslint').getAncestors;
1415

1516
// -----------------------------------------------------------------------------
1617
// Rule Definition
@@ -123,7 +124,7 @@ module.exports = {
123124
}
124125

125126
function getBlockStatementAncestors(node) {
126-
return context.getAncestors(node).filter(
127+
return getAncestors(context, node).filter(
127128
(ancestor) => ancestor.type === 'BlockStatement'
128129
).reverse();
129130
}

lib/rules/no-is-mounted.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
'use strict';
77

88
const docsUrl = require('../util/docsUrl');
9+
const getAncestors = require('../util/eslint').getAncestors;
910
const report = require('../util/report');
1011

1112
// ------------------------------------------------------------------------------
@@ -40,7 +41,7 @@ module.exports = {
4041
if (callee.object.type !== 'ThisExpression' || callee.property.name !== 'isMounted') {
4142
return;
4243
}
43-
const ancestors = context.getAncestors(callee);
44+
const ancestors = getAncestors(context, node);
4445
for (let i = 0, j = ancestors.length; i < j; i++) {
4546
if (ancestors[i].type === 'Property' || ancestors[i].type === 'MethodDefinition') {
4647
report(context, messages.noIsMounted, 'noIsMounted', {

lib/rules/require-render-return.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const astUtil = require('../util/ast');
1212
const componentUtil = require('../util/componentUtil');
1313
const docsUrl = require('../util/docsUrl');
1414
const report = require('../util/report');
15+
const getAncestors = require('../util/eslint').getAncestors;
1516

1617
// ------------------------------------------------------------------------------
1718
// Rule Definition
@@ -61,7 +62,7 @@ module.exports = {
6162

6263
return {
6364
ReturnStatement(node) {
64-
const ancestors = context.getAncestors(node).reverse();
65+
const ancestors = getAncestors(context, node).reverse();
6566
let depth = 0;
6667
ancestors.forEach((ancestor) => {
6768
if (/Function(Expression|Declaration)$/.test(ancestor.type)) {

lib/util/eslint.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ function getSourceCode(context) {
44
return context.getSourceCode ? context.getSourceCode() : context.sourceCode;
55
}
66

7+
function getAncestors(context, node) {
8+
const sourceCode = getSourceCode(context);
9+
return sourceCode.getAncestors ? sourceCode.getAncestors(node) : context.getAncestors();
10+
}
11+
712
module.exports = {
13+
getAncestors,
814
getSourceCode,
915
};

lib/util/makeNoMethodSetStateRule.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const findLast = require('array.prototype.findlast');
99

1010
const docsUrl = require('./docsUrl');
1111
const report = require('./report');
12+
const getAncestors = require('./eslint').getAncestors;
1213
const testReactVersion = require('./version').testReactVersion;
1314

1415
// ------------------------------------------------------------------------------
@@ -93,7 +94,7 @@ module.exports = function makeNoMethodSetStateRule(methodName, shouldCheckUnsafe
9394
) {
9495
return;
9596
}
96-
const ancestors = context.getAncestors(callee);
97+
const ancestors = getAncestors(context, node);
9798
let depth = 0;
9899
findLast(ancestors, (ancestor) => {
99100
// ancestors.some((ancestor) => {

0 commit comments

Comments
 (0)