Skip to content

chore: enable prefer-nullish-coalescing internally #7955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 28, 2024
Merged

chore: enable prefer-nullish-coalescing internally #7955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9ff161
chore: enable prefer-nullish-calescing internally
JoshuaKGoldberg Oct 24, 2023
4914ed2
A couple complaints
JoshuaKGoldberg Nov 28, 2023
6f1bcd3
Merge branch 'main'
JoshuaKGoldberg Nov 29, 2023
84da5ed
One last complaint
JoshuaKGoldberg Nov 29, 2023
c2f3435
Merge branch 'main' into lint-enable-prefer-nullish-coalescing
JoshuaKGoldberg Jan 7, 2024
85b1560
Enable ignoreConditionalTests
JoshuaKGoldberg Jan 24, 2024
3c7f9b9
Merge branch 'main'
JoshuaKGoldberg Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ module.exports = {
// make sure we're not leveraging any deprecated APIs
'deprecation/deprecation': 'error',

// TODO(#7338): Investigate enabling these soon ✨
'@typescript-eslint/prefer-nullish-coalescing': 'off',

// TODO(#7130): Investigate changing these in or removing these from presets
'@typescript-eslint/no-confusing-void-expression': 'off',
'@typescript-eslint/prefer-string-starts-ends-with': 'off',
Expand Down Expand Up @@ -109,6 +106,13 @@ module.exports = {
'error',
{ varsIgnorePattern: '^_', argsIgnorePattern: '^_' },
],
'@typescript-eslint/prefer-nullish-coalescing': [
'error',
{
ignoreConditionalTests: true,
ignorePrimitives: true,
},
],

//
// Internal repo rules
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/src/rules/padding-line-between-statements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ function verifyForAlways(
}
return true;
},
}) || nextNode;
}) ?? nextNode;
const insertText = isTokenOnSameLine(prevToken, nextToken)
? '\n\n'
: '\n';
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-plugin/src/rules/unified-signatures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ export default createRule<Options, MessageIds>({
}

return typeContainsTypeParameter(
(type as Partial<TSESTree.TSTypeAnnotation>).typeAnnotation ||
(type as Partial<TSESTree.TSTypeAnnotation>).typeAnnotation ??
(type as TSESTree.TSArrayType).elementType,
);
}
Expand Down Expand Up @@ -523,7 +523,7 @@ export default createRule<Options, MessageIds>({
key ??= getOverloadKey(signature);
if (
currentScope &&
(containingNode || signature).parent === currentScope.parent
(containingNode ?? signature).parent === currentScope.parent
) {
const overloads = currentScope.overloads.get(key);
if (overloads !== undefined) {
Expand Down
2 changes: 1 addition & 1 deletion packages/rule-tester/src/utils/getRuleOptionsSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ export function getRuleOptionsSchema(
}

// Given a full schema, leave it alone
return schema || null;
return schema ?? null;
}