-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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.
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
fix(eslint-plugin): [switch-exhaustiveness-check] enum members with new line or single quotes are not being fixed correctly #7806
Changes from 5 commits
e2b3789
dd729d1
fd21aa4
1acfe46
17c9ef7
c63f866
82d5b37
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ export default createRule({ | |
type: 'suggestion', | ||
docs: { | ||
description: | ||
'Require switch-case statements to be exhaustive with union type', | ||
'Require switch-case statements to be exhaustive with union types and enums', | ||
requiresTypeChecking: true, | ||
}, | ||
hasSuggestions: true, | ||
|
@@ -69,14 +69,23 @@ export default createRule({ | |
let caseTest = checker.typeToString(missingBranchType); | ||
|
||
if ( | ||
symbolName && | ||
(missingBranchName || missingBranchName === '') && | ||
requiresQuoting(missingBranchName.toString(), compilerOptions.target) | ||
) { | ||
caseTest = `${symbolName}['${missingBranchName}']`; | ||
const requiresBackticks = missingBranchName?.match(/[\r\n]/g); | ||
|
||
caseTest = requiresBackticks | ||
? `${symbolName}[\`${missingBranchName}\`]` | ||
: `${symbolName}['${missingBranchName}']`; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't know if it's discussed yet, but if we are escaping characters in the error message anyway, I would prefer text here to also be escaped instead of wrapping in backticks. Otherwise, you would also need to deal with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK, so your suggested case breaks the code (nice catch!) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It means we simply output In terms of cases, it means we output: switch (a) {
case 'a\nb': { throw new Error('Not implemented yet: "a\nb" case') }
} Instead of: switch (a) {
case `a
b`: { throw new Error('Not implemented yet: "a\nb" case') }
} I'm sure no one writes code like the latter, especially with deeper indentations. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure that we can use the same There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Have a look at this one Is that what you mean? |
||
} | ||
|
||
const errorMessage = `Not implemented yet: ${caseTest} case`; | ||
// escape single quotes and newlines, so that the error message is readable and valid code. | ||
const escapedCaseTest = caseTest | ||
.replace(/'/g, "\\'") | ||
.replace(/\n/g, '\\n') | ||
.replace(/\r/g, '\\r'); | ||
|
||
const errorMessage = `Not implemented yet: ${escapedCaseTest} case`; | ||
|
||
missingCases.push( | ||
`case ${caseTest}: { throw new Error('${errorMessage}') }`, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -518,7 +518,7 @@ export enum Enum { | |
|
||
function test(arg: Enum): string { | ||
switch (arg) { | ||
case Enum['test-test']: { throw new Error('Not implemented yet: Enum['test-test'] case') } | ||
case Enum['test-test']: { throw new Error('Not implemented yet: Enum[\\'test-test\\'] case') } | ||
StyleShit marked this conversation as resolved.
Show resolved
Hide resolved
|
||
case Enum.test: { throw new Error('Not implemented yet: Enum.test case') } | ||
} | ||
} | ||
|
@@ -555,7 +555,7 @@ export enum Enum { | |
|
||
function test(arg: Enum): string { | ||
switch (arg) { | ||
case Enum['']: { throw new Error('Not implemented yet: Enum[''] case') } | ||
case Enum['']: { throw new Error('Not implemented yet: Enum[\\'\\'] case') } | ||
case Enum.test: { throw new Error('Not implemented yet: Enum.test case') } | ||
} | ||
} | ||
|
@@ -592,7 +592,7 @@ export enum Enum { | |
|
||
function test(arg: Enum): string { | ||
switch (arg) { | ||
case Enum['9test']: { throw new Error('Not implemented yet: Enum['9test'] case') } | ||
case Enum['9test']: { throw new Error('Not implemented yet: Enum[\\'9test\\'] case') } | ||
case Enum.test: { throw new Error('Not implemented yet: Enum.test case') } | ||
} | ||
} | ||
|
@@ -602,5 +602,47 @@ function test(arg: Enum): string { | |
}, | ||
], | ||
}, | ||
{ | ||
code: ` | ||
enum Enum { | ||
'a' = 1, | ||
[\`key-with | ||
|
||
new-line\`] = 2, | ||
} | ||
|
||
declare const a: Enum; | ||
|
||
switch (a) { | ||
} | ||
`, | ||
errors: [ | ||
{ | ||
messageId: 'switchIsNotExhaustive', | ||
suggestions: [ | ||
{ | ||
messageId: 'addMissingCases', | ||
output: ` | ||
enum Enum { | ||
'a' = 1, | ||
[\`key-with | ||
|
||
new-line\`] = 2, | ||
} | ||
|
||
declare const a: Enum; | ||
|
||
switch (a) { | ||
case Enum.a: { throw new Error('Not implemented yet: Enum.a case') } | ||
case Enum[\`key-with | ||
|
||
new-line\`]: { throw new Error('Not implemented yet: Enum[\`key-with\\n\\n new-line\`] case') } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. wasn't sure about this. should we throw an error with actual new lines or There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah good question. It's such a rare case, I don't think it matters too much. But in general having error messages be on one line is easier to read. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should we just strip out any spaces, tabs, and new lines? OK... it might look weird in some cases... IDK key = `key-with
new-line`
error = "not implemented: 'key-withnew-line'"; anyway, as you said, it's a rare case that probably isn't worth the effort |
||
} | ||
`, | ||
}, | ||
], | ||
}, | ||
], | ||
}, | ||
], | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's probably not displayed correctly, would be happy to get some help here regarding how we should display this (maybe add a subtitle?):
https://deploy-preview-7806--typescript-eslint.netlify.app/rules/switch-exhaustiveness-check#examples
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<!-- /tabs -->
is what you're looking for.I'd also request a brief sentence before each of the examples explaining what they're for. It's kind of hard to piece together just from the code.
Vague starting proposal (just off the top of my head, not attached to this):
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yup