From c64daceb20a1f366f16c84e03ce7c084e29531c2 Mon Sep 17 00:00:00 2001
From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com>
Date: Sun, 19 Jan 2020 19:27:52 -0500
Subject: [PATCH] Refactor conversion of SCSS to CSS

---
 src/css.rs  | 75 ++++++++++++++---------------------------------------
 src/main.rs | 12 ++++++++-
 2 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/src/css.rs b/src/css.rs
index e00b2da..5191b37 100644
--- a/src/css.rs
+++ b/src/css.rs
@@ -47,84 +47,49 @@ impl Toplevel {
 #[derive(Debug, Clone)]
 pub struct Css {
     blocks: Vec<Toplevel>,
-    idx: usize,
-    inner_rulesets: usize,
-    at_root: bool,
 }
 
 impl Css {
     pub const fn new() -> Self {
-        Css {
-            blocks: Vec::new(),
-            idx: 0,
-            inner_rulesets: 0,
-            at_root: true,
-        }
+        Css { blocks: Vec::new() }
     }
 
     pub fn from_stylesheet(s: StyleSheet) -> Self {
         Css::new().parse_stylesheet(s)
     }
 
-    fn parse_stmt(&mut self, stmt: Stmt) {
+    fn parse_stmt(&mut self, stmt: Stmt) -> Vec<Toplevel> {
         match stmt {
-            Stmt::Style(s) => {
-                if self.at_root {
-                    self.blocks
-                        .get_mut(self.idx - 1)
-                        .expect("expected block to exist at root")
-                        .push_style(s)
-                } else {
-                    self.blocks
-                        .get_mut(self.idx + self.inner_rulesets - 1)
-                        .expect("expected block to exist")
-                        .push_style(s)
-                }
-            }
-            Stmt::MultilineComment(s) => {
-                if self.idx == 0 {
-                    self.blocks.push(Toplevel::MultilineComment(s));
-                } else {
-                    self.blocks
-                        .get_mut(self.idx + self.inner_rulesets - 1)
-                        .expect("expected block to exist")
-                        .push_comment(s)
-                }
-            }
             Stmt::RuleSet(RuleSet {
                 selector,
                 super_selector,
                 rules,
             }) => {
-                if self.idx == 0 {
-                    self.idx = self.blocks.len() + 1;
-                    self.inner_rulesets = 0;
-                    self.blocks
-                        .push(Toplevel::new_rule(super_selector.zip(&selector)));
-                    for rule in rules {
-                        self.at_root = true;
-                        self.parse_stmt(rule);
-                        self.at_root = true;
-                    }
-                    self.idx = 0;
-                } else {
-                    self.idx += 1;
-                    self.at_root = false;
-                    self.blocks
-                        .push(Toplevel::new_rule(super_selector.zip(&selector)));
-                    for rule in rules {
-                        self.parse_stmt(rule);
-                    }
-                    self.idx -= 1;
-                    self.inner_rulesets += 1;
+                let mut vals = vec![Toplevel::new_rule(super_selector.zip(&selector))];
+                for rule in rules {
+                    match rule {
+                        Stmt::RuleSet(_) => vals.extend(self.parse_stmt(rule)),
+                        Stmt::Style(s) => vals
+                            .get_mut(0)
+                            .expect("expected block to exist")
+                            .push_style(s),
+                        Stmt::MultilineComment(s) => vals
+                            .get_mut(0)
+                            .expect("expected block to exist")
+                            .push_comment(s),
+                    };
                 }
+                vals
             }
+            Stmt::MultilineComment(s) => vec![Toplevel::MultilineComment(s)],
+            Stmt::Style(_) => panic!("expected toplevel element, found style"),
         }
     }
 
     fn parse_stylesheet(mut self, s: StyleSheet) -> Css {
         for stmt in s.0 {
-            self.parse_stmt(stmt);
+            let v = self.parse_stmt(stmt);
+            self.blocks.extend(v);
         }
         self
     }
diff --git a/src/main.rs b/src/main.rs
index 65f467c..ed8a448 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -624,9 +624,9 @@ fn main() -> SassResult<()> {
     for arg in args {
         let s = StyleSheet::from_path(arg)?;
         s.print_as_css(&mut stdout)?;
+        // s.pretty_print(&mut stdout)?;
     }
     // dbg!(s);
-    // s.pretty_print(&mut stdout)?;
     // s.pretty_print_selectors(&mut stdout)?;
     Ok(())
 }
@@ -1033,6 +1033,16 @@ mod test_styles {
         "a {\n     color      :       red    ;    \n}\n",
         "a {\n  color: red;\n}\n"
     );
+    test!(
+        triple_nested_preceding_ruleset,
+        "a {\n  b {\n    foo: bar;\n    c {}\n  }\n}\n",
+        "a b {\n  foo: bar;\n}\n"
+    );
+    test!(
+        triple_nested_following_ruleset,
+        "a {\n  b {\n    c {}\n    foo: bar;\n  }\n}\n",
+        "a b {\n  foo: bar;\n}\n"
+    );
 }
 
 #[cfg(test)]