@@ -62,9 +62,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
62
62
// or
63
63
// const ErrorMap = Map<string, Error>
64
64
// ^^^^^^^^^^^^^^^^^^
65
- if ( node . typeParameters ) {
65
+ const typeArguments = node . typeArguments ?? node . typeParameters ;
66
+ if ( typeArguments ) {
66
67
const firstToken = sourceCode . getFirstToken ( node ) ;
67
- offsets . setOffsetToken ( sourceCode . getFirstToken ( node . typeParameters ) , 1 , firstToken ) ;
68
+ offsets . setOffsetToken ( sourceCode . getFirstToken ( typeArguments ) , 1 , firstToken ) ;
68
69
}
69
70
} ,
70
71
TSInstantiationExpression ( node : TSESTree . TSInstantiationExpression ) {
@@ -401,9 +402,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
401
402
TSClassImplements ( node : TSESTree . TSClassImplements | TSESTree . TSInterfaceHeritage ) {
402
403
// class C implements T {}
403
404
// ^
404
- if ( node . typeParameters ) {
405
+ const typeArguments = node . typeArguments ?? node . typeParameters ;
406
+ if ( typeArguments ) {
405
407
offsets . setOffsetToken (
406
- sourceCode . getFirstToken ( node . typeParameters ) ,
408
+ sourceCode . getFirstToken ( typeArguments ) ,
407
409
1 ,
408
410
sourceCode . getFirstToken ( node )
409
411
) ;
@@ -675,6 +677,7 @@ export function defineVisitor(context: IndentContext): NodeListener {
675
677
} ,
676
678
TSImportType ( node : TSESTree . TSImportType ) {
677
679
// import('foo').B
680
+ const typeArguments = node . typeArguments ?? node . typeParameters ;
678
681
const firstToken = sourceCode . getFirstToken ( node ) ;
679
682
const leftParenToken = sourceCode . getTokenAfter ( firstToken , {
680
683
filter : isOpeningParenToken ,
@@ -695,8 +698,8 @@ export function defineVisitor(context: IndentContext): NodeListener {
695
698
const propertyToken = sourceCode . getTokenAfter ( dotToken ) ;
696
699
offsets . setOffsetToken ( [ dotToken , propertyToken ] , 1 , firstToken ) ;
697
700
}
698
- if ( node . typeParameters ) {
699
- offsets . setOffsetToken ( sourceCode . getFirstToken ( node . typeParameters ) , 1 , firstToken ) ;
701
+ if ( typeArguments ) {
702
+ offsets . setOffsetToken ( sourceCode . getFirstToken ( typeArguments ) , 1 , firstToken ) ;
700
703
}
701
704
} ,
702
705
TSParameterProperty ( node : TSESTree . TSParameterProperty ) {
@@ -1055,9 +1058,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
1055
1058
sourceCode . getFirstToken ( node . id || node )
1056
1059
) ;
1057
1060
}
1058
- if ( node . superTypeParameters != null && node . superClass != null ) {
1061
+ const superTypeArguments = node . superTypeArguments ?? node . superTypeParameters ;
1062
+ if ( superTypeArguments != null && node . superClass != null ) {
1059
1063
offsets . setOffsetToken (
1060
- sourceCode . getFirstToken ( node . superTypeParameters ) ,
1064
+ sourceCode . getFirstToken ( superTypeArguments ) ,
1061
1065
1 ,
1062
1066
sourceCode . getFirstToken ( node . superClass )
1063
1067
) ;
0 commit comments