fix(issue:4211) parse entities in comma list

correctly parse all entities in a comma separated list such that all URLs are rewritten correctly
less · Aug 20, 2023 · 6897a19 · 6897a19
1 parent 6390ae3
commit 6897a19
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 7 deletions.
diff --git a/dist/less.js b/dist/less.js
@@ -4706,6 +4706,10 @@
                         if (e) {
                             value.push(e);
                         }
+                        if (parserInput.peek(',')) {
+                            value.push(new (tree.Anonymous)(',', parserInput.i));
+                            parserInput.$char(',');
+                        }
                     } while (e);
                     done = testCurrentChar();
                     if (value.length > 0) {
@@ -7125,7 +7129,12 @@
             for (var i_1 = 0; i_1 < this.value.length; i_1++) {
                 this.value[i_1].genCSS(context, output);
                 if (!this.noSpacing && i_1 + 1 < this.value.length) {
-                    output.add(' ');
+                    if (!this.noSpacing && i_1 + 1 < this.value.length) {
+                        if (i_1 + 1 < this.value.length && !(this.value[i_1 + 1] instanceof Anonymous) ||
+                            this.value[i_1 + 1] instanceof Anonymous && this.value[i_1 + 1].value !== ',') {
+                            output.add(' ');
+                        }
+                    }
                 }
             }
         },

diff --git a/dist/less.min.js b/dist/less.min.js
diff --git a/dist/less.min.js.map b/dist/less.min.js.map
diff --git a/packages/less/dist/less.js b/packages/less/dist/less.js
@@ -4706,6 +4706,10 @@
                         if (e) {
                             value.push(e);
                         }
+                        if (parserInput.peek(',')) {
+                            value.push(new (tree.Anonymous)(',', parserInput.i));
+                            parserInput.$char(',');
+                        }
                     } while (e);
                     done = testCurrentChar();
                     if (value.length > 0) {
@@ -7125,7 +7129,12 @@
             for (var i_1 = 0; i_1 < this.value.length; i_1++) {
                 this.value[i_1].genCSS(context, output);
                 if (!this.noSpacing && i_1 + 1 < this.value.length) {
-                    output.add(' ');
+                    if (!this.noSpacing && i_1 + 1 < this.value.length) {
+                        if (i_1 + 1 < this.value.length && !(this.value[i_1 + 1] instanceof Anonymous) ||
+                            this.value[i_1 + 1] instanceof Anonymous && this.value[i_1 + 1].value !== ',') {
+                            output.add(' ');
+                        }
+                    }
                 }
             }
         },

diff --git a/packages/less/dist/less.min.js b/packages/less/dist/less.min.js
diff --git a/packages/less/dist/less.min.js.map b/packages/less/dist/less.min.js.map
diff --git a/packages/less/src/less/parser/parser.js b/packages/less/src/less/parser/parser.js
@@ -1625,6 +1625,10 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                     if (e) {
                         value.push(e);
                     }
+                    if (parserInput.peek(',')) {
+                        value.push(new (tree.Anonymous)(',', parserInput.i));
+                        parserInput.$char(',');
+                    }
                 } while (e);
 
                 done = testCurrentChar();

diff --git a/packages/less/src/less/tree/expression.js b/packages/less/src/less/tree/expression.js
@@ -2,6 +2,7 @@ import Node from './node';
 import Paren from './paren';
 import Comment from './comment';
 import Dimension from './dimension';
+import Anonymous from './anonymous';
 
 const Expression = function(value, noSpacing) {
     this.value = value;
@@ -56,7 +57,12 @@ Expression.prototype = Object.assign(new Node(), {
         for (let i = 0; i < this.value.length; i++) {
             this.value[i].genCSS(context, output);
             if (!this.noSpacing && i + 1 < this.value.length) {
-                output.add(' ');
+                if (!this.noSpacing && i + 1 < this.value.length) {
+                    if (i + 1 < this.value.length && !(this.value[i + 1] instanceof Anonymous) ||
+                        this.value[i + 1] instanceof Anonymous && this.value[i + 1].value !== ',') {
+                        output.add(' ');
+                    }
+                }
             }
         }
     },