Merge pull request #1818 from xzyfer/fix/interpolation

Fix interpolants returning quoted string in selectors
sass · Dec 31, 2015 · f2ca777 · f2ca777
2 parents 24e15fe + e2920c9
commit f2ca777
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/debugger.hpp b/src/debugger.hpp
@@ -444,7 +444,10 @@ inline void debug_ast(AST_Node* node, std::string ind, Env* env)
     Function_Call* expression = dynamic_cast<Function_Call*>(node);
     std::cerr << ind << "Function_Call " << expression;
     std::cerr << " (" << pstate_source_position(node) << ")";
-    std::cerr << " [" << expression->name() << "]" << std::endl;
+    std::cerr << " [" << expression->name() << "]";
+    if (expression->is_delayed()) std::cerr << " [delayed]";
+    if (expression->is_interpolant()) std::cerr << " [interpolant]";
+    std::cerr << std::endl;
     debug_ast(expression->arguments(), ind + " args: ", env);
   } else if (dynamic_cast<Arguments*>(node)) {
     Arguments* expression = dynamic_cast<Arguments*>(node);

diff --git a/src/parser.cpp b/src/parser.cpp
@@ -514,6 +514,7 @@ namespace Sass {
         Expression* interpolant = Parser::from_c_str(p+2, j, ctx, pstate).parse_list();
         // set status on the list expression
         interpolant->is_interpolant(true);
+        schema->has_interpolants(true);
         // add to the string schema
         (*schema) << interpolant;
         // advance position