npm - less - Versions diffs - 4.2.1 → 4.2.2 - Mend

less 4.2.1 → 4.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/less.js +98 -38
package/dist/less.min.js +3 -3
package/dist/less.min.js.map +1 -1
package/lib/less/parser/parser.js +35 -6
package/lib/less/parser/parser.js.map +1 -1
package/lib/less/tree/nested-at-rule.js +4 -0
package/lib/less/tree/nested-at-rule.js.map +1 -1
package/lib/less/tree/query-in-parens.js +32 -1
package/lib/less/tree/query-in-parens.js.map +1 -1
package/package.json +4 -4
package/test/browser/generator/generate.js +2 -2
package/test/mocha-playwright/runner.js +210 -0

package/lib/less/parser/parser.js CHANGED Viewed

@@ -8,6 +8,8 @@ var parser_input_1 = tslib_1.__importDefault(require("./parser-input"));
 var utils = tslib_1.__importStar(require("../utils"));
 var function_registry_1 = tslib_1.__importDefault(require("../functions/function-registry"));
 var atrule_syntax_1 = require("../tree/atrule-syntax");
+var selector_1 = tslib_1.__importDefault(require("../tree/selector"));
+var anonymous_1 = tslib_1.__importDefault(require("../tree/anonymous"));
 //
 // less.js - parser
 //
@@ -1172,9 +1174,26 @@ var Parser = function Parser(context, imports, fileInfo, currentIndex) {
                 if (!e) {
                     parserInput.save();
                     if (parserInput.$char('(')) {
-                        if ((v = this.selector(false)) && parserInput.$char(')')) {
-                            e = new (tree_1.default.Paren)(v);
-                            parserInput.forget();
+                        if ((v = this.selector(false))) {
+                            var selectors = [];
+                            while (parserInput.$char(',')) {
+                                selectors.push(v);
+                                selectors.push(new anonymous_1.default(','));
+                                v = this.selector(false);
+                            }
+                            selectors.push(v);
+                            if (parserInput.$char(')')) {
+                                if (selectors.length > 1) {
+                                    e = new (tree_1.default.Paren)(new selector_1.default(selectors));
+                                }
+                                else {
+                                    e = new (tree_1.default.Paren)(v);
+                                }
+                                parserInput.forget();
+                            }
+                            else {
+                                parserInput.restore('Missing closing \')\'');
+                            }
                         }
                         else {
                             parserInput.restore('Missing closing \')\'');
@@ -1265,6 +1284,9 @@ var Parser = function Parser(context, imports, fileInfo, currentIndex) {
                             error('Extend can only be used at the end of selector');
                         }
                         c = parserInput.currentChar();
+                        if (Array.isArray(e)) {
+                            e.forEach(function (ele) { return elements.push(ele); });
+                        }
                         if (elements) {
                             elements.push(e);
                         }
@@ -1439,7 +1461,12 @@ var Parser = function Parser(context, imports, fileInfo, currentIndex) {
                         merge = !isVariable && name.length > 1 && name.pop().value;
                         // Custom property values get permissive parsing
                         if (name[0].value && name[0].value.slice(0, 2) === '--') {
-                            value = this.permissiveValue(/[;}]/);
+                            if (parserInput.$char(';')) {
+                                value = new anonymous_1.default('');
+                            }
+                            else {
+                                value = this.permissiveValue(/[;}]/);
+                            }
                         }
                         // Try to store values as anonymous
                         // If we need the value later we'll re-parse it in ruleset.parseValue
@@ -1563,7 +1590,9 @@ var Parser = function Parser(context, imports, fileInfo, currentIndex) {
                             }
                             // Treat like quoted values, but replace vars like unquoted expressions
                             var quote = new tree_1.default.Quoted('\'', item, true, index, fileInfo);
-                            quote.variableRegex = /@([\w-]+)/g;
+                            if (!item.startsWith('@{')) {
+                                quote.variableRegex = /@([\w-]+)/g;
+                            }
                             quote.propRegex = /\$([\w-]+)/g;
                             result.push(quote);
                         }
@@ -2213,7 +2242,7 @@ var Parser = function Parser(context, imports, fileInfo, currentIndex) {
                 var index = parserInput.i;
                 do {
                     e = this.comment();
-                    if (e) {
+                    if (e && !e.isLineComment) {
                         entities.push(e);
                         continue;
                     }