Fixed false positives for trailing comma with import in indent rule. (#32)

Author: ota-meshi

src/rules/indent-helpers/es.ts

@@ -576,27 +576,35 @@ export function defineVisitor(context: IndentContext): NodeListener {
 
       const namedSpecifiers: ESTree.ImportSpecifier[] = []
       for (const specifier of node.specifiers) {
-        let removeTokens
         if (specifier.type === "ImportSpecifier") {
           namedSpecifiers.push(specifier)
-          removeTokens = sourceCode.getTokens(specifier)
         } else {
-          removeTokens = sourceCode.getTokens(specifier)
+          const removeTokens = sourceCode.getTokens(specifier)
           removeTokens.shift()
-        }
-        for (const token of removeTokens) {
-          const i = beforeTokens.indexOf(token)
-          if (i >= 0) {
-            beforeTokens.splice(i, 1)
+          for (const token of removeTokens) {
+            const i = beforeTokens.indexOf(token)
+            if (i >= 0) {
+              beforeTokens.splice(i, 1)
+            }
           }
         }
       }
       if (namedSpecifiers.length) {
         const leftBrace = sourceCode.getTokenBefore(namedSpecifiers[0])!
         const rightBrace = sourceCode.getTokenAfter(
           namedSpecifiers[namedSpecifiers.length - 1],
-        )
+          { filter: isClosingBraceToken, includeComments: false },
+        )!
         offsets.setOffsetElementList(namedSpecifiers, leftBrace, rightBrace, 1)
+        for (const token of sourceCode.getTokensBetween(
+          leftBrace,
+          rightBrace,
+        )) {
+          const i = beforeTokens.indexOf(token)
+          if (i >= 0) {
+            beforeTokens.splice(i, 1)
+          }
+        }
       }
 
       if (

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

@@ -0,0 +1,72 @@
+[
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 3,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 4 spaces but found 0 spaces.",
+    "line": 4,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 4 spaces but found 0 spaces.",
+    "line": 5,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 4 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 4 spaces but found 0 spaces.",
+    "line": 8,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 9,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 4 spaces but found 0 spaces.",
+    "line": 10,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 11,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 4 spaces but found 0 spaces.",
+    "line": 12,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 13,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 4 spaces but found 0 spaces.",
+    "line": 14,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 2 spaces but found 0 spaces.",
+    "line": 15,
+    "column": 1
+  },
+  {
+    "message": "Expected indentation of 4 spaces but found 0 spaces.",
+    "line": 16,
+    "column": 1
+  }
+]

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

@@ -0,0 +1,19 @@
+<!-- prettier-ignore -->
+<script>
+import {
+A,
+B,
+C,
+} from
+"mod"
+import {
+D,
+} from
+"mod"
+import {E,
+F,
+} from
+"mod"
+</script>
+
+<!--tests/fixtures/rules/indent/invalid/script-import01-input.svelte-->

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

@@ -0,0 +1,19 @@
+<!-- prettier-ignore -->
+<script>
+  import {
+    A,
+    B,
+    C,
+  } from
+    "mod"
+  import {
+    D,
+  } from
+    "mod"
+  import {E,
+    F,
+  } from
+    "mod"
+</script>
+
+<!--tests/fixtures/rules/indent/invalid/script-import01-input.svelte-->