fix: preserve empty lines between nested SCSS maps (#13931)

jneander · Jeremy Neander · fisker · web-flow · commit b50dfd1974d3 · 2022-12-15T14:54:47.000+08:00
Co-authored-by: Jeremy Neander &lt;jeremy.neander@glassdoor.com&gt;
Co-authored-by: fisker Cheung &lt;lionkay@gmail.com&gt;
diff --git a/changelog_unreleased/scss/13931.md b/changelog_unreleased/scss/13931.md
@@ -0,0 +1,36 @@
+#### Preserve empty lines between nested SCSS maps (#13931 by @jneander)
+
+<!-- prettier-ignore -->
+```scss
+/* Input */
+$map: (
+  'one': (
+     'key': 'value',
+  ),
+
+  'two': (
+     'key': 'value',
+  ),
+)
+
+/* Prettier stable */
+$map: (
+  'one': (
+     'key': 'value',
+  ),
+  'two': (
+     'key': 'value',
+  ),
+)
+
+/* Prettier main */
+$map: (
+  'one': (
+     'key': 'value',
+  ),
+
+  'two': (
+     'key': 'value',
+  ),
+)
+```
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
@@ -918,7 +918,8 @@ function genericPrint(path, options, print) {
               path.map((childPath, index) => {
                 const child = childPath.getValue();
                 const isLast = index === node.groups.length - 1;
-                const printed = [print(), isLast ? "" : ","];
+
+                let printed = [print(), isLast ? "" : ","];
 
                 // Key/Value pair in open paren already indented
                 if (
@@ -931,17 +932,22 @@ function genericPrint(path, options, print) {
                 ) {
                   const parts = getDocParts(printed[0].contents.contents);
                   parts[1] = group(parts[1]);
-                  return group(dedent(printed));
+                  printed = [group(dedent(printed))];
                 }
 
                 if (
                   !isLast &&
                   child.type === "value-comma_group" &&
                   isNonEmptyArray(child.groups)
                 ) {
-                  const last = getLast(child.groups);
+                  let last = getLast(child.groups);
+
+                  // `value-paren_group` does not have location info, but its closing parenthesis does.
+                  if (!last.source && last.close) {
+                    last = last.close;
+                  }
+
                   if (
-                    // `value-paren_group` missing location info
                     last.source &&
                     isNextLineEmpty(options.originalText, last, locEnd)
                   ) {
diff --git a/tests/format/scss/parens/__snapshots__/jsfmt.spec.js.snap b/tests/format/scss/parens/__snapshots__/jsfmt.spec.js.snap
@@ -28,6 +28,7 @@ $icons: (
     left: 253,
     top: 73,
   ),
+
   /* Should preserve empty lines */ cal-week-group:
     (
       left: 1,

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ $icons: (`
`28`	`28`	`left: 253,`
`29`	`29`	`top: 73,`
`30`	`30`	`),`
	`31`	`+`
`31`	`32`	`/* Should preserve empty lines */ cal-week-group:`
`32`	`33`	`(`
`33`	`34`	`left: 1,`