Fix wrong location in last statement (#86)

Author: ota-meshi

package.json

@@ -84,6 +84,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-regexp": "^1.5.0",
+    "eslint-plugin-simple-import-sort": "^7.0.0",
     "eslint-plugin-svelte": "^2.0.0",
     "estree-walker": "^3.0.0",
     "locate-character": "^2.0.5",

src/parser/process-template.ts

@@ -76,10 +76,20 @@ export function processTemplate(
                 script.appendOriginal(start)
                 script.skipOriginalOffset(3)
                 const end = getEndOffset(node, ctx)
-                script.appendOriginal(end - 3)
+                const scriptStart = start + 3
+                let scriptEnd = end - 3
+                let endChar: string
+                while (
+                    scriptStart < scriptEnd - 1 &&
+                    (endChar = script.originalCode[scriptEnd - 1]) &&
+                    !endChar.trim()
+                ) {
+                    scriptEnd--
+                }
+                script.appendOriginal(scriptEnd)
 
-                script.appendScript(";")
-                script.skipOriginalOffset(3)
+                script.appendScript("\n;")
+                script.skipOriginalOffset(end - scriptEnd)
 
                 script.addRestoreNodeProcess((_scriptNode, { result }) => {
                     for (
@@ -89,7 +99,10 @@ export function processTemplate(
                     ) {
                         const st = result.ast.body[index] as TSESTree.Node
                         if (st.type === AST_NODE_TYPES.EmptyStatement) {
-                            if (st.range[0] === end - 3 && st.range[1] <= end) {
+                            if (
+                                st.range[0] === scriptEnd &&
+                                st.range[1] <= end
+                            ) {
                                 result.ast.body.splice(index, 1)
                                 break
                             }

tests/fixtures/integrations/simple-import-sort/simple-import-sort-input.astro

@@ -0,0 +1,8 @@
+---
+import Layout from '@/layouts/page.layout.astro'
+import Card from '@/components/card.astro'
+---
+
+<Layout>
+    <Card/>
+</Layout>

tests/fixtures/integrations/simple-import-sort/simple-import-sort-output.astro

@@ -0,0 +1,8 @@
+---
+import Card from '@/components/card.astro'
+import Layout from '@/layouts/page.layout.astro'
+---
+
+<Layout>
+    <Card/>
+</Layout>

tests/fixtures/integrations/simple-import-sort/simple-import-sort-output.json

@@ -0,0 +1,9 @@
+[
+  {
+    "ruleId": "simple-import-sort/imports",
+    "code": "import Layout from '@/layouts/page.layout.astro'\nimport Card from '@/components/card.astro'",
+    "line": 2,
+    "column": 1,
+    "message": "Run autofix to sort these imports!"
+  }
+]

tests/fixtures/integrations/simple-import-sort/simple-import-sort-setup.ts

@@ -0,0 +1,22 @@
+/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
+import type { Linter } from "eslint"
+import { getBasicParserOptions } from "../../../src/parser/test-utils"
+// @ts-expect-error -- test
+import { rules } from "eslint-plugin-simple-import-sort"
+export function setupLinter(linter: Linter) {
+    linter.defineRule("simple-import-sort/imports", rules.imports as never)
+}
+
+export function getConfig() {
+    return {
+        parser: "astro-eslint-parser",
+        parserOptions: getBasicParserOptions(),
+        rules: {
+            "simple-import-sort/imports": "error",
+        },
+        env: {
+            browser: true,
+            es2021: true,
+        },
+    }
+}

tests/fixtures/parser/ast/core-concepts/astro-components/05-component-props-01-output.json

@@ -213,16 +213,16 @@
       ],
       "range": [
         102,
-        141
+        140
       ],
       "loc": {
         "start": {
           "line": 4,
           "column": 0
         },
         "end": {
-          "line": 5,
-          "column": 0
+          "line": 4,
+          "column": 38
         }
       }
     },

tests/fixtures/parser/ast/core-concepts/astro-components/05-component-props-03-output.json

@@ -136,16 +136,16 @@
       ],
       "range": [
         98,
-        119
+        118
       ],
       "loc": {
         "start": {
           "line": 4,
           "column": 0
         },
         "end": {
-          "line": 5,
-          "column": 0
+          "line": 4,
+          "column": 20
         }
       }
     },

tests/fixtures/parser/ast/core-concepts/astro-components/06-slots-01-output.json

@@ -378,16 +378,16 @@
       ],
       "range": [
         112,
-        141
+        140
       ],
       "loc": {
         "start": {
           "line": 6,
           "column": 0
         },
         "end": {
-          "line": 7,
-          "column": 0
+          "line": 6,
+          "column": 28
         }
       }
     },

tests/fixtures/parser/ast/core-concepts/astro-components/06-slots-03-output.json

@@ -378,16 +378,16 @@
       ],
       "range": [
         112,
-        141
+        140
       ],
       "loc": {
         "start": {
           "line": 6,
           "column": 0
         },
         "end": {
-          "line": 7,
-          "column": 0
+          "line": 6,
+          "column": 28
         }
       }
     },