refactor formatting Sass list

g-plane · Jun 19, 2024 · fab18e5 · fab18e5
1 parent d9e06f4
commit fab18e5
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 32 deletions.
diff --git a/malva/src/doc_gen/sass.rs b/malva/src/doc_gen/sass.rs
@@ -167,11 +167,7 @@ impl<'s> DocGen<'s> for SassEach<'s> {
             .append(Doc::text("in"))
             .append(helpers::format_operator_suffix_space(ctx))
             .concat(ctx.end_spaced_comments(self.in_span.end, self.expr.span().start))
-            .append(if let ComponentValue::SassList(sass_list) = &self.expr {
-                sass_list.doc(ctx)
-            } else {
-                self.expr.doc(ctx).nest(ctx.indent_width)
-            })
+            .append(self.expr.doc(ctx).nest(ctx.indent_width))
             .group()
     }
 }
@@ -770,10 +766,7 @@ impl<'s> DocGen<'s> for SassParenthesizedExpression<'s> {
                 ctx.end_spaced_comments(self.span.start, expr_span.start)
                     .collect(),
             )
-            .append(match &*self.expr {
-                ComponentValue::SassList(sass_list) => sass_list.doc(ctx),
-                expr => expr.doc(ctx),
-            }),
+            .append(self.expr.doc(ctx)),
             expr_span.end,
             self.span.end,
             ctx,
@@ -874,29 +867,37 @@ impl<'s> DocGen<'s> for SassVariableDeclaration<'s> {
         docs.extend(ctx.start_spaced_comments(self.name.span.end, self.colon_span.start));
         docs.push(Doc::text(":"));
 
-        let should_group = if let ComponentValue::SassList(SassList {
-            elements,
-            comma_spans: Some(comma_spans),
-            span,
-            ..
-        }) = &self.value
-        {
-            docs.push(Doc::line_or_space());
-            docs.extend(ctx.end_spaced_comments(self.colon_span.end, value_span.start));
-            docs.push(
-                helpers::SeparatedListFormatter::new(",", Doc::line_or_space())
-                    .with_trailing()
-                    .format(elements, comma_spans, span.start, ctx),
-            );
-            if elements.len() == 1 {
-                docs.push(Doc::text(","));
+        let should_group = match &self.value {
+            ComponentValue::SassList(SassList {
+                elements,
+                comma_spans: Some(comma_spans),
+                span,
+                ..
+            }) => {
+                docs.push(Doc::line_or_space());
+                docs.extend(ctx.end_spaced_comments(self.colon_span.end, value_span.start));
+                docs.push(
+                    helpers::SeparatedListFormatter::new(",", Doc::line_or_space())
+                        .with_trailing()
+                        .format(elements, comma_spans, span.start, ctx),
+                );
+                if elements.len() == 1 {
+                    docs.push(Doc::text(","));
+                }
+                true
+            }
+            ComponentValue::SassList(sass_list) => {
+                docs.push(Doc::space());
+                docs.extend(ctx.end_spaced_comments(self.colon_span.end, value_span.start));
+                docs.push(sass_list.doc(ctx).nest(ctx.indent_width));
+                false
+            }
+            _ => {
+                docs.push(Doc::space());
+                docs.extend(ctx.end_spaced_comments(self.colon_span.end, value_span.start));
+                docs.push(self.value.doc(ctx));
+                false
             }
-            true
-        } else {
-            docs.push(Doc::space());
-            docs.extend(ctx.end_spaced_comments(self.colon_span.end, value_span.start));
-            docs.push(self.value.doc(ctx));
-            false
         };
 
         docs.extend(

diff --git a/malva/src/doc_gen/value.rs b/malva/src/doc_gen/value.rs
@@ -192,7 +192,7 @@ impl<'s> DocGen<'s> for ComponentValue<'s> {
             }
             ComponentValue::SassBinaryExpression(sass_binary_expr) => sass_binary_expr.doc(ctx),
             ComponentValue::SassKeywordArgument(sass_keyword_arg) => sass_keyword_arg.doc(ctx),
-            ComponentValue::SassList(sass_list) => sass_list.doc(ctx).nest(ctx.indent_width),
+            ComponentValue::SassList(sass_list) => sass_list.doc(ctx),
             ComponentValue::SassMap(sass_map) => sass_map.doc(ctx),
             ComponentValue::SassQualifiedName(sass_qualified_name) => sass_qualified_name.doc(ctx),
             ComponentValue::SassNestingDeclaration(sass_nesting_decl) => sass_nesting_decl.doc(ctx),