🌐 AI搜索 & 代理 主页
Skip to content

feat(eslint-plugin): [space-infix-ops] missing error report for conditional types #5041

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
bradzacher merged 4 commits into from
May 26, 2022
+130 −1
Merged

feat(eslint-plugin): [space-infix-ops] missing error report for conditional types #5041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8c7d91
fix(eslint-plugin): [space-infix-ops] missing error report for condit…
holazz May 22, 2022
45432cd
chore: replace internal method
holazz May 23, 2022
49c859e
chore: add more test cases
holazz May 26, 2022
2064bcd
Merge branch 'main' into fix/space-infix-ops
JoshuaKGoldberg May 26, 2022
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
21 changes: 20 additions & 1 deletion packages/eslint-plugin/src/rules/space-infix-ops.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ export default util.createRule<Options, MessageIds>({
};

function isSpaceChar(token: TSESTree.Token): boolean {
return token.type === AST_TOKEN_TYPES.Punctuator && token.value === '=';
return (
token.type === AST_TOKEN_TYPES.Punctuator &&
/^[=|?|:]$/.test(token.value)
);
}

function checkAndReportAssignmentSpace(
Expand Down Expand Up @@ -180,13 +183,29 @@ export default util.createRule<Options, MessageIds>({
checkAndReportAssignmentSpace(node, leftNode, rightNode);
}

function checkForTypeConditional(node: TSESTree.TSConditionalType): void {
const extendsTypeNode = sourceCode.getTokenByRangeStart(
node.extendsType.range[0],
)!;
const trueTypeNode = sourceCode.getTokenByRangeStart(
node.trueType.range[0],
)!;
const falseTypeNode = sourceCode.getTokenByRangeStart(
node.falseType.range[0],
);

checkAndReportAssignmentSpace(node, extendsTypeNode, trueTypeNode);
checkAndReportAssignmentSpace(node, trueTypeNode, falseTypeNode);
}

return {
...rules,
TSEnumMember: checkForEnumAssignmentSpace,
PropertyDefinition: checkForPropertyDefinitionAssignmentSpace,
TSTypeAliasDeclaration: checkForTypeAliasAssignment,
TSUnionType: checkForTypeAnnotationSpace,
TSIntersectionType: checkForTypeAnnotationSpace,
TSConditionalType: checkForTypeConditional,
};
},
});
110 changes: 110 additions & 0 deletions packages/eslint-plugin/tests/rules/space-infix-ops.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,116 @@ ruleTester.run('space-infix-ops', rule, {
},
],
},
{
code: `
type Test<T> = T extends boolean?true:false
`,
output: `
type Test<T> = T extends boolean ? true : false
`,
errors: [
{
messageId: 'missingSpace',
column: 41,
line: 2,
},
{
messageId: 'missingSpace',
column: 46,
line: 2,
},
],
},
{
code: `
type Test<T> = T extends boolean? true :false
`,
output: `
type Test<T> = T extends boolean ? true : false
`,
errors: [
{
messageId: 'missingSpace',
column: 41,
line: 2,
},
{
messageId: 'missingSpace',
column: 48,
line: 2,
},
],
},
{
code: `
type Test<T> = T extends boolean?
true :false
`,
output: `
type Test<T> = T extends boolean ?
true : false
`,
errors: [
{
messageId: 'missingSpace',
column: 41,
line: 2,
},
{
messageId: 'missingSpace',
column: 16,
line: 3,
},
],
},
{
code: `
type Test<T> = T extends boolean?
true
:false
`,
output: `
type Test<T> = T extends boolean ?
true
: false
`,
errors: [
{
messageId: 'missingSpace',
column: 41,
line: 2,
},
{
messageId: 'missingSpace',
column: 11,
line: 4,
},
],
},
{
code: `
type Test<T> = T extends boolean
?true:
false
`,
output: `
type Test<T> = T extends boolean
? true :
false
`,
errors: [
{
messageId: 'missingSpace',
column: 11,
line: 3,
},
{
messageId: 'missingSpace',
column: 16,
line: 3,
},
],
},
{
code: `
interface Test {
Expand Down