fix: respect decl newlines for comments

wix · Jun 12, 2024 · 61e5422 · 61e5422
1 parent a7facdc
commit 61e5422
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/packages/code-formatter/src/format-css.ts b/packages/code-formatter/src/format-css.ts
@@ -112,7 +112,10 @@ function formatAst(ast: AnyNode, index: number, options: FormatOptions) {
             } else if (betweenNode.postSpace.includes('\n' /* don't use NL */) && valueHasNewline) {
                 newBetween += betweenNode.preComments.join(``);
                 hasNewLineBeforeValue = true;
-                newBetween += ':' + afterComments + NL;
+                const independentCommentSpace = afterComments
+                    ? NL + indent.repeat(indentLevel + 1)
+                    : '';
+                newBetween += ':' + independentCommentSpace + afterComments + NL;
             } else {
                 newBetween += betweenNode.preComments.join(``);
                 newBetween += ': ' + afterComments;

diff --git a/packages/code-formatter/test/formatter-experimental.spec.ts b/packages/code-formatter/test/formatter-experimental.spec.ts
@@ -660,6 +660,37 @@ describe('formatter - experimental', () => {
                 `,
             });
         });
+        it('should respect newlines for comments', () => {
+            testFormatCss({
+                deindent: true,
+                source: `
+                    .root {
+                        prop1: 
+                    /*start standalone line*/
+                                AAA,
+                    /*inline before*/ BBB /*inline after*/
+                        CCC
+                                /*middle standalone line*/
+                                DDD
+                        /*end standalone line*/
+                        ;
+                    }
+                `,
+                expect: `
+                    .root {
+                        prop1:
+                            /*start standalone line*/
+                            AAA,
+                            /*inline before*/ BBB /*inline after*/
+                            CCC
+                            /*middle standalone line*/
+                            DDD
+                            /*end standalone line*/;
+                    }
+
+                `,
+            });
+        });
         it('should respect newline', () => {
             testFormatCss({
                 deindent: true,