Merge pull request #1833 from mgreter/bugfix/media-query-with-comments

Improve parsing of media queries with comments
sass · Jan 9, 2016 · a227315 · a227315
2 parents 55cbcd0 + 8e0efd9
commit a227315
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -982,11 +982,9 @@ namespace Sass {
     }
 
     // it's not a map so return the lexed value as a list value
-    if (!peek< exactly<':'> >())
+    if (!lex_css< exactly<':'> >())
     { return key; }
 
-    lex< exactly<':'> >();
-
     Expression* value = parse_space_list();
 
     (*map) << std::make_pair(key, value);
@@ -1931,10 +1929,10 @@ namespace Sass {
     }
     feature = parse_expression();
     Expression* expression = 0;
-    if (lex< exactly<':'> >()) {
+    if (lex_css< exactly<':'> >()) {
       expression = parse_list();
     }
-    if (!lex< exactly<')'> >()) {
+    if (!lex_css< exactly<')'> >()) {
       error("unclosed parenthesis in media query expression", pstate);
     }
     return SASS_MEMORY_NEW(ctx.mem, Media_Query_Expression, feature->pstate(), feature, expression);