Getting CSS imports to output in the correct places. Addresses #289.

Author: Aaron Leung

output_compressed.cpp

@@ -6,7 +6,7 @@
 namespace Sass {
   using namespace std;
 
-  Output_Compressed::Output_Compressed(Context* ctx) : buffer(""), ctx(ctx) { }
+  Output_Compressed::Output_Compressed(Context* ctx) : buffer(""), rendered_imports(""), ctx(ctx) { }
   Output_Compressed::~Output_Compressed() { }
 
   inline void Output_Compressed::fallback_impl(AST_Node* n)
@@ -16,6 +16,13 @@ namespace Sass {
     buffer += i.get_buffer();
   }
 
+  void Output_Compressed::operator()(Import* imp)
+  {
+    Inspect insp(ctx);
+    imp->perform(&insp);
+    rendered_imports += insp.get_buffer();
+  }
+
   void Output_Compressed::operator()(Block* b)
   {
     if (!b->is_root()) return;

output_compressed.hpp

@@ -14,6 +14,7 @@ namespace Sass {
     using Operation_CRTP<void, Output_Compressed>::operator();
 
     string buffer;
+    string rendered_imports;
     Context* ctx;
 
     void fallback_impl(AST_Node* n);
@@ -24,7 +25,7 @@ namespace Sass {
     Output_Compressed(Context* ctx = 0);
     virtual ~Output_Compressed();
 
-    string get_buffer() { return buffer; }
+    string get_buffer() { return rendered_imports + buffer; }
 
     // statements
     virtual void operator()(Block*);
@@ -34,7 +35,7 @@ namespace Sass {
     virtual void operator()(At_Rule*);
     virtual void operator()(Declaration*);
     // virtual void operator()(Assignment*);
-    // virtual void operator()(Import*);
+    virtual void operator()(Import*);
     // virtual void operator()(Import_Stub*);
     // virtual void operator()(Warning*);
     virtual void operator()(Comment*);

output_nested.cpp

@@ -10,7 +10,7 @@ namespace Sass {
   using namespace std;
 
   Output_Nested::Output_Nested(bool source_comments, Context* ctx)
-  : buffer(""), indentation(0), source_comments(source_comments), ctx(ctx)
+  : buffer(""), rendered_imports(""), indentation(0), source_comments(source_comments), ctx(ctx)
   { }
   Output_Nested::~Output_Nested() { }
 
@@ -21,12 +21,23 @@ namespace Sass {
     buffer += i.get_buffer();
   }
 
+  void Output_Nested::operator()(Import* imp)
+  {
+    Inspect insp(ctx);
+    imp->perform(&insp);
+    if (!rendered_imports.empty()) {
+      rendered_imports += "\n";
+    }
+    rendered_imports += insp.get_buffer();
+  }
+
   void Output_Nested::operator()(Block* b)
   {
     if (!b->is_root()) return;
     for (size_t i = 0, L = b->length(); i < L; ++i) {
+      size_t old_len = buffer.length();
       (*b)[i]->perform(this);
-      if (i < L-1) append_to_buffer("\n");
+      if (i < L-1 && old_len < buffer.length()) append_to_buffer("\n");
     }
   }
 

output_nested.hpp

@@ -17,6 +17,7 @@ namespace Sass {
     using Operation_CRTP<void, Output_Nested>::operator();
 
     string buffer;
+    string rendered_imports;
     size_t indentation;
     bool source_comments;
     Context* ctx;
@@ -31,7 +32,12 @@ namespace Sass {
     Output_Nested(bool source_comments = false, Context* ctx = 0);
     virtual ~Output_Nested();
 
-    string get_buffer() { return buffer; }
+    string get_buffer() {
+        if (!rendered_imports.empty() && !buffer.empty()) {
+            rendered_imports += "\n";
+        }
+        return rendered_imports + buffer;
+    }
 
     // statements
     virtual void operator()(Block*);
@@ -41,7 +47,7 @@ namespace Sass {
     virtual void operator()(At_Rule*);
     // virtual void operator()(Declaration*);
     // virtual void operator()(Assignment*);
-    // virtual void operator()(Import*);
+    virtual void operator()(Import*);
     // virtual void operator()(Import_Stub*);
     // virtual void operator()(Warning*);
     // virtual void operator()(Comment*);

parser.cpp

@@ -128,7 +128,7 @@ namespace Sass {
           extension = import_path.substr(import_path.length() - 5, 4);
         }
         if (extension == ".css") {
-          String_Constant* loc = new (ctx.mem) String_Constant(path, source_position, import_path);
+          String_Constant* loc = new (ctx.mem) String_Constant(path, source_position, import_path, true);
           Argument* loc_arg = new (ctx.mem) Argument(path, source_position, loc);
           Arguments* loc_args = new (ctx.mem) Arguments(path, source_position);
           (*loc_args) << loc_arg;