less 3.10.3 → 3.11.3

package/test/css/import-reference.css

@@ -1,8 +1,8 @@
 input[type="text"].class#id[attr=32]:not(1) {
-  color: white;
+  color: inherit;
 }
 div#id.class[a=1][b=2].class:not(1) {
-  color: white;
+  color: inherit;
 }
 @media print {
   .class {
@@ -65,19 +65,19 @@ div#id.class[a=1][b=2].class:not(1) {
 .visible {
   extend: test;
 }
-.test-mediaq-import {
+.test-rule-mediaq-import {
   color: green;
   test: 340px;
 }
 @media (max-size: 450px) {
-  .test-mediaq-import {
+  .test-rule-mediaq-import {
     color: red;
   }
 }
-.test {
+.test-rule {
   color: red;
 }
-.test:first-child {
+.test-rule:first-child {
   color: blue;
 }
 @keyframes some-name {

package/test/css/import.css

@@ -20,7 +20,7 @@
   height: 10px;
   color: red;
 }
-.test-f {
+.test-rule-f {
   height: 10px;
 }
 .deep-import-url {

package/test/css/javascript.css

@@ -22,7 +22,7 @@
   ary: "1, 2, 3";
   ary1: "1, 2, 3";
 }
-.test-tran {
+.test-rule-tran {
   1: opacity 0.3s ease-in 0.3s, max-height 0.6s linear, margin-bottom 0.4s linear;
   2: [opacity 0.3s ease-in 0.3s, max-height 0.6s linear, margin-bottom 0.4s linear];
   3: opacity 0.3s ease-in 0.3s, max-height 0.6s linear, margin-bottom 0.4s linear;

package/test/css/legacy/legacy.css

@@ -1,5 +1,5 @@
 @media (-o-min-device-pixel-ratio: 2) {
-  .test-math-and-units {
+  .test-rule-math-and-units {
     font: ignores 0/0 rules;
     test-division: 7em;
     simple: 2px;

package/test/css/math/parens-division/mixins-args.css

@@ -104,7 +104,7 @@ body {
   four: a, 11, 12, 13;
   four: a, 21, 22, 23;
 }
-.test-mixin-default-arg {
+.test-rule-mixin-default-arg {
   defaults: 1px 1px 1px;
   defaults: 2px 2px 2px;
 }

package/test/css/math/parens-division/parens.css

@@ -32,6 +32,6 @@
   margin: 2px 4em 1 5pc;
   padding: 6px 1em 2px 2;
 }
-.test-false-negatives {
+.test-rule-false-negatives {
   a: (;
 }

package/test/css/math/strict/mixins-args.css

@@ -104,7 +104,7 @@ body {
   four: a, 11, 12, 13;
   four: a, 21, 22, 23;
 }
-.test-mixin-default-arg {
+.test-rule-mixin-default-arg {
   defaults: 1px 1px 1px;
   defaults: 2px 2px 2px;
 }

package/test/css/math/strict/parens.css

@@ -32,6 +32,6 @@
   margin: 2px 4em 1 5pc;
   padding: 6px 1em 2px 2;
 }
-.test-false-negatives {
+.test-rule-false-negatives {
   a: (;
 }

package/test/css/math/strict-legacy/mixins-args.css

@@ -98,7 +98,7 @@ body {
   four: a, 11, 12, 13;
   four: a, 21, 22, 23;
 }
-.test-mixin-default-arg {
+.test-rule-mixin-default-arg {
   defaults: 1px 1px 1px;
   defaults: 2px 2px 2px;
 }

package/test/css/math/strict-legacy/parens.css

@@ -35,6 +35,6 @@
   margin: 2px 4em 1 5pc;
   padding: 6px 1em 2px 2;
 }
-.test-false-negatives {
+.test-rule-false-negatives {
   a: (;
 }

package/test/css/media.css

@@ -11,12 +11,12 @@
   }
 }
 @media screen {
-  body {
+  .body {
     max-width: 480;
   }
 }
 @media all and (device-aspect-ratio: 16 / 9) {
-  body {
+  .body {
     max-width: 800px;
   }
 }
@@ -26,20 +26,20 @@
   }
 }
 @media handheld and (min-width: 42), screen and (min-width: 20em) {
-  body {
+  .body {
     max-width: 480px;
   }
 }
 @media print {
-  body {
+  .body {
     padding: 20px;
   }
-  body header {
+  .body header {
     background-color: red;
   }
 }
 @media print and (orientation: landscape) {
-  body {
+  .body {
     margin-left: 20px;
   }
 }
@@ -67,12 +67,12 @@
   }
 }
 @media a, b and c {
-  body {
+  .body {
     width: 95%;
   }
 }
 @media a and x, b and c and x, a and y, b and c and y {
-  body {
+  .body {
     width: 100%;
   }
 }
@@ -103,7 +103,7 @@
   }
 }
 @media only screen and (max-width: 200px) {
-  body {
+  .body {
     width: 480px;
   }
 }
@@ -174,22 +174,22 @@
     background: red;
   }
 }
-body {
+.body {
   background: red;
 }
 @media (max-width: 500px) {
-  body {
+  .body {
     background: green;
   }
 }
 @media (max-width: 1000px) {
-  body {
+  .body {
     background: red;
     background: blue;
   }
 }
 @media (max-width: 1000px) and (max-width: 500px) {
-  body {
+  .body {
     background: green;
   }
 }
@@ -197,7 +197,7 @@ body {
   /* a comment */
 }
 @media (max-width: 1200px) and (max-width: 900px) {
-  body {
+  .body {
     font-size: 11px;
   }
 }

package/test/css/merge.css

@@ -1,35 +1,35 @@
-.test1 {
+.test-rule1 {
   transform: rotate(90deg), skew(30deg), scale(2, 4);
 }
-.test2 {
+.test-rule2 {
   transform: rotate(90deg), skew(30deg);
   transform: scaleX(45deg);
 }
-.test3 {
+.test-rule3 {
   transform: scaleX(45deg);
   background: url(data://img1.png);
 }
-.test4 {
+.test-rule4 {
   transform: rotate(90deg), skew(30deg), scale(2, 4) !important;
 }
-.test5 {
+.test-rule5 {
   transform: rotate(90deg), skew(30deg), scale(2, 4) !important;
 }
-.test6 {
+.test-rule6 {
   transform: scale(2, 4);
 }
-.test7 {
+.test-rule7 {
   transform: scale(2, 4), scale(2, 4), scale(2, 4) !important;
 }
-.test-interleaved {
+.test-rule-interleaved {
   transform: t1, t2, t3;
   background: b1, b2, b3;
 }
-.test-spaced {
+.test-rule-spaced {
   transform: t1 t2 t3;
   background: b1 b2, b3;
 }
-.test-interleaved-with-spaced {
+.test-rule-interleaved-with-spaced {
   transform: t1s, t2 t3s, t4 t5s t6s;
   background: b1 b2s, b3, b4;
 }

package/test/css/mixins-guards.css

@@ -1,5 +1,5 @@
 .light1 {
-  color: white;
+  color: inherit;
   margin: 1px;
 }
 .light2 {
@@ -32,19 +32,19 @@
 .default1 {
   content: default;
 }
-.test1 {
+.test-rule1 {
   content: "true.";
 }
-.test2 {
+.test-rule2 {
   content: "false.";
 }
-.test3 {
+.test-rule3 {
   content: "false.";
 }
-.test4 {
+.test-rule4 {
   content: "false.";
 }
-.test5 {
+.test-rule5 {
   content: "false.";
 }
 .bool1 {

package/test/css/mixins.css

@@ -29,7 +29,7 @@
   background-color: grey;
 }
 #header .milk {
-  color: white;
+  color: inherit;
   border: 1px solid black;
   background-color: grey;
 }
@@ -133,7 +133,7 @@ h3 + * {
   background-image: "/a.png";
   background-position: center center;
 }
-.test-rec .recursion {
+.test-rule-rec .recursion {
   color: black;
 }
 .button {

package/test/css/namespacing/namespacing-3.css

@@ -3,6 +3,21 @@
     width: 400px;
     height: 200px;
     background: red;
-    color: white;
+    color: inherit;
   }
 }
+.cell {
+  margin: 0 5px !important;
+}
+.class1 {
+  color: #33acfe !important;
+  margin: 20px !important;
+  padding: 20px !important;
+  width: 0 !important;
+}
+.class2 {
+  color: #efca44;
+  margin: 10px;
+  padding: 40px 10px;
+  width: 0 !important;
+}

package/test/css/namespacing/namespacing-4.css

@@ -1,5 +1,5 @@
 .foo {
   width: 20px;
   background: rebeccapurple;
-  color: white;
+  color: inherit;
 }

package/test/css/namespacing/namespacing-functions.css

@@ -2,3 +2,9 @@
   width: 20px;
   bar: val;
 }
+.bar {
+  width: test;
+}
+.example {
+  value: lookup;
+}

package/test/css/no-strict-math/mixins-guards.css

@@ -1,4 +1,4 @@
-.test-2798 {
+.test-rule-2798 {
   regression: fixed;
 }
 .conditions-parser-1 {

package/test/css/permissive-parse.css

@@ -31,7 +31,7 @@ foo[attr="blah"] {
     this: works;
   }
 }
-.test-comment {
+.test-rule-comment {
   --value: a /* { ; } */;
   --comment-within: ( /* okay?; comment; */ );
 }

package/test/css/plugin.css

@@ -26,7 +26,7 @@
   class-local: test-local();
 }
 @media screen {
-  .test {
+  .test-rule {
     result: global;
   }
 }
@@ -34,36 +34,36 @@
   result: global;
 }
 @media screen and (min-width: 100px) and (max-width: 400px) {
-  .test {
+  .test-rule {
     result: global;
   }
 }
 @media screen {
-  .test {
+  .test-rule {
     result: local;
   }
 }
 .root {
   prop: value;
 }
-.test-empty {
+.test-rule-empty {
   val1: foo;
   val2: foo;
 }
-.test-simple {
+.test-rule-simple {
   value: 3.141592653589793;
   value: 6.28318531;
 }
-.test-conflicts {
+.test-rule-conflicts {
   value: foo;
 }
-.test-conflicts {
+.test-rule-conflicts {
   value: bar;
 }
-.test-conflicts {
+.test-rule-conflicts {
   value: foo;
 }
-.test-collection {
+.test-rule-collection {
   list: 32, 5, "bird";
 }
 @arbitrary value after ();

package/test/css/postProcessorPlugin/postProcessor.css

@@ -1,4 +1,4 @@
 hr {height:50px;}
-.test {
-  color: white;
+.test-rule {
+  color: inherit;
 }

package/test/css/preProcessorPlugin/preProcessor.css

@@ -1,3 +1,3 @@
-.test {
+.test-rule {
   color: red;
 }

package/test/css/selectors.css

@@ -125,10 +125,10 @@ p a span {
 :nth-child(3) {
   selector: interpolated;
 }
-.test:nth-child(3) {
+.test-rule:nth-child(3) {
   selector: interpolated;
 }
-.test:nth-child(odd):not(:nth-child(3)) {
+.test-rule:nth-child(odd):not(:nth-child(3)) {
   color: #ff0000;
 }
 [prop],

package/test/css/variables.css

@@ -37,7 +37,7 @@
 .alpha {
   filter: alpha(opacity=42);
 }
-.testPollution {
+.test-rulePollution {
   a: 'no-pollution';
 }
 .units {

package/test/css/visitorPlugin/visitor.css

@@ -1,3 +1,3 @@
-.test {
+.test-rule {
   color: red;
 }

package/test/index.js

@@ -48,6 +48,12 @@ var testMap = [
             }
             return path.join('test/sourcemaps', filename) + '.json';
         }],
+
+    [{math: 'strict', strictUnits: true, globalVars: true }, 'import/json/',
+        lessTester.testImports, null, true,
+        function(filename, type, baseFolder) {
+            return path.join(baseFolder, filename) + '.json';
+        }],
     [{math: 'strict', strictUnits: true, sourceMap: {sourceMapFileInline: true}},
         'sourcemaps-empty/', lessTester.testEmptySourcemap],
     [{globalVars: true, banner: '/**\n  * Test\n  */\n'}, 'globalVars/',

package/test/less/calc.less

@@ -27,4 +27,20 @@
 .c {
   @v: 10px;
   height: calc(100% - ((@v * 3) + (@v * 2)));
-}
+}
+
+.correctly-exit-calc-mode {
+    @a: 10;
+    h2 { width: unit(@a, px); }
+
+    div { width: calc(100px * 2); }
+
+    .mk-map() {
+        text: white;
+        background: black;
+    }
+
+    @p: .mk-map();
+
+    h1 { color: @p[text]; }
+}

package/test/less/comments.less

@@ -71,7 +71,7 @@
        @b: 1px //put in @b - causes problems! --->
        ) // the
        when (@a = white) {
-    .test {
+    .test-rule {
         color: @b;
     }
 }

package/test/less/css-3.less

@@ -20,25 +20,25 @@ p:not([class*="lead"]) {
 }
 
 input[type="text"].class#id[attr=32]:not(1) {
-  color: white;
+  color: inherit;
 }
 
 div#id.class[a=1][b=2].class:not(1) {
-  color: white;
+  color: inherit;
 }
 
 ul.comma > li:not(:only-child)::after {
-  color: white;
+  color: inherit;
 }
 
 ol.comma > li:nth-last-child(2)::after {
-  color: white;
+  color: inherit;
 }
 
 li:nth-child(4n+1),
 li:nth-child(-5n),
 li:nth-child(-n+2) {
-  color: white;
+  color: inherit;
 }
 
 a[href^="http://"] {

package/test/less/css-guards.less

@@ -31,7 +31,7 @@
 @d: 3;
 
 .inheritance when (@b = 2) {
-  .test {
+  .test-rule {
     color: black;
   }
   &:hover {
@@ -46,7 +46,7 @@
 }
 
 .hideme when (@b = 1) {
-  .test {
+  .test-rule {
     color: black;
   }
   &:hover {

package/test/less/debug/import/test.less

@@ -7,7 +7,7 @@
             @media screen {
                 color: red;
                 .tst3 {
-                    color: white;
+                    color: inherit;
                 }
             }
         }
@@ -16,7 +16,7 @@
 
 .mixin_import2() {
     .tst2 {
-        color: white;
+        color: inherit;
     }
 }
 

package/test/less/debug/linenumbers.less

@@ -3,7 +3,7 @@
 @import "import/test.less";
 
 .start() {
-  .test2 {
+  .test-rule2 {
       color: red;
   }
 }
@@ -12,7 +12,7 @@
     color: black;
 }
 
-.test1 {
+.test-rule1 {
   .mix();
 }
 
@@ -24,7 +24,7 @@
 
 @debug: 1;
 & when (@debug = 1) {
-  .test {
+  .test-rule {
     color: red;
     & when (@debug = 1) {
       width: 2;

package/test/less/errors/color-func-invalid-color.less

@@ -1,3 +1,3 @@
-.test {
+.test-rule {
   color: color("NOT A COLOR");
 }

package/test/less/errors/color-func-invalid-color.txt

@@ -1,4 +1,4 @@
 ArgumentError: error evaluating function `color`: argument must be a color keyword or 3|4|6|8 digit hex e.g. #FFF in {path}color-func-invalid-color.less on line 2, column 10:
-1 .test {
+1 .test-rule {
 2   color: color("NOT A COLOR");
 3 }

package/test/less/errors/invalid-color-with-comment.less

@@ -0,0 +1 @@
+.test {color: #fffff /* comment */ ;}

package/test/less/errors/invalid-color-with-comment.txt

@@ -0,0 +1,2 @@
+ParseError: Unrecognised input in {path}invalid-color-with-comment.less on line 1, column 36:
+1 .test {color: #fffff /* comment */ ;}

package/test/less/errors/plugin-1.txt

@@ -1,2 +1,2 @@
-SyntaxError: Error in {path}plugin-error.js{node} on line 1, column 8:
-1 throw new Error('Error');{/node}
+SyntaxError: Error in {path}plugin-error.js on line 1, column 8:
+1 throw new Error('Error');

package/test/less/errors/plugin-2.txt

@@ -1,5 +1,4 @@
-SyntaxError: An error was here. in {path}plugin-error-2.js{node} on line 3, column 16:
+SyntaxError: An error was here. in {path}plugin-error-2.js on line 3, column 16:
 2     use: function() {
 3         throw new Error('An error was here.')
 4     }
-{/node}

package/test/less/errors/plugin-3.txt

@@ -1,5 +1,4 @@
-SyntaxError: Plugin error during evaluation in {path}plugin-error-3.js{node} on line 3, column 16:
+SyntaxError: Plugin error during evaluation in {path}plugin-error-3.js on line 3, column 16:
 2     eval: function() {
 3         throw new Error('An error was here.')
 4     }
-{/node}

package/test/less/errors/property-ie5-hack.less

@@ -1,3 +1,3 @@
-.test {
+.test-rule {
   display/*/: block; /*sorry for IE5*/
 }