fix

Author: ota-meshi

lib/utils/indent-ts.js

@@ -51,6 +51,10 @@ const { isTypeNode } = require('./ts-ast-utils')
  * @typedef {import('@typescript-eslint/types').TSESTree.TSInferType} TSInferType
  * @typedef {import('@typescript-eslint/types').TSESTree.TSOptionalType} TSOptionalType
  * @typedef {import('@typescript-eslint/types').TSESTree.TSNonNullExpression} TSNonNullExpression
+ * @typedef {import('@typescript-eslint/types').TSESTree.TSAsExpression} TSAsExpression
+ * @typedef {import('@typescript-eslint/types').TSESTree.TSSatisfiesExpression} TSSatisfiesExpression
+ * @typedef {import('@typescript-eslint/types').TSESTree.TSTypeReference} TSTypeReference
+ * @typedef {import('@typescript-eslint/types').TSESTree.TSInstantiationExpression} TSInstantiationExpression
  * @typedef {import('@typescript-eslint/types').TSESTree.JSXChild} JSXChild
  * @typedef {import('@typescript-eslint/types').TSESTree.TypeNode} TypeNode
  *
@@ -281,60 +285,57 @@ function defineVisitor({
       }
     },
     /**
-     * Process as expression
+     * Process as expression or satisfies expression
      *
      * e.g.
      * ```
      * var foo = bar as boolean
      * //        ^^^^^^^^^^^^^^
      * ```
-     */
-    TSAsExpression(node) {
-      const expressionTokens = getFirstAndLastTokens(node.expression)
-      const asToken = tokenStore.getTokenAfter(expressionTokens.lastToken)
-      setOffset(
-        [asToken, getFirstAndLastTokens(node.typeAnnotation).firstToken],
-        1,
-        expressionTokens.firstToken
-      )
-    },
-    /**
-     * Process satisfies expression
      *
      * e.g.
      * ```
      * var foo = bar satisfies Bar
      * //        ^^^^^^^^^^^^^^^^^
      * ```
+     *
+     * @param {TSAsExpression | TSSatisfiesExpression} node
      */
-    TSSatisfiesExpression(node) {
+    'TSAsExpression, TSSatisfiesExpression'(node) {
       const expressionTokens = getFirstAndLastTokens(node.expression)
-      const satisfiesToken = tokenStore.getTokenAfter(
+      const asOrSatisfiesToken = tokenStore.getTokenAfter(
         expressionTokens.lastToken
       )
       setOffset(
-        [satisfiesToken, getFirstAndLastTokens(node.typeAnnotation).firstToken],
+        [
+          asOrSatisfiesToken,
+          getFirstAndLastTokens(node.typeAnnotation).firstToken
+        ],
         1,
         expressionTokens.firstToken
       )
     },
     /**
-     * Process type reference
+     * Process type reference and instantiation expression
      *
      * e.g.
      * ```
      * const foo: Type<P>
      * //         ^^^^^^^
      * ```
+     *
+     * e.g.
+     * ```
+     * const ErrorMap = Map<string, Error>;
+     * //               ^^^^^^^^^^^^^^^^^^
+     * ```
+     *
+     * @param {TSTypeReference | TSInstantiationExpression} node
      */
-    TSTypeReference(node) {
+    'TSTypeReference, TSInstantiationExpression'(node) {
       if (node.typeParameters) {
-        const typeNameTokens = getFirstAndLastTokens(node.typeName)
-        setOffset(
-          tokenStore.getFirstToken(node.typeParameters),
-          1,
-          typeNameTokens.firstToken
-        )
+        const firstToken = tokenStore.getFirstToken(node)
+        setOffset(tokenStore.getFirstToken(node.typeParameters), 1, firstToken)
       }
     },
     /**
@@ -1288,19 +1289,6 @@ function defineVisitor({
       setOffset(quasiTokens, 0, firstToken)
       setOffset(expressionToken, 1, firstToken)
     },
-    /**
-     * Process instantiation expression
-     *
-     * e.g.
-     * ```
-     * const ErrorMap = Map<string, Error>;
-     * //               ^^^^^^^^^^^^^^^^^^
-     * ```
-     */
-    TSInstantiationExpression(node) {
-      const firstToken = tokenStore.getFirstToken(node)
-      setOffset(tokenStore.getFirstToken(node.typeParameters), 1, firstToken)
-    },
     // ----------------------------------------------------------------------
     // NON-STANDARD NODES
     // ----------------------------------------------------------------------