less 4.6.5 → 4.6.7

package/lib/less/parser/parser.js

@@ -1875,15 +1875,21 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                 let p;
                 let rangeP;
                 let spacing = false;
+                const cssKeyword = () => {
+                    const k = parserInput.$re(/^(?:--|-?(?:[_a-zA-Z0-9]|[^\0-\x7F]|\\[0-9a-fA-F]{1,6}\s?|\\[^\n\r\f0-9a-fA-F]))(?:[-_a-zA-Z0-9]|[^\0-\x7F]|\\[0-9a-fA-F]{1,6}\s?|\\[^\n\r\f0-9a-fA-F])*/);
+                    if (k) {
+                        return tree.Color.fromKeyword(k) || new(tree.Keyword)(k);
+                    }
+                };
                 parserInput.save();
                 do {
                     parserInput.save();
-                    if (parserInput.$re(/^[0-9a-z-]*\s+\(/)) {
+                    if (parserInput.$re(/^(?:--|-?(?:[_a-zA-Z0-9]|[^\0-\x7F]|\\[0-9a-fA-F]{1,6}\s?|\\[^\n\r\f0-9a-fA-F]))(?:[-_a-zA-Z0-9]|[^\0-\x7F]|\\[0-9a-fA-F]{1,6}\s?|\\[^\n\r\f0-9a-fA-F])*\s+\(/)) {
                         spacing = true;
                     }
                     parserInput.restore();
 
-                    e = entities.declarationCall.bind(this)() || entities.keyword() || entities.variable() || entities.mixinLookup()
+                    e = entities.declarationCall.bind(this)() || cssKeyword() || entities.keyword() || entities.variable() || entities.mixinLookup()
                     if (e) {
                         nodes.push(e);
                         if (e.type === 'Variable' ||
@@ -1920,7 +1926,11 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                         }
                         if (closed) {
                             if (p && !e) {
-                                nodes.push(new (tree.Paren)(new (tree.QueryInParens)(p.op, p.lvalue, p.rvalue, rangeP ? rangeP.op : null, rangeP ? rangeP.rvalue : null, p._index)));
+                                const paren = new (tree.Paren)(new (tree.QueryInParens)(p.op, p.lvalue, p.rvalue, rangeP ? rangeP.op : null, rangeP ? rangeP.rvalue : null, p._index));
+                                if (!spacing) {
+                                    paren.noSpacing = true;
+                                }
+                                nodes.push(paren);
                                 e = p;
                             } else if (p && e) {
                                 nodes.push(new (tree.Paren)(new (tree.Declaration)(p, e, null, null, parserInput.i + currentIndex, fileInfo, true)));
@@ -1929,7 +1939,11 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                                 }
                                 spacing = false;
                             } else if (e) {
-                                nodes.push(new(tree.Paren)(e));
+                                const paren = new(tree.Paren)(e);
+                                if (!spacing) {
+                                    paren.noSpacing = true;
+                                }
+                                nodes.push(paren);
                                 spacing = false;
                             } else {
                                 error('badly formed media feature definition');
@@ -1942,7 +1956,14 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
 
                 parserInput.forget();
                 if (nodes.length > 0) {
-                    return new(tree.Expression)(nodes);
+                    const expression = new(tree.Expression)(nodes);
+                    if (nodes.length === 2
+                        && (nodes[0].type === 'Keyword' || nodes[0].type === 'Variable')
+                        && nodes[1].type === 'Paren'
+                        && nodes[1].noSpacing) {
+                        expression.noSpacing = true;
+                    }
+                    return expression;
                 }
             },
 
@@ -2283,10 +2304,10 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                 parserInput.save();
 
                 // hsl or rgb or lch operand
-                const match = parserInput.$re(/^[lchrgbs]\s+/);
+                const match = parserInput.$re(/^([lchrgbs])(?=\s|[,/*)]|$)/);
                 if (match) {
                     parserInput.forget();
-                    return new tree.Keyword(match[0]);
+                    return new tree.Keyword(match[1]);
                 }
 
                 parserInput.restore();

package/lib/less/tree/debug-info.js

@@ -59,7 +59,9 @@ function asMediaQuery(ctx) {
  */
 function debugInfo(context, ctx, lineSeparator) {
     let result = '';
-    if (context.dumpLineNumbers && !context.compress) {
+    // Some nodes never receive a debugInfo during parsing (e.g. the implicit
+    // ruleset of a nested @supports/@document), so there is no line to emit.
+    if (context.dumpLineNumbers && !context.compress && ctx.debugInfo) {
         switch (context.dumpLineNumbers) {
             case 'comments':
                 result = asComment(ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "less",
-	"version": "4.6.5",
+	"version": "4.6.7",
 	"description": "Leaner CSS",
 	"homepage": "http://lesscss.org",
 	"author": {