See missing media blocks. Fixes #2494

less · Mar 20, 2015 · 936b78c · 936b78c
1 parent b109287
commit 936b78c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 9 deletions.
diff --git a/lib/less/parser/parser.js b/lib/less/parser/parser.js
@@ -1290,18 +1290,29 @@ var Parser = function Parser(context, imports, fileInfo) {
                     debugInfo = getDebugInfo(parserInput.i);
                 }
 
+                parserInput.save();
+
                 if (parserInput.$str("@media")) {
                     features = this.mediaFeatures();
 
                     rules = this.block();
-                    if (rules) {
-                        media = new(tree.Media)(rules, features, parserInput.i, fileInfo);
-                        if (context.dumpLineNumbers) {
-                            media.debugInfo = debugInfo;
-                        }
-                        return media;
+
+                    if (!rules) {
+                        parserInput.restore("media definitions require block statements after any features");
+                        return;
                     }
+
+                    parserInput.forget();
+
+                    media = new(tree.Media)(rules, features, parserInput.i, fileInfo);
+                    if (context.dumpLineNumbers) {
+                        media.debugInfo = debugInfo;
+                    }
+
+                    return media;
                 }
+
+                parserInput.restore();
             },
 
             //

diff --git a/test/less/errors/parse-error-extra-parens.txt b/test/less/errors/parse-error-extra-parens.txt
diff --git a/...less/errors/parse-error-extra-parens.less → .../errors/parse-error-media-no-block-1.less b/...less/errors/parse-error-extra-parens.less → .../errors/parse-error-media-no-block-1.less
diff --git a/test/less/errors/parse-error-media-no-block-1.txt b/test/less/errors/parse-error-media-no-block-1.txt
@@ -0,0 +1,3 @@
+ParseError: media definitions require block statements after any features in {path}parse-error-media-no-block-1.less on line 1, column 24:
+1 @media (extra: bracket)) {
+2   body {
diff --git a/test/less/errors/parse-error-media-no-block-2.less b/test/less/errors/parse-error-media-no-block-2.less
@@ -0,0 +1 @@
+@media
diff --git a/test/less/errors/parse-error-media-no-block-2.txt b/test/less/errors/parse-error-media-no-block-2.txt
@@ -0,0 +1,2 @@
+ParseError: media definitions require block statements after any features in {path}parse-error-media-no-block-2.less on line 1, column 7:
+1 @media
diff --git a/test/less/errors/parse-error-media-no-block-3.less b/test/less/errors/parse-error-media-no-block-3.less
@@ -0,0 +1,4 @@
+@media (min-width: 500px) {
+  .sometimes-big {
+    font-size: 5000px;
+  }
diff --git a/test/less/errors/parse-error-media-no-block-3.txt b/test/less/errors/parse-error-media-no-block-3.txt
@@ -0,0 +1,3 @@
+ParseError: media definitions require block statements after any features in {path}parse-error-media-no-block-3.less on line 4, column 4:
+3     font-size: 5000px;
+4   }