less 3.9.0 → 3.10.1

package/lib/less/parser/parser.js

@@ -1,9 +1,9 @@
-var LessError = require('../less-error'),
-    tree = require('../tree'),
-    visitors = require('../visitors'),
-    getParserInput = require('./parser-input'),
-    utils = require('../utils'),
-    functionRegistry = require('../functions/function-registry');
+import LessError from '../less-error';
+import tree from '../tree';
+import visitors from '../visitors';
+import getParserInput from './parser-input';
+import * as utils from '../utils';
+import functionRegistry from '../functions/function-registry';
 
 //
 // less.js - parser
@@ -38,9 +38,9 @@ var LessError = require('../less-error'),
 //    It also takes care of moving all the indices forwards.
 //
 
-var Parser = function Parser(context, imports, fileInfo) {
-    var parsers,
-        parserInput = getParserInput();
+const Parser = function Parser(context, imports, fileInfo) {
+    let parsers;
+    const parserInput = getParserInput();
 
     function error(msg, type) {
         throw new LessError(
@@ -56,13 +56,13 @@ var Parser = function Parser(context, imports, fileInfo) {
 
     function expect(arg, msg) {
         // some older browsers return typeof 'function' for RegExp
-        var result = (arg instanceof Function) ? arg.call(parsers) : parserInput.$re(arg);
+        const result = (arg instanceof Function) ? arg.call(parsers) : parserInput.$re(arg);
         if (result) {
             return result;
         }
         
         error(msg || (typeof arg === 'string'
-            ? 'expected \'' + arg + '\' got \'' + parserInput.currentChar() + '\''
+            ? `expected '${arg}' got '${parserInput.currentChar()}'`
             : 'unexpected token'));
     }
 
@@ -71,11 +71,11 @@ var Parser = function Parser(context, imports, fileInfo) {
         if (parserInput.$char(arg)) {
             return arg;
         }
-        error(msg || 'expected \'' + arg + '\' got \'' + parserInput.currentChar() + '\'');
+        error(msg || `expected '${arg}' got '${parserInput.currentChar()}'`);
     }
 
     function getDebugInfo(index) {
-        var filename = fileInfo.filename;
+        const filename = fileInfo.filename;
 
         return {
             lineNumber: utils.getLocation(index, parserInput.getInput()).line + 1,
@@ -92,8 +92,9 @@ var Parser = function Parser(context, imports, fileInfo) {
      *  @param {Object} fileInfo     - fileInfo to attach to created nodes
      */
     function parseNode(str, parseList, currentIndex, fileInfo, callback) {
-        var result, returnNodes = [];
-        var parser = parserInput;
+        let result;
+        const returnNodes = [];
+        const parser = parserInput;
 
         try {
             parser.start(str, false, function fail(msg, index) {
@@ -102,7 +103,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     index: index + currentIndex
                 });
             });
-            for (var x = 0, p, i; (p = parseList[x]); x++) {
+            for (let x = 0, p, i; (p = parseList[x]); x++) {
                 i = parser.i;
                 result = parsers[p]();
                 if (result) {
@@ -115,7 +116,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
             }
 
-            var endInfo = parser.end();
+            const endInfo = parser.end();
             if (endInfo.isFinished) {
                 callback(null, returnNodes);
             }
@@ -129,15 +130,15 @@ var Parser = function Parser(context, imports, fileInfo) {
             }, imports, fileInfo.filename);
         }
     }
-    
+
     //
     // The Parser
     //
     return {
-        parserInput: parserInput,
-        imports: imports,
-        fileInfo: fileInfo,
-        parseNode: parseNode,
+        parserInput,
+        imports,
+        fileInfo,
+        parseNode,
         //
         // Parse an input string into an abstract syntax tree,
         // @param str A string containing 'less' markup
@@ -145,15 +146,20 @@ var Parser = function Parser(context, imports, fileInfo) {
         // @param [additionalData] An optional map which can contains vars - a map (key, value) of variables to apply
         //
         parse: function (str, callback, additionalData) {
-            var root, error = null, globalVars, modifyVars, ignored, preText = '';
+            let root;
+            let error = null;
+            let globalVars;
+            let modifyVars;
+            let ignored;
+            let preText = '';
 
-            globalVars = (additionalData && additionalData.globalVars) ? Parser.serializeVars(additionalData.globalVars) + '\n' : '';
-            modifyVars = (additionalData && additionalData.modifyVars) ? '\n' + Parser.serializeVars(additionalData.modifyVars) : '';
+            globalVars = (additionalData && additionalData.globalVars) ? `${Parser.serializeVars(additionalData.globalVars)}\n` : '';
+            modifyVars = (additionalData && additionalData.modifyVars) ? `\n${Parser.serializeVars(additionalData.modifyVars)}` : '';
 
             if (context.pluginManager) {
-                var preProcessors = context.pluginManager.getPreProcessors();
-                for (var i = 0; i < preProcessors.length; i++) {
-                    str = preProcessors[i].process(str, { context: context, imports: imports, fileInfo: fileInfo });
+                const preProcessors = context.pluginManager.getPreProcessors();
+                for (let i = 0; i < preProcessors.length; i++) {
+                    str = preProcessors[i].process(str, { context, imports, fileInfo });
                 }
             }
 
@@ -176,7 +182,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             try {
                 parserInput.start(str, context.chunkInput, function fail(msg, index) {
                     throw new LessError({
-                        index: index,
+                        index,
                         type: 'Parse',
                         message: msg,
                         filename: fileInfo.filename
@@ -202,10 +208,10 @@ var Parser = function Parser(context, imports, fileInfo) {
             // showing the line where the parse error occurred.
             // We split it up into two parts (the part which parsed,
             // and the part which didn't), so we can color them differently.
-            var endInfo = parserInput.end();
+            const endInfo = parserInput.end();
             if (!endInfo.isFinished) {
 
-                var message = endInfo.furthestPossibleErrorMessage;
+                let message = endInfo.furthestPossibleErrorMessage;
 
                 if (!message) {
                     message = 'Unrecognised input';
@@ -220,13 +226,13 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                 error = new LessError({
                     type: 'Parse',
-                    message: message,
+                    message,
                     index: endInfo.furthest,
                     filename: fileInfo.filename
                 }, imports);
             }
 
-            var finish = function (e) {
+            const finish = e => {
                 e = error || e || imports.error;
 
                 if (e) {
@@ -295,7 +301,9 @@ var Parser = function Parser(context, imports, fileInfo) {
             // block rule: at the root level.
             //
             primary: function () {
-                var mixin = this.mixin, root = [], node;
+                const mixin = this.mixin;
+                let root = [];
+                let node;
 
                 while (true) {
                     while (true) {
@@ -322,7 +330,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     if (node) {
                         root.push(node);
                     } else {
-                        var foundSemiColon = false;
+                        let foundSemiColon = false;
                         while (parserInput.$char(';')) {
                             foundSemiColon = true;
                         }
@@ -339,7 +347,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             // where the current structure allows it
             comment: function () {
                 if (parserInput.commentStore.length) {
-                    var comment = parserInput.commentStore.shift();
+                    const comment = parserInput.commentStore.shift();
                     return new(tree.Comment)(comment.text, comment.isLineComment, comment.index, fileInfo);
                 }
             },
@@ -357,7 +365,9 @@ var Parser = function Parser(context, imports, fileInfo) {
                 //     "milky way" 'he\'s the one!'
                 //
                 quoted: function (forceEscaped) {
-                    var str, index = parserInput.i, isEscaped = false;
+                    let str;
+                    const index = parserInput.i;
+                    let isEscaped = false;
 
                     parserInput.save();
                     if (parserInput.$char('~')) {
@@ -383,7 +393,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 //     black border-collapse
                 //
                 keyword: function () {
-                    var k = parserInput.$char('%') || parserInput.$re(/^\[?(?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+\]?/);
+                    const k = parserInput.$char('%') || parserInput.$re(/^\[?(?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+\]?/);
                     if (k) {
                         return tree.Color.fromKeyword(k) || new(tree.Keyword)(k);
                     }
@@ -397,7 +407,10 @@ var Parser = function Parser(context, imports, fileInfo) {
                 // The arguments are parsed with the `entities.arguments` parser.
                 //
                 call: function () {
-                    var name, args, func, index = parserInput.i;
+                    let name;
+                    let args;
+                    let func;
+                    const index = parserInput.i;
 
                     // http://jsperf.com/case-insensitive-regex-vs-strtolower-then-regex/18
                     if (parserInput.peek(/^url\(/i)) {
@@ -430,7 +443,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }
 
                     parserInput.forget();
-                    
+
                     return new(tree.Call)(name, args, index, fileInfo);
                 },
                 
@@ -455,9 +468,9 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                     function f(parse, stop) {
                         return {
-                            parse: parse, // parsing function
-                            stop:  stop   // when true - stop after parse() and return its result, 
-                                          // otherwise continue for plain args
+                            parse, // parsing function
+                            stop   // when true - stop after parse() and return its result, 
+                            // otherwise continue for plain args
                         };
                     }
                 
@@ -467,9 +480,10 @@ var Parser = function Parser(context, imports, fileInfo) {
                 },
 
                 arguments: function (prevArgs) {
-                    var argsComma = prevArgs || [],
-                        argsSemiColon = [],
-                        isSemiColonSeparated, value;
+                    let argsComma = prevArgs || [];
+                    const argsSemiColon = [];
+                    let isSemiColonSeparated;
+                    let value;
 
                     parserInput.save();
 
@@ -519,7 +533,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 //
 
                 assignment: function () {
-                    var key, value;
+                    let key;
+                    let value;
                     parserInput.save();
                     key = parserInput.$re(/^\w+(?=\s?=)/i);
                     if (!key) {
@@ -547,7 +562,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 // to be enclosed within a string, so it can't be parsed as an Expression.
                 //
                 url: function () {
-                    var value, index = parserInput.i;
+                    let value;
+                    const index = parserInput.i;
 
                     parserInput.autoCommentAbsorb = false;
 
@@ -578,14 +594,16 @@ var Parser = function Parser(context, imports, fileInfo) {
                 // see `parsers.variable`.
                 //
                 variable: function () {
-                    var ch, name, index = parserInput.i;
+                    let ch;
+                    let name;
+                    const index = parserInput.i;
 
                     parserInput.save();
                     if (parserInput.currentChar() === '@' && (name = parserInput.$re(/^@@?[\w-]+/))) {
                         ch = parserInput.currentChar();
                         if (ch === '(' || ch === '[' && !parserInput.prevChar().match(/^\s/)) {
                             // this may be a VariableCall lookup
-                            var result = parsers.variableCall(name);
+                            const result = parsers.variableCall(name);
                             if (result) {
                                 parserInput.forget();
                                 return result;
@@ -599,10 +617,11 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                 // A variable entity using the protective {} e.g. @{var}
                 variableCurly: function () {
-                    var curly, index = parserInput.i;
+                    let curly;
+                    const index = parserInput.i;
 
                     if (parserInput.currentChar() === '@' && (curly = parserInput.$re(/^@\{([\w-]+)\}/))) {
-                        return new(tree.Variable)('@' + curly[1], index, fileInfo);
+                        return new(tree.Variable)(`@${curly[1]}`, index, fileInfo);
                     }
                 },
                 //
@@ -611,7 +630,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 //     background-color: $color
                 //
                 property: function () {
-                    var name, index = parserInput.i;
+                    let name;
+                    const index = parserInput.i;
 
                     if (parserInput.currentChar() === '$' && (name = parserInput.$re(/^\$[\w-]+/))) {
                         return new(tree.Property)(name, index, fileInfo);
@@ -620,10 +640,11 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                 // A property entity useing the protective {} e.g. ${prop}
                 propertyCurly: function () {
-                    var curly, index = parserInput.i;
+                    let curly;
+                    const index = parserInput.i;
 
                     if (parserInput.currentChar() === '$' && (curly = parserInput.$re(/^\$\{([\w-]+)\}/))) {
-                        return new(tree.Property)('$' + curly[1], index, fileInfo);
+                        return new(tree.Property)(`$${curly[1]}`, index, fileInfo);
                     }
                 },
                 //
@@ -634,25 +655,30 @@ var Parser = function Parser(context, imports, fileInfo) {
                 // `rgb` and `hsl` colors are parsed through the `entities.call` parser.
                 //
                 color: function () {
-                    var rgb;
+                    let rgb;
+                    parserInput.save();
 
-                    if (parserInput.currentChar() === '#' && (rgb = parserInput.$re(/^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3,4})/))) {
-                        return new(tree.Color)(rgb[1], undefined, rgb[0]);
+                    if (parserInput.currentChar() === '#' && (rgb = parserInput.$re(/^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3,4})([\w.#\[])?/))) {
+                        if (!rgb[2]) {
+                            parserInput.forget();
+                            return new(tree.Color)(rgb[1], undefined, rgb[0]);
+                        } 
                     }
+                    parserInput.restore();
                 },
 
                 colorKeyword: function () {
                     parserInput.save();
-                    var autoCommentAbsorb = parserInput.autoCommentAbsorb;
+                    const autoCommentAbsorb = parserInput.autoCommentAbsorb;
                     parserInput.autoCommentAbsorb = false;
-                    var k = parserInput.$re(/^[_A-Za-z-][_A-Za-z0-9-]+/);
+                    const k = parserInput.$re(/^[_A-Za-z-][_A-Za-z0-9-]+/);
                     parserInput.autoCommentAbsorb = autoCommentAbsorb;
                     if (!k) {
                         parserInput.forget();
                         return;
                     }
                     parserInput.restore();
-                    var color = tree.Color.fromKeyword(k);
+                    const color = tree.Color.fromKeyword(k);
                     if (color) {
                         parserInput.$str(k);
                         return color;
@@ -669,7 +695,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                         return;
                     }
 
-                    var value = parserInput.$re(/^([+-]?\d*\.?\d+)(%|[a-z_]+)?/i);
+                    const value = parserInput.$re(/^([+-]?\d*\.?\d+)(%|[a-z_]+)?/i);
                     if (value) {
                         return new(tree.Dimension)(value[1], value[2]);
                     }
@@ -681,7 +707,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 // U+0??  or U+00A1-00A9
                 //
                 unicodeDescriptor: function () {
-                    var ud;
+                    let ud;
 
                     ud = parserInput.$re(/^U\+[0-9a-fA-F?]+(\-[0-9a-fA-F?]+)?/);
                     if (ud) {
@@ -695,12 +721,13 @@ var Parser = function Parser(context, imports, fileInfo) {
                 //     `window.location.href`
                 //
                 javascript: function () {
-                    var js, index = parserInput.i;
+                    let js;
+                    const index = parserInput.i;
 
                     parserInput.save();
 
-                    var escape = parserInput.$char('~');
-                    var jsQuote = parserInput.$char('`');
+                    const escape = parserInput.$char('~');
+                    const jsQuote = parserInput.$char('`');
 
                     if (!jsQuote) {
                         parserInput.restore();
@@ -722,7 +749,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             //     @fink:
             //
             variable: function () {
-                var name;
+                let name;
 
                 if (parserInput.currentChar() === '@' && (name = parserInput.$re(/^(@[\w-]+)\s*:/))) { return name[1]; }
             },
@@ -736,8 +763,11 @@ var Parser = function Parser(context, imports, fileInfo) {
             //     color: @fink[@color];
             //
             variableCall: function (parsedName) {
-                var lookups, important, i = parserInput.i,
-                    inValue = !!parsedName, name = parsedName;
+                let lookups;
+                let important;
+                const i = parserInput.i;
+                const inValue = !!parsedName;
+                let name = parsedName;
 
                 parserInput.save();
 
@@ -759,7 +789,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                         important = true;
                     }
 
-                    var call = new tree.VariableCall(name, i, fileInfo);
+                    const call = new tree.VariableCall(name, i, fileInfo);
                     if (!inValue && parsers.end()) {
                         parserInput.forget();
                         return call;
@@ -777,7 +807,12 @@ var Parser = function Parser(context, imports, fileInfo) {
             // extend syntax - used to extend selectors
             //
             extend: function(isRule) {
-                var elements, e, index = parserInput.i, option, extendList, extend;
+                let elements;
+                let e;
+                const index = parserInput.i;
+                let option;
+                let extendList;
+                let extend;
 
                 if (!parserInput.$str(isRule ? '&:extend(' : ':extend(')) {
                     return;
@@ -847,8 +882,13 @@ var Parser = function Parser(context, imports, fileInfo) {
                 // selector for now.
                 //
                 call: function (inValue, getLookup) {
-                    var s = parserInput.currentChar(), important = false, lookups,
-                        index = parserInput.i, elements, args, hasParens;
+                    const s = parserInput.currentChar();
+                    let important = false;
+                    let lookups;
+                    const index = parserInput.i;
+                    let elements;
+                    let args;
+                    let hasParens;
 
                     if (s !== '.' && s !== '#') { return; }
 
@@ -883,7 +923,7 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                         if (inValue || parsers.end()) {
                             parserInput.forget();
-                            var mixin = new(tree.mixin.Call)(elements, args, index, fileInfo, !lookups && important);
+                            const mixin = new(tree.mixin.Call)(elements, args, index, fileInfo, !lookups && important);
                             if (lookups) {
                                 return new tree.NamespaceValue(mixin, lookups, important);
                             }
@@ -900,8 +940,12 @@ var Parser = function Parser(context, imports, fileInfo) {
                  * (Start with . or # and can have > )
                  */
                 elements: function() {
-                    var elements, e, c, elem, elemIndex,
-                        re = /^[#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/;
+                    let elements;
+                    let e;
+                    let c;
+                    let elem;
+                    let elemIndex;
+                    const re = /^[#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/;
                     while (true) {
                         elemIndex = parserInput.i;
                         e = parserInput.$re(re);
@@ -920,11 +964,19 @@ var Parser = function Parser(context, imports, fileInfo) {
                     return elements;
                 },
                 args: function (isCall) {
-                    var entities = parsers.entities,
-                        returner = { args:null, variadic: false },
-                        expressions = [], argsSemiColon = [], argsComma = [],
-                        isSemiColonSeparated, expressionContainsNamed, name, nameLoop,
-                        value, arg, expand, hasSep = true; 
+                    const entities = parsers.entities;
+                    const returner = { args:null, variadic: false };
+                    let expressions = [];
+                    const argsSemiColon = [];
+                    const argsComma = [];
+                    let isSemiColonSeparated;
+                    let expressionContainsNamed;
+                    let name;
+                    let nameLoop;
+                    let value;
+                    let arg;
+                    let expand;
+                    let hasSep = true;
 
                     parserInput.save();
 
@@ -954,7 +1006,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                             arg.throwAwayComments();
                         }
                         value = arg;
-                        var val = null;
+                        let val = null;
 
                         if (isCall) {
                             // Variable
@@ -1008,7 +1060,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                             expressions.push(value);
                         }
 
-                        argsComma.push({ name:nameLoop, value:value, expand:expand });
+                        argsComma.push({ name:nameLoop, value, expand });
 
                         if (parserInput.$char(',')) {
                             hasSep = true;
@@ -1027,7 +1079,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                             if (expressions.length > 1) {
                                 value = new(tree.Value)(expressions);
                             }
-                            argsSemiColon.push({ name:name, value:value, expand:expand });
+                            argsSemiColon.push({ name, value, expand });
 
                             name = null;
                             expressions = [];
@@ -1059,7 +1111,12 @@ var Parser = function Parser(context, imports, fileInfo) {
                 // the `{...}` block.
                 //
                 definition: function () {
-                    var name, params = [], match, ruleset, cond, variadic = false;
+                    let name;
+                    let params = [];
+                    let match;
+                    let ruleset;
+                    let cond;
+                    let variadic = false;
                     if ((parserInput.currentChar() !== '.' && parserInput.currentChar() !== '#') ||
                         parserInput.peek(/^[^{]*\}/)) {
                         return;
@@ -1071,7 +1128,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     if (match) {
                         name = match[1];
 
-                        var argInfo = this.args(false);
+                        const argInfo = this.args(false);
                         params = argInfo.args;
                         variadic = argInfo.variadic;
 
@@ -1105,12 +1162,14 @@ var Parser = function Parser(context, imports, fileInfo) {
                 },
             
                 ruleLookups: function() {
-                    var rule, args, lookups = [];
+                    let rule;
+                    let args;
+                    const lookups = [];
 
                     if (parserInput.currentChar() !== '[') { 
                         return;
                     }
-                    
+
                     while (true) {
                         parserInput.save();
                         args = null;
@@ -1135,7 +1194,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                         return;
                     }
     
-                    var name = parserInput.$re(/^(?:[@$]{0,2})[_a-zA-Z0-9-]*/);
+                    const name = parserInput.$re(/^(?:[@$]{0,2})[_a-zA-Z0-9-]*/);
     
                     if (!parserInput.$char(']')) {
                         parserInput.restore();
@@ -1155,7 +1214,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             // and can be found inside a rule's value.
             //
             entity: function () {
-                var entities = this.entities;
+                const entities = this.entities;
 
                 return this.comment() || entities.literal() || entities.variable() || entities.url() ||
                     entities.property() || entities.call() || entities.keyword() || this.mixin.call(true) ||
@@ -1177,17 +1236,17 @@ var Parser = function Parser(context, imports, fileInfo) {
             //     alpha(opacity=88)
             //
             ieAlpha: function () {
-                var value;
+                let value;
 
                 // http://jsperf.com/case-insensitive-regex-vs-strtolower-then-regex/18
                 if (!parserInput.$re(/^opacity=/i)) { return; }
                 value = parserInput.$re(/^\d+/);
                 if (!value) {
                     value = expect(parsers.entities.variable, 'Could not parse alpha');
-                    value = '@{' + value.name.slice(1) + '}';
+                    value = `@{${value.name.slice(1)}}`;
                 }
                 expectChar(')');
-                return new tree.Quoted('', 'alpha(opacity=' + value + ')');
+                return new tree.Quoted('', `alpha(opacity=${value})`);
             },
 
             //
@@ -1203,7 +1262,10 @@ var Parser = function Parser(context, imports, fileInfo) {
             // and an element name, such as a tag a class, or `*`.
             //
             element: function () {
-                var e, c, v, index = parserInput.i;
+                let e;
+                let c;
+                let v;
+                const index = parserInput.i;
 
                 c = this.combinator();
 
@@ -1240,11 +1302,11 @@ var Parser = function Parser(context, imports, fileInfo) {
             // we deal with this in *combinator.js*.
             //
             combinator: function () {
-                var c = parserInput.currentChar();
+                let c = parserInput.currentChar();
 
                 if (c === '/') {
                     parserInput.save();
-                    var slashedCombinator = parserInput.$re(/^\/[a-z]+\//i);
+                    const slashedCombinator = parserInput.$re(/^\/[a-z]+\//i);
                     if (slashedCombinator) {
                         parserInput.forget();
                         return new(tree.Combinator)(slashedCombinator);
@@ -1276,7 +1338,14 @@ var Parser = function Parser(context, imports, fileInfo) {
             // Selectors are made out of one or more Elements, see above.
             //
             selector: function (isLess) {
-                var index = parserInput.i, elements, extendList, c, e, allExtends, when, condition;
+                const index = parserInput.i;
+                let elements;
+                let extendList;
+                let c;
+                let e;
+                let allExtends;
+                let when;
+                let condition;
                 isLess = isLess !== false;
                 while ((isLess && (extendList = this.extend())) || (isLess && (when = parserInput.$str('when'))) || (e = this.element())) {
                     if (when) {
@@ -1308,7 +1377,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 if (allExtends) { error('Extend must be used to extend a selector, it cannot be used on its own'); }
             },
             selectors: function () {
-                var s, selectors;
+                let s;
+                let selectors;
                 while (true) {
                     s = this.selector();
                     if (!s) {
@@ -1334,8 +1404,10 @@ var Parser = function Parser(context, imports, fileInfo) {
             attribute: function () {
                 if (!parserInput.$char('[')) { return; }
 
-                var entities = this.entities,
-                    key, val, op;
+                const entities = this.entities;
+                let key;
+                let val;
+                let op;
 
                 if (!(key = entities.variableCurly())) {
                     key = expect(/^(?:[_A-Za-z0-9-\*]*\|)?(?:[_A-Za-z0-9-]|\\.)+/);
@@ -1356,14 +1428,14 @@ var Parser = function Parser(context, imports, fileInfo) {
             // It's a wrapper around the `primary` rule, with added `{}`.
             //
             block: function () {
-                var content;
+                let content;
                 if (parserInput.$char('{') && (content = this.primary()) && parserInput.$char('}')) {
                     return content;
                 }
             },
 
             blockRuleset: function() {
-                var block = this.block();
+                let block = this.block();
 
                 if (block) {
                     block = new tree.Ruleset(null, block);
@@ -1372,7 +1444,9 @@ var Parser = function Parser(context, imports, fileInfo) {
             },
 
             detachedRuleset: function() {
-                var argInfo, params, variadic;
+                let argInfo;
+                let params;
+                let variadic;
 
                 parserInput.save();
                 if (parserInput.$re(/^[.#]\(/)) {
@@ -1390,7 +1464,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                         return;
                     }
                 }
-                var blockRuleset = this.blockRuleset();
+                const blockRuleset = this.blockRuleset();
                 if (blockRuleset) {
                     parserInput.forget();
                     if (params) {
@@ -1405,7 +1479,9 @@ var Parser = function Parser(context, imports, fileInfo) {
             // div, .class, body > p {...}
             //
             ruleset: function () {
-                var selectors, rules, debugInfo;
+                let selectors;
+                let rules;
+                let debugInfo;
 
                 parserInput.save();
 
@@ -1417,7 +1493,7 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                 if (selectors && (rules = this.block())) {
                     parserInput.forget();
-                    var ruleset = new(tree.Ruleset)(selectors, rules, context.strictImports);
+                    const ruleset = new(tree.Ruleset)(selectors, rules, context.strictImports);
                     if (context.dumpLineNumbers) {
                         ruleset.debugInfo = debugInfo;
                     }
@@ -1427,8 +1503,14 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
             },
             declaration: function () {
-                var name, value, index = parserInput.i, hasDR,
-                    c = parserInput.currentChar(), important, merge, isVariable;
+                let name;
+                let value;
+                const index = parserInput.i;
+                let hasDR;
+                const c = parserInput.currentChar();
+                let important;
+                let merge;
+                let isVariable;
 
                 if (c === '.' || c === '#' || c === '&' || c === ':') { return; }
 
@@ -1464,7 +1546,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                         if (value) {
                             parserInput.forget();
                             // anonymous values absorb the end ';' which is required for them to work
-                            return new (tree.Declaration)(name, value, false, merge, index, fileInfo);
+                            return new(tree.Declaration)(name, value, false, merge, index, fileInfo);
                         }
 
                         if (!value) {
@@ -1481,7 +1563,7 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                     if (value && (this.end() || hasDR)) {
                         parserInput.forget();
-                        return new (tree.Declaration)(name, value, important, merge, index, fileInfo);
+                        return new(tree.Declaration)(name, value, important, merge, index, fileInfo);
                     }
                     else {
                         parserInput.restore();
@@ -1491,8 +1573,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
             },
             anonymousValue: function () {
-                var index = parserInput.i;
-                var match = parserInput.$re(/^([^.#@\$+\/'"*`(;{}-]*);/);
+                const index = parserInput.i;
+                const match = parserInput.$re(/^([^.#@\$+\/'"*`(;{}-]*);/);
                 if (match) {
                     return new(tree.Anonymous)(match[1], index);
                 }
@@ -1507,12 +1589,16 @@ var Parser = function Parser(context, imports, fileInfo) {
              * math is allowed.
              */
             permissiveValue: function (untilTokens) {
-                var i, e, done, value, 
-                    tok = untilTokens || ';',
-                    index = parserInput.i, result = [];
+                let i;
+                let e;
+                let done;
+                let value;
+                const tok = untilTokens || ';';
+                const index = parserInput.i;
+                const result = [];
 
                 function testCurrentChar() {
-                    var char = parserInput.currentChar();
+                    const char = parserInput.currentChar();
                     if (typeof tok === 'string') {
                         return char === tok;
                     } else {
@@ -1536,7 +1622,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 } while (e);
 
                 done = testCurrentChar();
-                
+
                 if (value.length > 0) {
                     value = new(tree.Expression)(value);
                     if (done) {
@@ -1551,18 +1637,18 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }
                 }
                 parserInput.save();
-                
+
                 value = parserInput.$parseUntil(tok);
 
                 if (value) {
                     if (typeof value === 'string') {
-                        error('Expected \'' + value + '\'', 'Parse');
+                        error(`Expected '${value}'`, 'Parse');
                     }
                     if (value.length === 1 && value[0] === ' ') {
                         parserInput.forget();
                         return new tree.Anonymous('', index);
                     }
-                    var item;
+                    let item;
                     for (i = 0; i < value.length; i++) {
                         item = value[i];
                         if (Array.isArray(item)) {
@@ -1574,7 +1660,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                                 item = item.trim();
                             }
                             // Treat like quoted values, but replace vars like unquoted expressions
-                            var quote = new tree.Quoted('\'', item, true, index, fileInfo);
+                            const quote = new tree.Quoted('\'', item, true, index, fileInfo);
                             quote.variableRegex = /@([\w-]+)/g;
                             quote.propRegex = /\$([\w-]+)/g;
                             result.push(quote);
@@ -1597,12 +1683,14 @@ var Parser = function Parser(context, imports, fileInfo) {
             // stored in `import`, which we pass to the Import constructor.
             //
             'import': function () {
-                var path, features, index = parserInput.i;
+                let path;
+                let features;
+                const index = parserInput.i;
 
-                var dir = parserInput.$re(/^@import?\s+/);
+                const dir = parserInput.$re(/^@import?\s+/);
 
                 if (dir) {
-                    var options = (dir ? this.importOptions() : null) || {};
+                    const options = (dir ? this.importOptions() : null) || {};
 
                     if ((path = this.entities.quoted() || this.entities.url())) {
                         features = this.mediaFeatures();
@@ -1622,7 +1710,10 @@ var Parser = function Parser(context, imports, fileInfo) {
             },
 
             importOptions: function() {
-                var o, options = {}, optionName, value;
+                let o;
+                const options = {};
+                let optionName;
+                let value;
 
                 // list of options, surrounded by parens
                 if (!parserInput.$char('(')) { return null; }
@@ -1650,14 +1741,17 @@ var Parser = function Parser(context, imports, fileInfo) {
             },
 
             importOption: function() {
-                var opt = parserInput.$re(/^(less|css|multiple|once|inline|reference|optional)/);
+                const opt = parserInput.$re(/^(less|css|multiple|once|inline|reference|optional)/);
                 if (opt) {
                     return opt[1];
                 }
             },
 
             mediaFeature: function () {
-                var entities = this.entities, nodes = [], e, p;
+                const entities = this.entities;
+                const nodes = [];
+                let e;
+                let p;
                 parserInput.save();
                 do {
                     e = entities.keyword() || entities.variable() || entities.mixinLookup();
@@ -1687,7 +1781,9 @@ var Parser = function Parser(context, imports, fileInfo) {
             },
 
             mediaFeatures: function () {
-                var entities = this.entities, features = [], e;
+                const entities = this.entities;
+                const features = [];
+                let e;
                 do {
                     e = this.mediaFeature();
                     if (e) {
@@ -1706,7 +1802,11 @@ var Parser = function Parser(context, imports, fileInfo) {
             },
 
             media: function () {
-                var features, rules, media, debugInfo, index = parserInput.i;
+                let features;
+                let rules;
+                let media;
+                let debugInfo;
+                const index = parserInput.i;
 
                 if (context.dumpLineNumbers) {
                     debugInfo = getDebugInfo(index);
@@ -1743,9 +1843,11 @@ var Parser = function Parser(context, imports, fileInfo) {
             //     @plugin (args) "lib";
             //
             plugin: function () {
-                var path, args, options,
-                    index = parserInput.i,
-                    dir   = parserInput.$re(/^@plugin?\s+/);
+                let path;
+                let args;
+                let options;
+                const index = parserInput.i;
+                const dir   = parserInput.$re(/^@plugin?\s+/);
 
                 if (dir) {
                     args = this.pluginArgs();
@@ -1782,7 +1884,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     parserInput.restore();
                     return null;
                 }
-                var args = parserInput.$re(/^\s*([^\);]+)\)\s*/);
+                const args = parserInput.$re(/^\s*([^\);]+)\)\s*/);
                 if (args[1]) {
                     parserInput.forget();
                     return args[1].trim();
@@ -1799,8 +1901,16 @@ var Parser = function Parser(context, imports, fileInfo) {
             //     @charset "utf-8";
             //
             atrule: function () {
-                var index = parserInput.i, name, value, rules, nonVendorSpecificName,
-                    hasIdentifier, hasExpression, hasUnknown, hasBlock = true, isRooted = true;
+                const index = parserInput.i;
+                let name;
+                let value;
+                let rules;
+                let nonVendorSpecificName;
+                let hasIdentifier;
+                let hasExpression;
+                let hasUnknown;
+                let hasBlock = true;
+                let isRooted = true;
 
                 if (parserInput.currentChar() !== '@') { return; }
 
@@ -1817,7 +1927,7 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                 nonVendorSpecificName = name;
                 if (name.charAt(1) == '-' && name.indexOf('-', 2) > 0) {
-                    nonVendorSpecificName = '@' + name.slice(name.indexOf('-', 2) + 1);
+                    nonVendorSpecificName = `@${name.slice(name.indexOf('-', 2) + 1)}`;
                 }
 
                 switch (nonVendorSpecificName) {
@@ -1848,19 +1958,19 @@ var Parser = function Parser(context, imports, fileInfo) {
                 if (hasIdentifier) {
                     value = this.entity();
                     if (!value) {
-                        error('expected ' + name + ' identifier');
+                        error(`expected ${name} identifier`);
                     }
                 } else if (hasExpression) {
                     value = this.expression();
                     if (!value) {
-                        error('expected ' + name + ' expression');
+                        error(`expected ${name} expression`);
                     }
                 } else if (hasUnknown) {
                     value = this.permissiveValue(/^[{;]/);
                     hasBlock = (parserInput.currentChar() === '{');
                     if (!value) {
                         if (!hasBlock && parserInput.currentChar() !== ';') {
-                            error(name + ' rule is missing block or ending semi-colon');
+                            error(`${name} rule is missing block or ending semi-colon`);
                         }
                     }
                     else if (!value.value) {
@@ -1874,7 +1984,7 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                 if (rules || (!hasBlock && value && parserInput.$char(';'))) {
                     parserInput.forget();
-                    return new (tree.AtRule)(name, value, rules, index, fileInfo,
+                    return new(tree.AtRule)(name, value, rules, index, fileInfo,
                         context.dumpLineNumbers ? getDebugInfo(index) : null,
                         isRooted
                     );
@@ -1892,7 +2002,9 @@ var Parser = function Parser(context, imports, fileInfo) {
             // and before the `;`.
             //
             value: function () {
-                var e, expressions = [], index = parserInput.i;
+                let e;
+                const expressions = [];
+                const index = parserInput.i;
 
                 do {
                     e = this.expression();
@@ -1912,7 +2024,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
             },
             sub: function () {
-                var a, e;
+                let a;
+                let e;
 
                 parserInput.save();
                 if (parserInput.$char('(')) {
@@ -1929,7 +2042,11 @@ var Parser = function Parser(context, imports, fileInfo) {
                 parserInput.restore();
             },
             multiplication: function () {
-                var m, a, op, operation, isSpaced;
+                let m;
+                let a;
+                let op;
+                let operation;
+                let isSpaced;
                 m = this.operand();
                 if (m) {
                     isSpaced = parserInput.isWhitespace(-1);
@@ -1958,7 +2075,11 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
             },
             addition: function () {
-                var m, a, op, operation, isSpaced;
+                let m;
+                let a;
+                let op;
+                let operation;
+                let isSpaced;
                 m = this.multiplication();
                 if (m) {
                     isSpaced = parserInput.isWhitespace(-1);
@@ -1981,7 +2102,10 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
             },
             conditions: function () {
-                var a, b, index = parserInput.i, condition;
+                let a;
+                let b;
+                const index = parserInput.i;
+                let condition;
 
                 a = this.condition(true);
                 if (a) {
@@ -1999,7 +2123,9 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
             },
             condition: function (needsParens) {
-                var result, logical, next;
+                let result;
+                let logical;
+                let next;
                 function or() {
                     return parserInput.$str('or');
                 }
@@ -2020,9 +2146,12 @@ var Parser = function Parser(context, imports, fileInfo) {
                 return result;
             },
             conditionAnd: function (needsParens) {
-                var result, logical, next, self = this;
+                let result;
+                let logical;
+                let next;
+                const self = this;
                 function insideCondition() {
-                    var cond = self.negatedCondition(needsParens) || self.parenthesisCondition(needsParens);
+                    const cond = self.negatedCondition(needsParens) || self.parenthesisCondition(needsParens);
                     if (!cond && !needsParens) {
                         return self.atomicCondition(needsParens);
                     }
@@ -2049,7 +2178,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             },
             negatedCondition: function (needsParens) {
                 if (parserInput.$str('not')) {
-                    var result = this.parenthesisCondition(needsParens);
+                    const result = this.parenthesisCondition(needsParens);
                     if (result) {
                         result.negate = !result.negate;
                     }
@@ -2058,7 +2187,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             },
             parenthesisCondition: function (needsParens) {
                 function tryConditionFollowedByParenthesis(me) {
-                    var body;
+                    let body;
                     parserInput.save();
                     body = me.condition(needsParens);
                     if (!body) {
@@ -2073,7 +2202,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     return body;
                 }
 
-                var body;
+                let body;
                 parserInput.save();
                 if (!parserInput.$str('(')) {
                     parserInput.restore();
@@ -2091,14 +2220,19 @@ var Parser = function Parser(context, imports, fileInfo) {
                     return ;
                 }
                 if (!parserInput.$char(')')) {
-                    parserInput.restore('expected \')\' got \'' + parserInput.currentChar() + '\'');
+                    parserInput.restore(`expected ')' got '${parserInput.currentChar()}'`);
                     return ;
                 }
                 parserInput.forget();
                 return body;
             },
             atomicCondition: function (needsParens) {
-                var entities = this.entities, index = parserInput.i, a, b, c, op;
+                const entities = this.entities;
+                const index = parserInput.i;
+                let a;
+                let b;
+                let c;
+                let op;
 
                 function cond() {
                     return this.addition() || entities.keyword() || entities.quoted() || entities.mixinLookup();
@@ -2149,13 +2283,14 @@ var Parser = function Parser(context, imports, fileInfo) {
             // such as a Color, or a Variable
             //
             operand: function () {
-                var entities = this.entities, negate;
+                const entities = this.entities;
+                let negate;
 
                 if (parserInput.peek(/^-[@\$\(]/)) {
                     negate = parserInput.$char('-');
                 }
 
-                var o = this.sub() || entities.dimension() ||
+                let o = this.sub() || entities.dimension() ||
                         entities.color() || entities.variable() ||
                         entities.property() || entities.call() ||
                         entities.quoted(true) || entities.colorKeyword() ||
@@ -2177,7 +2312,10 @@ var Parser = function Parser(context, imports, fileInfo) {
             //     @var * 2
             //
             expression: function () {
-                var entities = [], e, delim, index = parserInput.i;
+                const entities = [];
+                let e;
+                let delim;
+                const index = parserInput.i;
 
                 do {
                     e = this.comment();
@@ -2202,17 +2340,20 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
             },
             property: function () {
-                var name = parserInput.$re(/^(\*?-?[_a-zA-Z0-9-]+)\s*:/);
+                const name = parserInput.$re(/^(\*?-?[_a-zA-Z0-9-]+)\s*:/);
                 if (name) {
                     return name[1];
                 }
             },
             ruleProperty: function () {
-                var name = [], index = [], s, k;
+                let name = [];
+                const index = [];
+                let s;
+                let k;
 
                 parserInput.save();
 
-                var simpleProperty = parserInput.$re(/^([_a-zA-Z0-9-]+)\s*:/);
+                const simpleProperty = parserInput.$re(/^([_a-zA-Z0-9-]+)\s*:/);
                 if (simpleProperty) {
                     name = [new(tree.Keyword)(simpleProperty[1])];
                     parserInput.forget();
@@ -2220,8 +2361,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
 
                 function match(re) {
-                    var i = parserInput.i,
-                        chunk = parserInput.$re(re);
+                    const i = parserInput.i;
+                    const chunk = parserInput.$re(re);
                     if (chunk) {
                         index.push(i);
                         return name.push(chunk[1]);
@@ -2249,8 +2390,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                         name[k] = (s.charAt(0) !== '@' && s.charAt(0) !== '$') ?
                             new(tree.Keyword)(s) :
                             (s.charAt(0) === '@' ?
-                                new(tree.Variable)('@' + s.slice(2, -1), index[k], fileInfo) :
-                                new(tree.Property)('$' + s.slice(2, -1), index[k], fileInfo));
+                                new(tree.Variable)(`@${s.slice(2, -1)}`, index[k], fileInfo) :
+                                new(tree.Property)(`$${s.slice(2, -1)}`, index[k], fileInfo));
                     }
                     return name;
                 }
@@ -2259,18 +2400,17 @@ var Parser = function Parser(context, imports, fileInfo) {
         }
     };
 };
-Parser.serializeVars = function(vars) {
-    var s = '';
+Parser.serializeVars = vars => {
+    let s = '';
 
-    for (var name in vars) {
+    for (const name in vars) {
         if (Object.hasOwnProperty.call(vars, name)) {
-            var value = vars[name];
-            s += ((name[0] === '@') ? '' : '@') + name + ': ' + value +
-                ((String(value).slice(-1) === ';') ? '' : ';');
+            const value = vars[name];
+            s += `${((name[0] === '@') ? '' : '@') + name}: ${value}${(String(value).slice(-1) === ';') ? '' : ';'}`;
         }
     }
 
     return s;
 };
 
-module.exports = Parser;
+export default Parser;