Fixes #3423 #3420 (#3424)

* Fixes #3423 #3420 * Proper fix without reverting previous fix
less · Aug 22, 2019 · 91fd4c3 · 91fd4c3
1 parent f454ab7
commit 91fd4c3
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 30 deletions.
diff --git a/bin/lessc b/bin/lessc
@@ -8834,8 +8834,11 @@ var Parser = function Parser(context, imports, fileInfo) {
         result = parsers[p]();
 
         if (result) {
-          result._index = i + currentIndex;
-          result._fileInfo = fileInfo;
+          try {
+            result._index = i + currentIndex;
+            result._fileInfo = fileInfo;
+          } catch (e) {}
+
           returnNodes.push(result);
         } else {
           returnNodes.push(null);
@@ -11858,8 +11861,8 @@ var list = {
     return n;
   },
   extract: function extract(values, index) {
-    index = index.value - 1; // (1-based index)
-
+    // (1-based index)
+    index = index.value - 1;
     return getItemsFromNode(values)[index];
   },
   length: function length(values) {
@@ -12132,7 +12135,7 @@ var number$1 = {
 
 var string = {
   e: function e(str) {
-    return new Quoted('"', str instanceof JavaScript ? str.evaluated : str.value, true);
+    return new Anonymous(str instanceof JavaScript ? str.evaluated : str.value);
   },
   escape: function escape(str) {
     return new Anonymous(encodeURI(str.value).replace(/=/g, '%3D').replace(/:/g, '%3A').replace(/#/g, '%23').replace(/;/g, '%3B').replace(/\(/g, '%28').replace(/\)/g, '%29'));
@@ -13362,7 +13365,7 @@ var createFromEnvironment = (function (environment, fileManagers) {
    */
 
   var initial = {
-    version: [3, 10, 2],
+    version: [3, 10, 3],
     data,
     tree,
     Environment: environment$1,

diff --git a/dist/less.cjs.js b/dist/less.cjs.js
@@ -8830,8 +8830,11 @@ var Parser = function Parser(context, imports, fileInfo) {
         result = parsers[p]();
 
         if (result) {
-          result._index = i + currentIndex;
-          result._fileInfo = fileInfo;
+          try {
+            result._index = i + currentIndex;
+            result._fileInfo = fileInfo;
+          } catch (e) {}
+
           returnNodes.push(result);
         } else {
           returnNodes.push(null);
@@ -11854,8 +11857,8 @@ var list = {
     return n;
   },
   extract: function extract(values, index) {
-    index = index.value - 1; // (1-based index)
-
+    // (1-based index)
+    index = index.value - 1;
     return getItemsFromNode(values)[index];
   },
   length: function length(values) {
@@ -12128,7 +12131,7 @@ var number$1 = {
 
 var string = {
   e: function e(str) {
-    return new Quoted('"', str instanceof JavaScript ? str.evaluated : str.value, true);
+    return new Anonymous(str instanceof JavaScript ? str.evaluated : str.value);
   },
   escape: function escape(str) {
     return new Anonymous(encodeURI(str.value).replace(/=/g, '%3D').replace(/:/g, '%3A').replace(/#/g, '%23').replace(/;/g, '%3B').replace(/\(/g, '%28').replace(/\)/g, '%29'));
@@ -13358,7 +13361,7 @@ var createFromEnvironment = (function (environment, fileManagers) {
    */
 
   var initial = {
-    version: [3, 10, 2],
+    version: [3, 10, 3],
     data,
     tree,
     Environment: environment$1,

diff --git a/dist/less.js b/dist/less.js
@@ -1,5 +1,5 @@
 /**
- * Less - Leaner CSS v3.10.2
+ * Less - Leaner CSS v3.10.3
  * http://lesscss.org
  * 
  * Copyright (c) 2009-2019, Alexis Sellier <self@cloudhead.net>
@@ -8999,8 +8999,11 @@
           result = parsers[p]();
 
           if (result) {
-            result._index = i + currentIndex;
-            result._fileInfo = fileInfo;
+            try {
+              result._index = i + currentIndex;
+              result._fileInfo = fileInfo;
+            } catch (e) {}
+
             returnNodes.push(result);
           } else {
             returnNodes.push(null);
@@ -12022,8 +12025,8 @@
       return n;
     },
     extract: function extract(values, index) {
-      index = index.value - 1; // (1-based index)
-
+      // (1-based index)
+      index = index.value - 1;
       return getItemsFromNode(values)[index];
     },
     length: function length(values) {
@@ -12296,7 +12299,7 @@
 
   var string = {
     e: function e(str) {
-      return new Quoted('"', str instanceof JavaScript ? str.evaluated : str.value, true);
+      return new Anonymous(str instanceof JavaScript ? str.evaluated : str.value);
     },
     escape: function escape(str) {
       return new Anonymous(encodeURI(str.value).replace(/=/g, '%3D').replace(/:/g, '%3A').replace(/#/g, '%23').replace(/;/g, '%3B').replace(/\(/g, '%28').replace(/\)/g, '%29'));
@@ -13526,7 +13529,7 @@
      */
 
     var initial = {
-      version: [3, 10, 2],
+      version: [3, 10, 3],
       data: data,
       tree: tree,
       Environment: environment,

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/lib/less/functions/list.js b/lib/less/functions/list.js
@@ -21,7 +21,8 @@ export default {
         return n;
     },
     extract: function(values, index) {
-        index = index.value - 1; // (1-based index)
+        // (1-based index)
+        index = index.value - 1;
 
         return getItemsFromNode(values)[index];
     },

diff --git a/lib/less/functions/string.js b/lib/less/functions/string.js
@@ -1,11 +1,10 @@
 import Quoted from '../tree/quoted';
 import Anonymous from '../tree/anonymous';
-import Quote from '../tree/quoted';
 import JavaScript from '../tree/javascript';
 
 export default {
     e: function (str) {
-        return new Quote('"', str instanceof JavaScript ? str.evaluated : str.value, true);
+        return new Quoted('"', str instanceof JavaScript ? str.evaluated : str.value, true);
     },
     escape: function (str) {
         return new Anonymous(

diff --git a/lib/less/index.js b/lib/less/index.js
@@ -42,7 +42,7 @@ export default (environment, fileManagers) => {
      * It's not clear what should / must be public and why.
      */
     const initial = {
-        version: [3, 10, 2],
+        version: [3, 10, 3],
         data,
         tree,
         Environment,

diff --git a/lib/less/parser/parser.js b/lib/less/parser/parser.js
@@ -107,8 +107,10 @@ const Parser = function Parser(context, imports, fileInfo) {
                 i = parser.i;
                 result = parsers[p]();
                 if (result) {
-                    result._index = i + currentIndex;
-                    result._fileInfo = fileInfo;
+                    try {
+                        result._index = i + currentIndex;
+                        result._fileInfo = fileInfo;
+                    } catch (e) {}
                     returnNodes.push(result);
                 }
                 else {

diff --git a/lib/less/tree/quoted.js b/lib/less/tree/quoted.js
@@ -2,6 +2,7 @@ import Node from './node';
 import Variable from './variable';
 import Property from './property';
 
+
 class Quoted extends Node {
     constructor(str, content, escaped, index, currentFileInfo) {
         super();
@@ -13,6 +14,7 @@ class Quoted extends Node {
         this._fileInfo = currentFileInfo;
         this.variableRegex = /@\{([\w-]+)\}/g;
         this.propRegex = /\$\{([\w-]+)\}/g;
+        this.allowRoot = escaped;
     }
 
     genCSS(context, output) {
@@ -50,6 +52,7 @@ class Quoted extends Node {
         }
         value = iterativeReplace(value, this.variableRegex, variableReplacement);
         value = iterativeReplace(value, this.propRegex, propertyReplacement);
+
         return new Quoted(this.quote + value + this.quote, value, this.escaped, this.getIndex(), this.fileInfo());
     }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "3.10.2",
+  "version": "3.10.3",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {

diff --git a/test/css/css-escapes.css b/test/css/css-escapes.css
@@ -28,3 +28,4 @@ ng\:form {
 textarea {
   font-family: 'helvetica neue', 'wenquanyi micro hei', \5FAE\8F6F\96C5\9ED1, \5B8B\4F53, sans-serif;
 }
+anything to unquote
diff --git a/test/less/css-escapes.less b/test/less/css-escapes.less
@@ -39,4 +39,6 @@ ng\:form {
 
 textarea {
     font-family: 'helvetica neue','wenquanyi micro hei',\5FAE\8F6F\96C5\9ED1, \5B8B\4F53, sans-serif;
-}
+}
+
+e('anything to unquote');