File tree Expand file tree Collapse file tree 3 files changed +7
-13
lines changed Expand file tree Collapse file tree 3 files changed +7
-13
lines changed Original file line number Diff line number Diff line change @@ -122,7 +122,7 @@ export default createRule<[RuleOptions], MessageId>({
122
122
123
123
const { matcher } = parseExpectCall ( node ) ;
124
124
125
- if ( matcher ?. node . parent ? .type !== AST_NODE_TYPES . CallExpression ) {
125
+ if ( matcher ?. node . parent . type !== AST_NODE_TYPES . CallExpression ) {
126
126
return ;
127
127
}
128
128
Original file line number Diff line number Diff line change @@ -418,7 +418,6 @@ const reparseAsMatcher = (
418
418
* If this matcher isn't called, this will be `null`.
419
419
*/
420
420
arguments :
421
- parsedMember . node . parent &&
422
421
parsedMember . node . parent . type === AST_NODE_TYPES . CallExpression
423
422
? parsedMember . node . parent . arguments
424
423
: null ,
@@ -453,11 +452,9 @@ const reparseMemberAsModifier = (
453
452
) ;
454
453
}
455
454
456
- const negation =
457
- parsedMember . node . parent &&
458
- isExpectMember ( parsedMember . node . parent , ModifierName . not )
459
- ? parsedMember . node . parent
460
- : undefined ;
455
+ const negation = isExpectMember ( parsedMember . node . parent , ModifierName . not )
456
+ ? parsedMember . node . parent
457
+ : undefined ;
461
458
462
459
return {
463
460
...parsedMember ,
@@ -506,7 +503,7 @@ export const parseExpectCall = <ExpectNode extends ExpectCall>(
506
503
507
504
const memberNode = modifier . negation || modifier . node ;
508
505
509
- if ( ! memberNode . parent || ! isExpectMember ( memberNode . parent ) ) {
506
+ if ( ! isExpectMember ( memberNode . parent ) ) {
510
507
return expectation ;
511
508
}
512
509
Original file line number Diff line number Diff line change @@ -35,7 +35,6 @@ const getPromiseCallExpressionNode = (node: TSESTree.Node) => {
35
35
36
36
if (
37
37
node . type === AST_NODE_TYPES . CallExpression &&
38
- node . callee &&
39
38
node . callee . type === AST_NODE_TYPES . MemberExpression &&
40
39
isSupportedAccessor ( node . callee . object ) &&
41
40
getAccessorValue ( node . callee . object ) === 'Promise' &&
@@ -48,21 +47,19 @@ const getPromiseCallExpressionNode = (node: TSESTree.Node) => {
48
47
} ;
49
48
50
49
const findPromiseCallExpressionNode = ( node : TSESTree . Node ) =>
51
- node . parent &&
52
- node . parent . parent &&
50
+ node . parent ?. parent &&
53
51
[ AST_NODE_TYPES . CallExpression , AST_NODE_TYPES . ArrayExpression ] . includes (
54
52
node . parent . type ,
55
53
)
56
54
? getPromiseCallExpressionNode ( node . parent )
57
55
: null ;
58
56
59
57
const getParentIfThenified = ( node : TSESTree . Node ) : TSESTree . Node => {
60
- const grandParentNode = node . parent && node . parent . parent ;
58
+ const grandParentNode = node . parent ? .parent ;
61
59
62
60
if (
63
61
grandParentNode &&
64
62
grandParentNode . type === AST_NODE_TYPES . CallExpression &&
65
- grandParentNode . callee &&
66
63
isExpectMember ( grandParentNode . callee ) &&
67
64
[ 'then' , 'catch' ] . includes (
68
65
getAccessorValue ( grandParentNode . callee . property ) ,
You can’t perform that action at this time.
0 commit comments