Fix unexpected change of syntax in computed EditInfo (#8638)

romainmenke · web-flow · commit ce56d5d44921 · 2025-06-26T18:17:46.000+02:00
diff --git a/.changeset/eight-donkeys-repair.md b/.changeset/eight-donkeys-repair.md
@@ -0,0 +1,5 @@
+---
+"stylelint": patch
+---
+
+Fixed: unexpected change of syntax in computed `EditInfo`
diff --git a/lib/__tests__/fixtures/postcss-naive-css-in-js.cjs b/lib/__tests__/fixtures/postcss-naive-css-in-js.cjs
@@ -41,6 +41,8 @@ function stringify(node, builder) {
 		node.each((root) => {
 			builder(`css\`${root}\`;`, root);
 		});
+	} else {
+		postcss.stringify(node, builder);
 	}
 }
 
diff --git a/lib/__tests__/standalone-compute-edit-info.test.mjs b/lib/__tests__/standalone-compute-edit-info.test.mjs
@@ -110,4 +110,22 @@ describe('standalone with computeEditInfo', () => {
 		// Second warning should not have fix due to overlapping range
 		expect(results[0].warnings[1].fix).toBeUndefined();
 	});
+
+	it('should use the correct syntax when computing EditInfo', async () => {
+		const { results } = await standalone({
+			customSyntax: 'postcss-scss',
+			code: '// a comment\na {\n\tcolor: red;\n}',
+			config: {
+				rules: {
+					'rule-empty-line-before': 'always',
+				},
+			},
+			computeEditInfo: true,
+		});
+
+		expect(results[0].warnings).toHaveLength(1);
+		expect(results[0].warnings[0].fix).toBeTruthy();
+		expect(results[0].warnings[0].fix.text).toBe('\n\n');
+		expect(results[0].warnings[0].fix.range).toEqual([12, 13]);
+	});
 });
diff --git a/lib/utils/report.cjs b/lib/utils/report.cjs
diff --git a/lib/utils/report.mjs b/lib/utils/report.mjs
@@ -247,10 +247,10 @@ function isFixApplied({ fix, line, result: { stylelint }, ruleName }) {
  * @param {Problem & { line: number }} problem
  * @returns {{range: [number, number], text: string} | undefined}
  */
-function computeEditInfo({ fix, line, result: { stylelint }, ruleName }) {
+function computeEditInfo({ fix, line, result, ruleName }) {
 	if (!fix) return;
 
-	const { disabledRanges, config = {}, rangesOfComputedEditInfos } = stylelint;
+	const { disabledRanges, config = {}, rangesOfComputedEditInfos } = result.stylelint;
 
 	if (!config.computeEditInfo || config.fix) return;
 
@@ -274,7 +274,7 @@ function computeEditInfo({ fix, line, result: { stylelint }, ruleName }) {
 	// Apply the fix
 	apply();
 
-	let fixData = { range: fixedNodeRange, text: node.toString() };
+	let fixData = { range: fixedNodeRange, text: node.toString(result.opts?.syntax) };
 
 	fixData = addSemicolonForEditInfo(node, fixData);
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"stylelint": patch
 +---
++
 +Fixed: unexpected change of syntax in computed `EditInfo`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ function stringify(node, builder) {`
`41`	`41`	`node.each((root) => {`
`42`	`42`	builder(`css\`${root}\`;`, root);
`43`	`43`	`});`
	`44`	`+ } else {`
	`45`	`+ postcss.stringify(node, builder);`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`