Skip to content

Commit

Permalink
Remove use of deprecated methods, require eslint>=8.40.0 (#2081)
Browse files Browse the repository at this point in the history
Co-authored-by: Sindre Sorhus <sindresorhus@gmail.com>
  • Loading branch information
fisker and sindresorhus committed May 8, 2023
1 parent 6f05ddc commit db4f78a
Show file tree
Hide file tree
Showing 87 changed files with 91 additions and 92 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -94,7 +94,7 @@
"yaml": "^2.2.1"
},
"peerDependencies": {
"eslint": ">=8.38.0"
"eslint": ">=8.40.0"
},
"ava": {
"files": [
Expand Down
2 changes: 1 addition & 1 deletion rules/catch-error-name.js
Expand Up @@ -60,7 +60,7 @@ const create = context => {
return;
}

const scope = context.getSourceCode().getScope(node);
const scope = context.sourceCode.getScope(node);
const variable = findVariable(scope, node);

// This was reported https://github.com/sindresorhus/eslint-plugin-unicorn/issues/1075#issuecomment-768072967
Expand Down
2 changes: 1 addition & 1 deletion rules/consistent-destructuring.js
Expand Up @@ -53,7 +53,7 @@ const isChildInParentScope = (child, parent) => {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const declarations = new Map();

return {
Expand Down
2 changes: 1 addition & 1 deletion rules/consistent-function-scoping.js
Expand Up @@ -149,7 +149,7 @@ function checkNode(node, scopeManager) {
/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const {checkArrowFunctions} = {checkArrowFunctions: true, ...context.options[0]};
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const {scopeManager} = sourceCode;

const functions = [];
Expand Down
2 changes: 1 addition & 1 deletion rules/empty-brace-spaces.js
Expand Up @@ -19,7 +19,7 @@ const selector = matches([
/** @param {import('eslint').Rule.RuleContext} context */
const create = context => ({
[selector](node) {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const filter = node.type === 'RecordExpression'
? token => token.type === 'Punctuator' && (token.value === '#{' || token.value === '{|')
: isOpeningBraceToken;
Expand Down
2 changes: 1 addition & 1 deletion rules/error-message.js
Expand Up @@ -28,7 +28,7 @@ const selector = callOrNewExpressionSelector([
/** @param {import('eslint').Rule.RuleContext} context */
const create = context => ({
[selector](expression) {
const scope = context.getSourceCode().getScope(expression);
const scope = context.sourceCode.getScope(expression);
if (isShadowed(scope, expression.callee)) {
return;
}
Expand Down
3 changes: 1 addition & 2 deletions rules/expiring-todo-comments.js
Expand Up @@ -263,7 +263,7 @@ const create = context => {
pattern => pattern instanceof RegExp ? pattern : new RegExp(pattern, 'u'),
);

const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const comments = sourceCode.getAllComments();
const unusedComments = comments
.filter(token => token.type !== 'Shebang')
Expand All @@ -290,7 +290,6 @@ const create = context => {
...sourceCode,
getAllComments: () => options.allowWarningComments ? [] : unusedComments,
},
getSourceCode: () => fakeContext.sourceCode,
};
const rules = baseRule.create(fakeContext);

Expand Down
2 changes: 1 addition & 1 deletion rules/explicit-length-check.js
Expand Up @@ -99,7 +99,7 @@ function create(context) {
...context.options[0],
};
const nonZeroStyle = nonZeroStyles.get(options['non-zero']);
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

function getProblem({node, isZeroLengthCheck, lengthNode, autoFix}) {
const {code, test} = isZeroLengthCheck ? zeroStyle : nonZeroStyle;
Expand Down
2 changes: 1 addition & 1 deletion rules/import-style.js
Expand Up @@ -167,7 +167,7 @@ const create = context => {
),
);

const sourceCode = context.getSourceCode();
const {sourceCode} = context;

const report = (node, moduleName, actualImportStyles, allowedImportStyles, isRequire = false) => {
if (!allowedImportStyles || allowedImportStyles.size === 0) {
Expand Down
2 changes: 1 addition & 1 deletion rules/new-for-builtins.js
Expand Up @@ -49,7 +49,7 @@ function enforceCallExpression({node, path: [name]}, sourceCode) {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const newExpressionTracker = new GlobalReferenceTracker({
objects: builtins.disallowNew,
type: GlobalReferenceTracker.CONSTRUCT,
Expand Down
2 changes: 1 addition & 1 deletion rules/no-array-callback-reference.js
Expand Up @@ -174,7 +174,7 @@ function getProblem(context, node, method, options) {
parameters: suggestionParameters,
},
fix(fixer) {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
let nodeText = sourceCode.getText(node);
if (isParenthesized(node, sourceCode) || type === 'ConditionalExpression') {
nodeText = `(${nodeText})`;
Expand Down
4 changes: 2 additions & 2 deletions rules/no-array-for-each.js
Expand Up @@ -80,7 +80,7 @@ function shouldSwitchReturnStatementToBlockStatement(returnStatement) {
}

function getFixFunction(callExpression, functionInfo, context) {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const [callback] = callExpression.arguments;
const parameters = callback.params;
const iterableObject = callExpression.callee.object;
Expand Down Expand Up @@ -386,7 +386,7 @@ const create = context => {
const callExpressions = [];
const allIdentifiers = [];
const functionInfo = new Map();
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
':function'(node) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-array-method-this-argument.js
Expand Up @@ -119,7 +119,7 @@ function useBoundFunction(callExpression, sourceCode) {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
[selector](callExpression) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-array-push-push.js
Expand Up @@ -52,7 +52,7 @@ function create(context) {
'process.stderr',
...ignore,
];
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
[selector](secondExpression) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-await-expression-member.js
Expand Up @@ -12,7 +12,7 @@ const messages = {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
'MemberExpression[object.type="AwaitExpression"]'(memberExpression) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-console-spaces.js
Expand Up @@ -30,7 +30,7 @@ const hasTrailingSpace = value => value.length > 1 && value.charAt(value.length

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const getProblem = (node, method, position) => {
const index = position === 'leading'
? node.range[0] + 1
Expand Down
2 changes: 1 addition & 1 deletion rules/no-empty-file.js
Expand Up @@ -29,7 +29,7 @@ const create = context => {
return;
}

const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const comments = sourceCode.getAllComments();

if (hasTripeSlashDirectives(comments)) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-for-loop.js
Expand Up @@ -262,7 +262,7 @@ const getReferencesInChildScopes = (scope, name) =>

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const {scopeManager, text: sourceCodeText} = sourceCode;

return {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-instanceof-array.js
Expand Up @@ -18,7 +18,7 @@ const selector = [

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
[selector](node) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-invalid-remove-event-listener.js
Expand Up @@ -28,7 +28,7 @@ const create = context => ({
if (['ArrowFunctionExpression', 'FunctionExpression'].includes(listener.type)) {
return {
node: listener,
loc: getFunctionHeadLocation(listener, context.getSourceCode()),
loc: getFunctionHeadLocation(listener, context.sourceCode),
messageId: MESSAGE_ID,
};
}
Expand Down
2 changes: 1 addition & 1 deletion rules/no-lonely-if.js
Expand Up @@ -122,7 +122,7 @@ function fix(innerIfStatement, sourceCode) {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
[selector](node) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-negated-condition.js
Expand Up @@ -89,7 +89,7 @@ const create = context => ({
messageId: MESSAGE_ID,
/** @param {import('eslint').Rule.RuleFixer} fixer */
* fix(fixer) {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
yield * convertNegatedCondition(fixer, node, sourceCode);
yield * swapConsequentAndAlternate(fixer, node, sourceCode);

Expand Down
2 changes: 1 addition & 1 deletion rules/no-nested-ternary.js
Expand Up @@ -12,7 +12,7 @@ const nestTernarySelector = level => `:not(ConditionalExpression)${' > Condition

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
[nestTernarySelector(3)]: node =>
Expand Down
2 changes: 1 addition & 1 deletion rules/no-new-array.js
Expand Up @@ -28,7 +28,7 @@ function getProblem(context, node) {

const [argumentNode] = node.arguments;

const sourceCode = context.getSourceCode();
const {sourceCode} = context;
let text = sourceCode.getText(argumentNode);
if (isParenthesized(argumentNode, sourceCode)) {
text = `(${text})`;
Expand Down
2 changes: 1 addition & 1 deletion rules/no-new-buffer.js
Expand Up @@ -52,7 +52,7 @@ function fix(node, sourceCode, method) {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
return {
[newExpressionSelector('Buffer')](node) {
const method = inferMethod(node.arguments, sourceCode.getScope(node));
Expand Down
2 changes: 1 addition & 1 deletion rules/no-process-exit.js
Expand Up @@ -31,7 +31,7 @@ const processExitCallSelector = methodCallSelector({

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const startsWithHashBang = context.getSourceCode().lines[0].indexOf('#!') === 0;
const startsWithHashBang = context.sourceCode.lines[0].indexOf('#!') === 0;

if (startsWithHashBang) {
return {};
Expand Down
2 changes: 1 addition & 1 deletion rules/no-static-only-class.js
Expand Up @@ -197,7 +197,7 @@ function switchClassToObject(node, sourceCode) {
}

function create(context) {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
[selector](node) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-thenable.js
Expand Up @@ -90,7 +90,7 @@ const cases = [

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return Object.fromEntries(
cases.map(({selector, test, messageId, getNodes}) => [
Expand Down
2 changes: 1 addition & 1 deletion rules/no-typeof-undefined.js
Expand Up @@ -35,7 +35,7 @@ const create = context => {
checkGlobalVariables: false,
...context.options[0],
};
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
[selector](binaryExpression) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-unnecessary-await.js
Expand Up @@ -46,7 +46,7 @@ const create = context => ({
return;
}

const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const awaitToken = sourceCode.getFirstToken(node);
const problem = {
node,
Expand Down
2 changes: 1 addition & 1 deletion rules/no-unreadable-array-destructuring.js
Expand Up @@ -13,7 +13,7 @@ const isCommaFollowedWithComma = (element, index, array) =>

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
'ArrayPattern[elements.length>=3]'(node) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-unreadable-iife.js
Expand Up @@ -21,7 +21,7 @@ const selector = [
/** @param {import('eslint').Rule.RuleContext} context */
const create = context => ({
[selector](node) {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
if (!isParenthesized(node, sourceCode)) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion rules/no-unused-properties.js
Expand Up @@ -80,7 +80,7 @@ const isUnusedVariable = variable => {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const getPropertyDisplayName = property => {
if (property.key.type === 'Identifier') {
return property.key.name;
Expand Down
2 changes: 1 addition & 1 deletion rules/no-useless-fallback-in-spread.js
Expand Up @@ -34,7 +34,7 @@ const create = context => ({
messageId: MESSAGE_ID,
/** @param {import('eslint').Rule.RuleFixer} fixer */
* fix(fixer) {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const logicalExpression = emptyObject.parent;
const {left} = logicalExpression;
const isLeftObjectParenthesized = isParenthesized(left, sourceCode);
Expand Down
2 changes: 1 addition & 1 deletion rules/no-useless-length-check.js
Expand Up @@ -114,7 +114,7 @@ const create = context => {
messageId: zeroLengthChecks.has(node) ? 'zero' : 'non-zero',
/** @param {import('eslint').Rule.RuleFixer} fixer */
fix(fixer) {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const {left, right} = node.parent;
const leftRange = getParenthesizedRange(left, sourceCode);
const rightRange = getParenthesizedRange(right, sourceCode);
Expand Down
2 changes: 1 addition & 1 deletion rules/no-useless-promise-resolve-reject.js
Expand Up @@ -173,7 +173,7 @@ function fix(callExpression, isInTryStatement, sourceCode) {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
[selector](callExpression) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-useless-spread.js
Expand Up @@ -186,7 +186,7 @@ function * unwrapSingleArraySpread(fixer, arrayExpression, sourceCode) {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

return {
[uselessSpreadInListSelector](spreadObject) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-useless-switch-case.js
Expand Up @@ -43,7 +43,7 @@ const create = context => ({
for (const node of uselessCases) {
yield {
node,
loc: getSwitchCaseHeadLocation(node, context.getSourceCode()),
loc: getSwitchCaseHeadLocation(node, context.sourceCode),
messageId: MESSAGE_ID_ERROR,
suggest: [
{
Expand Down
2 changes: 1 addition & 1 deletion rules/no-useless-undefined.js
Expand Up @@ -108,7 +108,7 @@ const isFunctionBindCall = node =>

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;

const listener = (fix, checkFunctionReturnType) => node => {
if (checkFunctionReturnType) {
Expand Down
2 changes: 1 addition & 1 deletion rules/no-zero-fractions.js
Expand Up @@ -39,7 +39,7 @@ const create = context => ({
// End of fractions
const end = node.range[0] + before.length + dotAndFractions.length;
const start = end - (raw.length - formatted.length);
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
return {
loc: toLocation([start, end], sourceCode),
messageId: isDanglingDot ? MESSAGE_DANGLING_DOT : MESSAGE_ZERO_FRACTION,
Expand Down
2 changes: 1 addition & 1 deletion rules/prefer-add-event-listener.js
Expand Up @@ -137,7 +137,7 @@ const create = context => {
&& node.parent.type === 'ExpressionStatement'
&& node.parent.expression === node
) {
fix = fixer => fixCode(fixer, context.getSourceCode(), node, memberExpression);
fix = fixer => fixCode(fixer, context.sourceCode, node, memberExpression);
}

return {
Expand Down
2 changes: 1 addition & 1 deletion rules/prefer-array-find.js
Expand Up @@ -256,7 +256,7 @@ const isDestructuringFirstElement = node => {

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => {
const sourceCode = context.getSourceCode();
const {sourceCode} = context;
const {
checkFromLast,
} = {
Expand Down

0 comments on commit db4f78a

Please sign in to comment.