From b594ca0dfc44c69aa0f2e6f5ea4d69ebeff1ecf0 Mon Sep 17 00:00:00 2001 From: Armano Date: Wed, 1 Jun 2022 14:22:54 +0200 Subject: [PATCH] fix(eslint-plugin): [space-infix-ops] regression fix for conditional types #5134 #5133 --- .../eslint-plugin/src/rules/space-infix-ops.ts | 17 ++++++----------- .../tests/rules/space-infix-ops.test.ts | 9 +++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/eslint-plugin/src/rules/space-infix-ops.ts b/packages/eslint-plugin/src/rules/space-infix-ops.ts index 3d5cf9e24585..aa0cfcb3d831 100644 --- a/packages/eslint-plugin/src/rules/space-infix-ops.ts +++ b/packages/eslint-plugin/src/rules/space-infix-ops.ts @@ -183,18 +183,13 @@ export default util.createRule({ } 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], - ); + const extendsLastToken = sourceCode.getLastToken(node.extendsType)!; + const trueFirstToken = sourceCode.getFirstToken(node.trueType)!; + const trueLastToken = sourceCode.getLastToken(node.trueType)!; + const falseFirstToken = sourceCode.getFirstToken(node.falseType)!; - checkAndReportAssignmentSpace(node, extendsTypeNode, trueTypeNode); - checkAndReportAssignmentSpace(node, trueTypeNode, falseTypeNode); + checkAndReportAssignmentSpace(node, extendsLastToken, trueFirstToken); + checkAndReportAssignmentSpace(node, trueLastToken, falseFirstToken); } return { diff --git a/packages/eslint-plugin/tests/rules/space-infix-ops.test.ts b/packages/eslint-plugin/tests/rules/space-infix-ops.test.ts index 59a99d9aced6..be347d856637 100644 --- a/packages/eslint-plugin/tests/rules/space-infix-ops.test.ts +++ b/packages/eslint-plugin/tests/rules/space-infix-ops.test.ts @@ -235,6 +235,15 @@ ruleTester.run('space-infix-ops', rule, { & (((() => void))); `, }, + { + code: 'type Baz = T extends (bar: string) => void ? string : number', + }, + { + code: 'type Foo = T extends { bar: string } ? string : number', + }, + { + code: 'type Baz = T extends (bar: string) => void ? { x: string } : { y: string }', + }, { code: ` interface Test { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy