Skip to content

Commit 96da4cb

Browse files
committed
fix: refactor
1 parent ad41da9 commit 96da4cb

File tree

1 file changed

+10
-9
lines changed
  • src/rules/indent-helpers

1 file changed

+10
-9
lines changed

src/rules/indent-helpers/ts.ts

+10-9
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export function defineVisitor(context: IndentContext): NodeListener {
4545
node: TSESTree.TSAsExpression | TSESTree.TSSatisfiesExpression,
4646
) {
4747
// foo as T
48+
// or
4849
// foo satisfies T
4950
const expressionTokens = getFirstAndLastTokens(
5051
sourceCode,
@@ -66,26 +67,26 @@ export function defineVisitor(context: IndentContext): NodeListener {
6667
// foo satisfies T
6768
visitor.TSAsExpression(node)
6869
},
69-
TSTypeReference(node: TSESTree.TSTypeReference) {
70+
TSTypeReference(
71+
node: TSESTree.TSTypeReference | TSESTree.TSInstantiationExpression,
72+
) {
7073
// T<U>
74+
// or
75+
// const ErrorMap = Map<string, Error>
76+
// ^^^^^^^^^^^^^^^^^^
7177
if (node.typeParameters) {
72-
const typeNameTokens = getFirstAndLastTokens(sourceCode, node.typeName)
78+
const firstToken = sourceCode.getFirstToken(node)
7379
offsets.setOffsetToken(
7480
sourceCode.getFirstToken(node.typeParameters),
7581
1,
76-
typeNameTokens.firstToken,
82+
firstToken,
7783
)
7884
}
7985
},
8086
TSInstantiationExpression(node: TSESTree.TSInstantiationExpression) {
8187
// const ErrorMap = Map<string, Error>
8288
// ^^^^^^^^^^^^^^^^^^
83-
const firstToken = sourceCode.getFirstToken(node)
84-
offsets.setOffsetToken(
85-
sourceCode.getFirstToken(node.typeParameters),
86-
1,
87-
firstToken,
88-
)
89+
visitor.TSTypeReference(node)
8990
},
9091
TSTypeParameterInstantiation(
9192
node:

0 commit comments

Comments
 (0)