Skip to content
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

Jump to bottom

fix(eslint-plugin): [strict-boolean-expressions] replace dangerous fixer with suggestions #7394

Merged
merged 8 commits into from
Aug 10, 2023
Merged

fix(eslint-plugin): [strict-boolean-expressions] replace dangerous fixer with suggestions #7394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0bbb035
fix(eslint-plugin): remove explicit rule check for logical negation e…
kemilbeltre Aug 1, 2023
5432e52
feat: add null check error without fix options
kemilbeltre Aug 2, 2023
5d3b201
refactor: add explicit null check rule suggestion
kemilbeltre Aug 5, 2023
fd01781
Merge branch 'main' into fix/7312-strict-boolean-expressions
kemilbeltre Aug 5, 2023
e476dcf
feat: change suggestion fix message id
kemilbeltre Aug 8, 2023
3b70446
test: add fix compare nullish suggestion
kemilbeltre Aug 8, 2023
989ba1c
refactor: move !nullableObject to suggestions
kemilbeltre Aug 8, 2023
102eefc
Merge branch 'main' into fix/7312-strict-boolean-expressions
kemilbeltre Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 21 additions & 11 deletions packages/eslint-plugin/src/rules/strict-boolean-expressions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,23 +703,33 @@ export default util.createRule<Options, MessageId>({
context.report({
node,
messageId: 'conditionErrorNullableObject',
fix: util.getWrappingFixer({
sourceCode,
node: node.parent,
innerNode: node,
wrap: code => `${code} == null`,
}),
suggest: [
{
messageId: 'conditionFixCompareNullish',
fix: util.getWrappingFixer({
sourceCode,
node: node.parent,
innerNode: node,
wrap: code => `${code} == null`,
}),
},
],
});
} else {
// if (nullableObject)
context.report({
node,
messageId: 'conditionErrorNullableObject',
JoshuaKGoldberg marked this conversation as resolved.
Show resolved Hide resolved
fix: util.getWrappingFixer({
sourceCode,
node,
wrap: code => `${code} != null`,
}),
JoshuaKGoldberg marked this conversation as resolved.
Show resolved Hide resolved
suggest: [
{
messageId: 'conditionFixCompareNullish',
fix: util.getWrappingFixer({
sourceCode,
node,
wrap: code => `${code} != null`,
}),
},
],
JoshuaKGoldberg marked this conversation as resolved.
Show resolved Hide resolved
});
}
}
Expand Down
110 changes: 96 additions & 14 deletions packages/eslint-plugin/tests/rules/strict-boolean-expressions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,15 +1008,40 @@ if (y) {
<T extends {} | null | undefined>(x: T) => x ? 1 : 0;
`,
errors: [
{ messageId: 'conditionErrorNullableObject', line: 2, column: 37 },
{ messageId: 'conditionErrorNullableObject', line: 3, column: 33 },
{ messageId: 'conditionErrorNullableObject', line: 4, column: 52 },
{
messageId: 'conditionErrorNullableObject',
line: 2,
column: 37,
suggestions: [
{
messageId: 'conditionFixCompareNullish',
output: 'declare const x: object | null; if (x != null) {}',
},
],
},
{
messageId: 'conditionErrorNullableObject',
line: 3,
column: 33,
suggestions: [
{
messageId: 'conditionFixCompareNullish',
output: ` (x?: { a: number }) => x == null;`,
},
],
},
{
messageId: 'conditionErrorNullableObject',
line: 4,
column: 52,
suggestions: [
{
messageId: 'conditionFixCompareNullish',
output: ` <T extends {} | null | undefined>(x: T) => (x != null) ? 1 : 0;`,
},
],
},
],
output: `
declare const x: object | null; if (x != null) {}
(x?: { a: number }) => x == null;
<T extends {} | null | undefined>(x: T) => (x != null) ? 1 : 0;
`,
}),

// nullable string in boolean context
Expand Down Expand Up @@ -1620,18 +1645,75 @@ if (x) {
obj && 1 || 0
`,
errors: [
{ messageId: 'conditionErrorNullableObject', line: 3, column: 10 },
{ messageId: 'conditionErrorNullableObject', line: 4, column: 10 },
{ messageId: 'conditionErrorNullableObject', line: 5, column: 9 },
{ messageId: 'conditionErrorNullableObject', line: 6, column: 9 },
],
output: `
{
messageId: 'conditionErrorNullableObject',
line: 3,
column: 10,
suggestions: [
{
messageId: 'conditionFixCompareNullish',
output: `
declare const obj: { x: number } | null;
(obj == null) ? 1 : 0
!obj
obj || 0
obj && 1 || 0
`,
},
],
},
{
messageId: 'conditionErrorNullableObject',
line: 4,
column: 10,
suggestions: [
{
messageId: 'conditionFixCompareNullish',
output: `
declare const obj: { x: number } | null;
!obj ? 1 : 0
obj == null
obj || 0
obj && 1 || 0
`,
},
],
},
{
messageId: 'conditionErrorNullableObject',
line: 5,
column: 9,
suggestions: [
{
messageId: 'conditionFixCompareNullish',
output: `
declare const obj: { x: number } | null;
!obj ? 1 : 0
!obj
;(obj != null) || 0
obj && 1 || 0
`,
},
],
},
{
messageId: 'conditionErrorNullableObject',
line: 6,
column: 9,
suggestions: [
{
messageId: 'conditionFixCompareNullish',
output: `
declare const obj: { x: number } | null;
!obj ? 1 : 0
!obj
obj || 0
;(obj != null) && 1 || 0
`,
},
],
},
],
},
],
});