Fix indent rule bugs (#72)

Author: ota-meshi

src/rules/indent-helpers/es.ts

@@ -11,6 +11,7 @@ import {
   isClosingParenToken,
   isNotClosingParenToken,
   isNotOpeningParenToken,
+  isNotSemicolonToken,
   isOpeningBraceToken,
   isOpeningBracketToken,
   isOpeningParenToken,
@@ -336,7 +337,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
       offsets.setOffsetToken(afterTokens, 1, fromToken)
 
       // assertions
-      const lastToken = sourceCode.getLastToken(node)!
+      const lastToken = sourceCode.getLastToken(node, {
+        filter: isNotSemicolonToken,
+        includeComments: false,
+      })!
       const assertionTokens = sourceCode.getTokensBetween(
         node.source,
         lastToken,
@@ -382,10 +386,9 @@ export function defineVisitor(context: IndentContext): NodeListener {
         const firstSpecifier = node.specifiers[0]
         if (!firstSpecifier || firstSpecifier.type === "ExportSpecifier") {
           // export {foo, bar}; or export {foo, bar} from "mod";
-          const leftBraceTokens = sourceCode.getTokensBetween(
-            exportToken,
-            firstSpecifier,
-          )
+          const leftBraceTokens = firstSpecifier
+            ? sourceCode.getTokensBetween(exportToken, firstSpecifier)
+            : [sourceCode.getTokenAfter(exportToken)!]
           const rightBraceToken = node.source
             ? sourceCode.getTokenBefore(node.source, {
                 filter: isClosingBraceToken,
@@ -417,7 +420,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
             )
 
             // assertions
-            const lastToken = sourceCode.getLastToken(node)!
+            const lastToken = sourceCode.getLastToken(node, {
+              filter: isNotSemicolonToken,
+              includeComments: false,
+            })!
             const assertionTokens = sourceCode.getTokensBetween(
               node.source,
               lastToken,
@@ -673,7 +679,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
       }
 
       // assertions
-      const lastToken = sourceCode.getLastToken(node)!
+      const lastToken = sourceCode.getLastToken(node, {
+        filter: isNotSemicolonToken,
+        includeComments: false,
+      })!
       const assertionTokens = sourceCode.getTokensBetween(
         node.source,
         lastToken,

tests/fixtures/rules/indent/invalid/script-export02-errors.json

@@ -0,0 +1,37 @@
+[
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 3,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 4,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 5,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 6,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 7,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 8,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 9,
+    "column": 1
+  }
+]

tests/fixtures/rules/indent/invalid/script-export02-input.svelte

@@ -0,0 +1,12 @@
+<!-- prettier-ignore -->
+<script>
+export
+{
+}
+;
+export
+{
+}
+</script>
+
+<!--tests/fixtures/rules/indent/invalid/script-export02-input.svelte-->

tests/fixtures/rules/indent/invalid/script-export02-output.svelte

@@ -0,0 +1,12 @@
+<!-- prettier-ignore -->
+<script>
+  export
+  {
+  }
+  ;
+  export
+  {
+  }
+</script>
+
+<!--tests/fixtures/rules/indent/invalid/script-export02-input.svelte-->

tests/fixtures/rules/indent/invalid/ts-v5/ts-import-assertion03-errors.json

@@ -25,12 +25,12 @@
     "column": 1
   },
   {
-    "message": "Expected indentation of 6 spaces but found 0 spaces.",
+    "message": "Expected indentation of 4 spaces but found 0 spaces.",
     "line": 8,
     "column": 1
   },
   {
-    "message": "Expected indentation of 4 spaces but found 0 spaces.",
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
     "line": 9,
     "column": 1
   }

tests/fixtures/rules/indent/invalid/ts-v5/ts-import-assertion03-output.svelte

@@ -5,8 +5,8 @@
       type
         :
         "json" 
-      }
-    ;
+    }
+  ;
 </script>
 
 <!--tests/fixtures/rules/indent/invalid/ts/ts-import-assertion03-input-->

tests/fixtures/rules/indent/invalid/ts-v5/ts-import-assertion04-errors.json

@@ -25,12 +25,12 @@
     "column": 1
   },
   {
-    "message": "Expected indentation of 6 spaces but found 0 spaces.",
+    "message": "Expected indentation of 4 spaces but found 0 spaces.",
     "line": 8,
     "column": 1
   },
   {
-    "message": "Expected indentation of 4 spaces but found 0 spaces.",
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
     "line": 9,
     "column": 1
   }

tests/fixtures/rules/indent/invalid/ts-v5/ts-import-assertion04-output.svelte

@@ -5,8 +5,8 @@
       type
         :
         "json"
-      }
-    ;
+    }
+  ;
 </script>
 
 <!--tests/fixtures/rules/indent/invalid/ts/ts-import-assertion04-input-->