Fixup sass parser (loud comments missing)

Author: mgreter

src/expand.cpp

@@ -643,7 +643,30 @@ namespace Sass {
 
   Statement* Expand::operator()(LoudComment* c)
   {
-    return c;
+    if (ctx.output_style() == COMPRESSED) {
+      // comments should not be evaluated in compact
+      // https://github.com/sass/libsass/issues/2359
+      if (!true) return NULL;
+    }
+    eval.is_in_comment = true;
+    CommentObj rv;
+    if (Interpolation * itpl = Cast<Interpolation>(c->text())) {
+      std::string text = performInterpolation(itpl);
+      if (ctx.output_style() == COMPRESSED) {
+        if (text[2] != '!') return nullptr;
+      }
+      rv = SASS_MEMORY_NEW(Comment, c->pstate(), SASS_MEMORY_NEW(StringLiteral, "[pstate]", text), true);
+    }
+    else {
+      String* str = Cast<String>(c->text()->perform(&eval));
+      if (ctx.output_style() == COMPRESSED) {
+        if (str[2] != '!') return nullptr;
+      }
+      rv = SASS_MEMORY_NEW(Comment, c->pstate(), str, true);
+    }
+    eval.is_in_comment = false;
+    // TODO: eval the text, once we're parsing/storing it as a String_Schema
+    return rv.detach();
   }
 
   Statement* Expand::operator()(SilentComment* c)

src/parser_sass.cpp

@@ -71,7 +71,7 @@ namespace Sass {
       return StylesheetParser::importArgument();
     }
 
-    Position start(scanner.offset);
+    Position start(scanner);
     while (scanner.peekChar(next) &&
       next != $comma &&
       next != $semicolon &&
@@ -80,14 +80,8 @@ namespace Sass {
       next = scanner.peekChar();
     }
 
-    // std::cerr << "got an import\n";
-
-    return nullptr;
-
-    // return SASS_MEMORY_NEW(DynamicImport, 
-    // 
-    // (parseImportUrl(scanner.substring(start.position)),
-    //   scanner.spanFrom(start));
+    std::string url = scanner.substring(start);
+    return SASS_MEMORY_NEW(DynamicImport, "[pstate]", url);
 
   }
 
@@ -438,7 +432,9 @@ namespace Sass {
 
     if (_nextIndentation > 0) {
       if (_spaces == Sass_Indent_Type::AUTO) {
-        _spaces = Sass_Indent_Type::SPACES;
+        _spaces = containsSpace ?
+          Sass_Indent_Type::SPACES :
+          Sass_Indent_Type::TABS;
       }
     }
     _nextIndentationEnd = scanner.state();