Fix decorator indent

ota-meshi · ota-meshi · commit 5c278686a94f · 2021-06-23T17:47:53.000+09:00
diff --git a/lib/utils/indent-common.js b/lib/utils/indent-common.js
@@ -211,6 +211,10 @@ module.exports.defineVisitor = function create(
     defaultOptions
   )
   const sourceCode = context.getSourceCode()
+  /**
+   * @typedef { { baseToken: Token | null, offset: number, baseline: boolean, expectedIndent: number | undefined } } OffsetData
+   */
+  /** @type {Map<Token|null, OffsetData>} */
   const offsets = new Map()
   const ignoreTokens = new Set()
 
@@ -227,7 +231,7 @@ module.exports.defineVisitor = function create(
     }
     if (Array.isArray(token)) {
       for (const t of token) {
-        if (t === baseToken) continue
+        if (!t || t === baseToken) continue
         offsets.set(t, {
           baseToken,
           offset,
@@ -260,10 +264,16 @@ module.exports.defineVisitor = function create(
       return
     }
 
-    setOffset(token, offsetData.offset, offsetData.baseToken)
+    setOffset(
+      token,
+      offsetData.offset,
+      /** @type {Token} */ (offsetData.baseToken)
+    )
     if (offsetData.baseline) {
       setBaseline(token)
     }
+    const o = /** @type {OffsetData} */ (offsets.get(token))
+    o.expectedIndent = offsetData.expectedIndent
   }
 
   /**
@@ -722,7 +732,7 @@ module.exports.defineVisitor = function create(
    * Validate the given token with the pre-calculated expected indentation.
    * @param {Token} token The token to validate.
    * @param {number} expectedIndent The expected indentation.
-   * @param {number[]} [optionalExpectedIndents] The optional expected indentation.
+   * @param {[number, number?]} [optionalExpectedIndents] The optional expected indentation.
    * @returns {void}
    */
   function validateCore(token, expectedIndent, optionalExpectedIndents) {
@@ -786,8 +796,8 @@ module.exports.defineVisitor = function create(
    * Get the expected indent of comments.
    * @param {Token} nextToken The next token of comments.
    * @param {number} nextExpectedIndent The expected indent of the next token.
-   * @param {number} lastExpectedIndent The expected indent of the last token.
-   * @returns {number[]}
+   * @param {number|undefined} lastExpectedIndent The expected indent of the last token.
+   * @returns {[number, number?]}
    */
   function getCommentExpectedIndents(
     nextToken,
@@ -873,8 +883,8 @@ module.exports.defineVisitor = function create(
           baseline.add(token)
         } else if (baseline.has(offsetInfo.baseToken)) {
           // The base token is a baseline token on this line, so inherit it.
-          offsetInfo.expectedIndent = offsets.get(
-            offsetInfo.baseToken
+          offsetInfo.expectedIndent = /** @type {OffsetData} */ (
+            offsets.get(offsetInfo.baseToken)
           ).expectedIndent
           baseline.add(token)
         } else {
diff --git a/lib/utils/indent-ts.js b/lib/utils/indent-ts.js
@@ -1196,7 +1196,14 @@ function defineVisitor({
           )
           setOffset(startParentToken, 0, atToken)
         } else {
-          const startParentToken = tokenStore.getFirstToken(parent)
+          const startParentToken = tokenStore.getFirstToken(
+            parent.parent &&
+              (parent.parent.type === 'ExportDefaultDeclaration' ||
+                parent.parent.type === 'ExportNamedDeclaration') &&
+              node.range[0] < parent.parent.range[0]
+              ? parent.parent
+              : parent
+          )
           copyOffset(atToken, startParentToken)
         }
       } else {
diff --git a/tests/fixtures/script-indent/ts-class-declaration-07.vue b/tests/fixtures/script-indent/ts-class-declaration-07.vue
@@ -0,0 +1,9 @@
+<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
+<script lang="ts">
+import {Component, Prop, Vue} from "vue-property-decorator";
+
+@Component
+export default class UserComp extends Vue {
+  private id = "UserComp";
+}
+</script>
diff --git a/tests/fixtures/script-indent/ts-decorator-02.vue b/tests/fixtures/script-indent/ts-decorator-02.vue
@@ -0,0 +1,14 @@
+<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
+<script lang="ts">
+@
+(
+  d
+)
+@
+(
+  d
+)
+  .d
+export class Foo {
+}
+</script>
