Fix comments order (#265)

waynzh · ota-meshi · web-flow · commit 211707c31938 · 2025-06-24T10:26:27.000+09:00
* Fix comments order

* chore: update

* Add test

* Update index.js

---------

Co-authored-by: Yosuke Ota &lt;otameshiyo23@gmail.com&gt;
diff --git a/src/ast/nodes.ts b/src/ast/nodes.ts
@@ -7,7 +7,6 @@ import type { ScopeManager } from "eslint-scope"
 import type { ParseError } from "./errors"
 import type { HasLocation } from "./locations"
 import type { Token } from "./tokens"
-// eslint-disable-next-line node/no-extraneous-import -- ignore
 import type { TSESTree } from "@typescript-eslint/utils"
 
 //------------------------------------------------------------------------------
diff --git a/src/script-setup/index.ts b/src/script-setup/index.ts
@@ -308,6 +308,10 @@ export function parseScriptSetupElements(
         }
         result.ast.tokens.sort((a, b) => a.range[0] - b.range[0])
     }
+
+    if (result.ast.comments != null) {
+        result.ast.comments.sort((a, b) => a.range[0] - b.range[0])
+    }
     result.ast.body.sort((a, b) => a.range[0] - b.range[0])
 
     const programStartOffset = result.ast.body.reduce(
diff --git a/test/index.js b/test/index.js
@@ -896,6 +896,44 @@ describe("Basic tests", async () => {
             assert.strictEqual(messages.length, 1)
             assert.strictEqual(messages[0].message, "'c' is not defined.")
         })
+
+        it("should sort comments by their original source position", () => {
+            const code = `<script lang="ts" setup>
+const test = () => {
+  // first
+  return false
+}
+</script>
+
+<script lang="ts">
+/**
+ * second
+ */
+export default {}
+</script>
+
+<template>
+  <div @click="test" />
+</template>`
+
+            const result = parseForESLint(code, { sourceType: "module" })
+            const comments = result.ast.comments
+
+            // Should have 2 comments
+            assert.strictEqual(comments.length, 2)
+
+            // Comments should be sorted by their original position in source code
+            assert.strictEqual(comments[0].type, "Line")
+            assert.strictEqual(comments[0].value, " first")
+            assert.strictEqual(comments[0].loc.start.line, 3)
+
+            assert.strictEqual(comments[1].type, "Block")
+            assert.strictEqual(comments[1].value, "*\n * second\n ")
+            assert.strictEqual(comments[1].loc.start.line, 9)
+
+            // Verify comments are sorted by range
+            assert.ok(comments[0].range[0] < comments[1].range[0])
+        })
     })
 })
 

Original file line number	Diff line number	Diff line change
`@@ -308,6 +308,10 @@ export function parseScriptSetupElements(`
`308`	`308`	`}`
`309`	`309`	`result.ast.tokens.sort((a, b) => a.range[0] - b.range[0])`
`310`	`310`	`}`
	`311`	`+`
	`312`	`+ if (result.ast.comments != null) {`
	`313`	`+ result.ast.comments.sort((a, b) => a.range[0] - b.range[0])`
	`314`	`+ }`
`311`	`315`	`result.ast.body.sort((a, b) => a.range[0] - b.range[0])`
`312`	`316`
`313`	`317`	`const programStartOffset = result.ast.body.reduce(`