less 4.1.2 → 4.1.3

package/lib/less/parser/parser.js

@@ -139,11 +139,21 @@ var Parser = function Parser(context, imports, fileInfo) {
         //
         parse: function (str, callback, additionalData) {
             var root;
-            var error = null;
+            var err = null;
             var globalVars;
             var modifyVars;
             var ignored;
             var preText = '';
+            // Optionally disable @plugin parsing
+            if (additionalData && additionalData.disablePluginRule) {
+                parsers.plugin = function () {
+                    var dir = parserInput.$re(/^@plugin?\s+/);
+                    if (dir) {
+                        error('@plugin statements are not allowed when disablePluginRule is set to true');
+                    }
+                };
+            }
+            ;
             globalVars = (additionalData && additionalData.globalVars) ? Parser.serializeVars(additionalData.globalVars) + "\n" : '';
             modifyVars = (additionalData && additionalData.modifyVars) ? "\n" + Parser.serializeVars(additionalData.modifyVars) : '';
             if (context.pluginManager) {
@@ -208,7 +218,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                         message += '. Possibly missing something';
                     }
                 }
-                error = new less_error_1.default({
+                err = new less_error_1.default({
                     type: 'Parse',
                     message: message,
                     index: endInfo.furthest,
@@ -216,7 +226,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }, imports);
             }
             var finish = function (e) {
-                e = error || e || imports.error;
+                e = err || e || imports.error;
                 if (e) {
                     if (!(e instanceof less_error_1.default)) {
                         e = new less_error_1.default(e, imports, fileInfo.filename);
@@ -1295,15 +1305,23 @@ var Parser = function Parser(context, imports, fileInfo) {
                 var key;
                 var val;
                 var op;
+                //
+                // case-insensitive flag
+                // e.g. [attr operator value i]
+                //
+                var cif;
                 if (!(key = entities.variableCurly())) {
                     key = expect(/^(?:[_A-Za-z0-9-\*]*\|)?(?:[_A-Za-z0-9-]|\\.)+/);
                 }
                 op = parserInput.$re(/^[|~*$^]?=/);
                 if (op) {
                     val = entities.quoted() || parserInput.$re(/^[0-9]+%/) || parserInput.$re(/^[\w-]+/) || entities.variableCurly();
+                    if (val) {
+                        cif = parserInput.$re(/^[iIsS]/);
+                    }
                 }
                 expectChar(']');
-                return new (tree_1.default.Attribute)(key, op, val);
+                return new (tree_1.default.Attribute)(key, op, val, cif);
             },
             //
             // The `block` rule is used by `ruleset` and `mixin.definition`.
@@ -1550,7 +1568,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 var path;
                 var features;
                 var index = parserInput.i;
-                var dir = parserInput.$re(/^@import?\s+/);
+                var dir = parserInput.$re(/^@import\s+/);
                 if (dir) {
                     var options = (dir ? this.importOptions() : null) || {};
                     if ((path = this.entities.quoted() || this.entities.url())) {
@@ -1701,7 +1719,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 var args;
                 var options;
                 var index = parserInput.i;
-                var dir = parserInput.$re(/^@plugin?\s+/);
+                var dir = parserInput.$re(/^@plugin\s+/);
                 if (dir) {
                     args = this.pluginArgs();
                     if (args) {