@@ -62,9 +62,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
6262 // or
6363 // const ErrorMap = Map<string, Error>
6464 // ^^^^^^^^^^^^^^^^^^
65- if ( node . typeParameters ) {
65+ const typeArguments = node . typeArguments ?? node . typeParameters ;
66+ if ( typeArguments ) {
6667 const firstToken = sourceCode . getFirstToken ( node ) ;
67- offsets . setOffsetToken ( sourceCode . getFirstToken ( node . typeParameters ) , 1 , firstToken ) ;
68+ offsets . setOffsetToken ( sourceCode . getFirstToken ( typeArguments ) , 1 , firstToken ) ;
6869 }
6970 } ,
7071 TSInstantiationExpression ( node : TSESTree . TSInstantiationExpression ) {
@@ -401,9 +402,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
401402 TSClassImplements ( node : TSESTree . TSClassImplements | TSESTree . TSInterfaceHeritage ) {
402403 // class C implements T {}
403404 // ^
404- if ( node . typeParameters ) {
405+ const typeArguments = node . typeArguments ?? node . typeParameters ;
406+ if ( typeArguments ) {
405407 offsets . setOffsetToken (
406- sourceCode . getFirstToken ( node . typeParameters ) ,
408+ sourceCode . getFirstToken ( typeArguments ) ,
407409 1 ,
408410 sourceCode . getFirstToken ( node )
409411 ) ;
@@ -675,6 +677,7 @@ export function defineVisitor(context: IndentContext): NodeListener {
675677 } ,
676678 TSImportType ( node : TSESTree . TSImportType ) {
677679 // import('foo').B
680+ const typeArguments = node . typeArguments ?? node . typeParameters ;
678681 const firstToken = sourceCode . getFirstToken ( node ) ;
679682 const leftParenToken = sourceCode . getTokenAfter ( firstToken , {
680683 filter : isOpeningParenToken ,
@@ -695,8 +698,8 @@ export function defineVisitor(context: IndentContext): NodeListener {
695698 const propertyToken = sourceCode . getTokenAfter ( dotToken ) ;
696699 offsets . setOffsetToken ( [ dotToken , propertyToken ] , 1 , firstToken ) ;
697700 }
698- if ( node . typeParameters ) {
699- offsets . setOffsetToken ( sourceCode . getFirstToken ( node . typeParameters ) , 1 , firstToken ) ;
701+ if ( typeArguments ) {
702+ offsets . setOffsetToken ( sourceCode . getFirstToken ( typeArguments ) , 1 , firstToken ) ;
700703 }
701704 } ,
702705 TSParameterProperty ( node : TSESTree . TSParameterProperty ) {
@@ -1055,9 +1058,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
10551058 sourceCode . getFirstToken ( node . id || node )
10561059 ) ;
10571060 }
1058- if ( node . superTypeParameters != null && node . superClass != null ) {
1061+ const superTypeArguments = node . superTypeArguments ?? node . superTypeParameters ;
1062+ if ( superTypeArguments != null && node . superClass != null ) {
10591063 offsets . setOffsetToken (
1060- sourceCode . getFirstToken ( node . superTypeParameters ) ,
1064+ sourceCode . getFirstToken ( superTypeArguments ) ,
10611065 1 ,
10621066 sourceCode . getFirstToken ( node . superClass )
10631067 ) ;
0 commit comments