Put @imported rules in the place they were imported. Fixes #352

There was some old code that grouped rules by the literal file they came
from -- even if @imported -- solely for the sake of some debug code that
I'm not convinced is particularly useful.  I removed the grouping, which
ensures that an @import in the middle of a file will correctly leave its
rules in that position.

Also inlined a few very short methods that weren't used anywhere else
and mostly just made browsing the code more confusing than necessary.  I
think this might break the repl, but it was already broken, so.

3 files changed, 24 insertions, 74 deletions

diff --git a/scss/compiler.py b/scss/compiler.py
index b6cccc5..e0ca8d5 100644
--- a/scss/compiler.py
+++ b/scss/compiler.py
@@ -281,41 +281,29 @@ class Compilation(object):
         return source
 
     def run(self):
-        # this will compile and manage rule: child objects inside of a node
-        self.parse_children()
+        # Any @import will add the source file to self.sources and infect this
+        # list, so make a quick copy to insulate against that
+        # TODO maybe @import should just not do that?
+        for source_file in list(self.sources):
+            rule = SassRule(
+                source_file=source_file,
+                lineno=1,
+
+                unparsed_contents=source_file.contents,
+                namespace=self.root_namespace,
+            )
+            self.rules.append(rule)
+            self.manage_children(rule, scope=None)
+            self._warn_unused_imports(rule)
 
-        # this will manage @extends
+        # Run through all the rules and apply @extends in a separate pass
         self.rules = self.apply_extends(self.rules)
 
-        rules_by_file, css_files = self.parse_properties()
-
-        all_rules = 0
-        all_selectors = 0
-        exceeded = ''
-        final_cont = ''
-        files = len(css_files)
-        for source_file in css_files:
-            rules = rules_by_file[source_file]
-            fcont, total_rules, total_selectors = self.create_css(rules)
-            all_rules += total_rules
-            all_selectors += total_selectors
-            # TODO i would love for the output of this function to be something
-            # useful for producing stats, so this stuff can live on the Scss
-            # class only
-            if not exceeded and all_selectors > 4095:
-                exceeded = " (IE exceeded!)"
-                log.error("Maximum number of supported selectors in Internet Explorer (4095) exceeded!")
-            if files > 1 and self.compiler.generate_source_map:
-                final_cont += "/* %s %s generated from '%s' add up to a total of %s %s accumulated%s */\n" % (
-                    total_selectors,
-                    'selector' if total_selectors == 1 else 'selectors',
-                    source_file.path,
-                    all_selectors,
-                    'selector' if all_selectors == 1 else 'selectors',
-                    exceeded)
-            final_cont += fcont
-
-        return final_cont
+        output, total_selectors = self.create_css(self.rules)
+        if total_selectors >= 4096:
+            log.error("Maximum number of supported selectors in Internet Explorer (4095) exceeded!")
+
+        return output
 
     def parse_selectors(self, raw_selectors):
         """
@@ -340,26 +328,6 @@ class Compilation(object):
 
         return selectors, parents
 
-    # @print_timing(3)
-    def parse_children(self, scope=None):
-        children = []
-        root_namespace = self.root_namespace
-        for source_file in self.sources:
-            rule = SassRule(
-                source_file=source_file,
-                lineno=1,
-
-                unparsed_contents=source_file.contents,
-                namespace=root_namespace,
-            )
-            self.rules.append(rule)
-            children.append(rule)
-
-        for rule in children:
-            self.manage_children(rule, scope)
-
-        self._warn_unused_imports(self.rules[0])
-
     def _warn_unused_imports(self, rule):
         if not rule.legacy_compiler_options.get(
                 'warn_unused', self.compiler.warn_unused_imports):
@@ -1321,25 +1289,6 @@ class Compilation(object):
         return [rule for rule in rules if not rule.is_pure_placeholder]
 
     # @print_timing(3)
-    def parse_properties(self):
-        css_files = []
-        seen_files = set()
-        rules_by_file = {}
-
-        for rule in self.rules:
-            source_file = rule.source_file
-            rules_by_file.setdefault(source_file, []).append(rule)
-
-            if rule.is_empty:
-                continue
-
-            if source_file not in seen_files:
-                seen_files.add(source_file)
-                css_files.append(source_file)
-
-        return rules_by_file, css_files
-
-    # @print_timing(3)
     def create_css(self, rules):
         """
         Generate the final CSS string
@@ -1412,7 +1361,6 @@ class Compilation(object):
 
         prev_ancestry_headers = []
 
-        total_rules = 0
         total_selectors = 0
 
         result = ''
@@ -1493,7 +1441,6 @@ class Compilation(object):
                     header_string = header.render()
                 result += tb * (i + nesting) + header_string + sp + '{' + nl
 
-                total_rules += 1
                 if header.is_selector:
                     total_selectors += 1
 
@@ -1512,7 +1459,7 @@ class Compilation(object):
         if not result.endswith('\n'):
             result += '\n'
 
-        return (result, total_rules, total_selectors)
+        return (result, total_selectors)
 
     def _print_properties(self, properties, sc=True, sp=' ', tb='', nl='\n', lnl=' '):
         result = ''
diff --git a/scss/tests/files/regressions/issue-258.css b/scss/tests/files/regressions/issue-258.css
index 559cc05..27feb03 100644
--- a/scss/tests/files/regressions/issue-258.css
+++ b/scss/tests/files/regressions/issue-258.css
@@ -3,6 +3,7 @@
     any-property: any-value;
   }
 }
+
 #B {
   my-property: this-should-be-before-media-query;
 }
diff --git a/scss/tool.py b/scss/tool.py
index a348e9c..f9b83b4 100644
--- a/scss/tool.py
+++ b/scss/tool.py
@@ -348,6 +348,7 @@ class SassRepl(object):
                     self.compilation._at_options(self.calculator, rule, scope, block)
                     continue
                 elif code == '@import':
+                    # TODO this doesn't really work either since there's no path
                     self.compilation._at_import(self.calculator, rule, scope, block)
                     continue
                 elif code == '@include':
@@ -357,6 +358,7 @@ class SassRepl(object):
                     if code:
                         final_cont += code
                     if children:
+                        # TODO this almost certainly doesn't work, and is kind of goofy anyway since @mixin isn't supported
                         self.compilation.children.extendleft(children)
                         self.compilation.parse_children()
                         code = self.compilation._create_css(self.compilation.rules).rstrip('\n')