vscode-css-languageservice 5.4.2 → 6.1.0

package/lib/umd/parser/scssParser.js

@@ -1,18 +1,3 @@
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -29,23 +14,21 @@ var __extends = (this && this.__extends) || (function () {
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.SCSSParser = void 0;
-    var scssScanner = require("./scssScanner");
-    var cssScanner_1 = require("./cssScanner");
-    var cssParser = require("./cssParser");
-    var nodes = require("./cssNodes");
-    var scssErrors_1 = require("./scssErrors");
-    var cssErrors_1 = require("./cssErrors");
+    const scssScanner = require("./scssScanner");
+    const cssScanner_1 = require("./cssScanner");
+    const cssParser = require("./cssParser");
+    const nodes = require("./cssNodes");
+    const scssErrors_1 = require("./scssErrors");
+    const cssErrors_1 = require("./cssErrors");
     /// <summary>
     /// A parser for scss
     /// http://sass-lang.com/documentation/file.SASS_REFERENCE.html
     /// </summary>
-    var SCSSParser = /** @class */ (function (_super) {
-        __extends(SCSSParser, _super);
-        function SCSSParser() {
-            return _super.call(this, new scssScanner.SCSSScanner()) || this;
+    class SCSSParser extends cssParser.Parser {
+        constructor() {
+            super(new scssScanner.SCSSScanner());
         }
-        SCSSParser.prototype._parseStylesheetStatement = function (isNested) {
-            if (isNested === void 0) { isNested = false; }
+        _parseStylesheetStatement(isNested = false) {
             if (this.peek(cssScanner_1.TokenType.AtKeyword)) {
                 return this._parseWarnAndDebug() // @warn, @debug and @error statements
                     || this._parseControlStatement() // @if, @while, @for, @each
@@ -56,15 +39,15 @@ var __extends = (this && this.__extends) || (function () {
                     || this._parseForward() // @forward
                     || this._parseUse() // @use
                     || this._parseRuleset(isNested) // @at-rule
-                    || _super.prototype._parseStylesheetAtStatement.call(this, isNested);
+                    || super._parseStylesheetAtStatement(isNested);
             }
             return this._parseRuleset(true) || this._parseVariableDeclaration();
-        };
-        SCSSParser.prototype._parseImport = function () {
+        }
+        _parseImport() {
             if (!this.peekKeyword('@import')) {
                 return null;
             }
-            var node = this.create(nodes.Import);
+            const node = this.create(nodes.Import);
             this.consumeToken();
             if (!node.addChild(this._parseURILiteral()) && !node.addChild(this._parseStringLiteral())) {
                 return this.finish(node, cssErrors_1.ParseError.URIOrStringExpected);
@@ -78,14 +61,13 @@ var __extends = (this && this.__extends) || (function () {
                 node.setMedialist(this._parseMediaQueryList());
             }
             return this.finish(node);
-        };
+        }
         // scss variables: $font-size: 12px;
-        SCSSParser.prototype._parseVariableDeclaration = function (panic) {
-            if (panic === void 0) { panic = []; }
+        _parseVariableDeclaration(panic = []) {
             if (!this.peek(scssScanner.VariableName)) {
                 return null;
             }
-            var node = this.create(nodes.VariableDeclaration);
+            const node = this.create(nodes.VariableDeclaration);
             if (!node.setVariable(this._parseVariable())) {
                 return null;
             }
@@ -114,33 +96,33 @@ var __extends = (this && this.__extends) || (function () {
                 node.semicolonPosition = this.token.offset; // not part of the declaration, but useful information for code assist
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseMediaCondition = function () {
-            return this._parseInterpolation() || _super.prototype._parseMediaCondition.call(this);
-        };
-        SCSSParser.prototype._parseMediaFeatureName = function () {
+        }
+        _parseMediaCondition() {
+            return this._parseInterpolation() || super._parseMediaCondition();
+        }
+        _parseMediaFeatureName() {
             return this._parseModuleMember()
                 || this._parseFunction() // function before ident
                 || this._parseIdent()
                 || this._parseVariable();
-        };
-        SCSSParser.prototype._parseKeyframeSelector = function () {
+        }
+        _parseKeyframeSelector() {
             return this._tryParseKeyframeSelector()
                 || this._parseControlStatement(this._parseKeyframeSelector.bind(this))
                 || this._parseVariableDeclaration()
                 || this._parseMixinContent();
-        };
-        SCSSParser.prototype._parseVariable = function () {
+        }
+        _parseVariable() {
             if (!this.peek(scssScanner.VariableName)) {
                 return null;
             }
-            var node = this.create(nodes.Variable);
+            const node = this.create(nodes.Variable);
             this.consumeToken();
             return node;
-        };
-        SCSSParser.prototype._parseModuleMember = function () {
-            var pos = this.mark();
-            var node = this.create(nodes.Module);
+        }
+        _parseModuleMember() {
+            const pos = this.mark();
+            const node = this.create(nodes.Module);
             if (!node.setIdentifier(this._parseIdent([nodes.ReferenceType.Module]))) {
                 return null;
             }
@@ -154,28 +136,27 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node, cssErrors_1.ParseError.IdentifierOrVariableExpected);
             }
             return node;
-        };
-        SCSSParser.prototype._parseIdent = function (referenceTypes) {
-            var _this = this;
+        }
+        _parseIdent(referenceTypes) {
             if (!this.peek(cssScanner_1.TokenType.Ident) && !this.peek(scssScanner.InterpolationFunction) && !this.peekDelim('-')) {
                 return null;
             }
-            var node = this.create(nodes.Identifier);
+            const node = this.create(nodes.Identifier);
             node.referenceTypes = referenceTypes;
             node.isCustomProperty = this.peekRegExp(cssScanner_1.TokenType.Ident, /^--/);
-            var hasContent = false;
-            var indentInterpolation = function () {
-                var pos = _this.mark();
-                if (_this.acceptDelim('-')) {
-                    if (!_this.hasWhitespace()) {
-                        _this.acceptDelim('-');
+            let hasContent = false;
+            const indentInterpolation = () => {
+                const pos = this.mark();
+                if (this.acceptDelim('-')) {
+                    if (!this.hasWhitespace()) {
+                        this.acceptDelim('-');
                     }
-                    if (_this.hasWhitespace()) {
-                        _this.restoreAtMark(pos);
+                    if (this.hasWhitespace()) {
+                        this.restoreAtMark(pos);
                         return null;
                     }
                 }
-                return _this._parseInterpolation();
+                return this._parseInterpolation();
             };
             while (this.accept(cssScanner_1.TokenType.Ident) || node.addChild(indentInterpolation()) || (hasContent && this.acceptRegexp(/^[\w-]/))) {
                 hasContent = true;
@@ -184,17 +165,17 @@ var __extends = (this && this.__extends) || (function () {
                 }
             }
             return hasContent ? this.finish(node) : null;
-        };
-        SCSSParser.prototype._parseTermExpression = function () {
+        }
+        _parseTermExpression() {
             return this._parseModuleMember() ||
                 this._parseVariable() ||
                 this._parseSelectorCombinator() ||
                 //this._tryParsePrio() ||
-                _super.prototype._parseTermExpression.call(this);
-        };
-        SCSSParser.prototype._parseInterpolation = function () {
+                super._parseTermExpression();
+        }
+        _parseInterpolation() {
             if (this.peek(scssScanner.InterpolationFunction)) {
-                var node = this.create(nodes.Interpolation);
+                const node = this.create(nodes.Interpolation);
                 this.consumeToken();
                 if (!node.addChild(this._parseExpr()) && !this._parseSelectorCombinator()) {
                     if (this.accept(cssScanner_1.TokenType.CurlyR)) {
@@ -208,28 +189,28 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node);
             }
             return null;
-        };
-        SCSSParser.prototype._parseOperator = function () {
+        }
+        _parseOperator() {
             if (this.peek(scssScanner.EqualsOperator) || this.peek(scssScanner.NotEqualsOperator)
                 || this.peek(scssScanner.GreaterEqualsOperator) || this.peek(scssScanner.SmallerEqualsOperator)
                 || this.peekDelim('>') || this.peekDelim('<')
                 || this.peekIdent('and') || this.peekIdent('or')
                 || this.peekDelim('%')) {
-                var node = this.createNode(nodes.NodeType.Operator);
+                const node = this.createNode(nodes.NodeType.Operator);
                 this.consumeToken();
                 return this.finish(node);
             }
-            return _super.prototype._parseOperator.call(this);
-        };
-        SCSSParser.prototype._parseUnaryOperator = function () {
+            return super._parseOperator();
+        }
+        _parseUnaryOperator() {
             if (this.peekIdent('not')) {
-                var node = this.create(nodes.Node);
+                const node = this.create(nodes.Node);
                 this.consumeToken();
                 return this.finish(node);
             }
-            return _super.prototype._parseUnaryOperator.call(this);
-        };
-        SCSSParser.prototype._parseRuleSetDeclaration = function () {
+            return super._parseUnaryOperator();
+        }
+        _parseRuleSetDeclaration() {
             if (this.peek(cssScanner_1.TokenType.AtKeyword)) {
                 return this._parseKeyframe() // nested @keyframe
                     || this._parseImport() // nested @import
@@ -244,18 +225,19 @@ var __extends = (this && this.__extends) || (function () {
                     || this._parseMixinDeclaration() // nested @mixin
                     || this._parseRuleset(true) // @at-rule
                     || this._parseSupports(true) // @supports
-                    || _super.prototype._parseRuleSetDeclarationAtStatement.call(this);
+                    || this._parseLayer() // @layer
+                    || super._parseRuleSetDeclarationAtStatement();
             }
             return this._parseVariableDeclaration() // variable declaration
                 || this._tryParseRuleset(true) // nested ruleset
-                || _super.prototype._parseRuleSetDeclaration.call(this); // try css ruleset declaration as last so in the error case, the ast will contain a declaration
-        };
-        SCSSParser.prototype._parseDeclaration = function (stopTokens) {
-            var custonProperty = this._tryParseCustomPropertyDeclaration(stopTokens);
+                || super._parseRuleSetDeclaration(); // try css ruleset declaration as last so in the error case, the ast will contain a declaration
+        }
+        _parseDeclaration(stopTokens) {
+            const custonProperty = this._tryParseCustomPropertyDeclaration(stopTokens);
             if (custonProperty) {
                 return custonProperty;
             }
-            var node = this.create(nodes.Declaration);
+            const node = this.create(nodes.Declaration);
             if (!node.setProperty(this._parseProperty())) {
                 return null;
             }
@@ -265,7 +247,7 @@ var __extends = (this && this.__extends) || (function () {
             if (this.prevToken) {
                 node.colonPosition = this.prevToken.offset;
             }
-            var hasContent = false;
+            let hasContent = false;
             if (node.setValue(this._parseExpr())) {
                 hasContent = true;
                 node.addChild(this._parsePrio());
@@ -282,14 +264,14 @@ var __extends = (this && this.__extends) || (function () {
                 node.semicolonPosition = this.token.offset; // not part of the declaration, but useful information for code assist
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseNestedProperties = function () {
-            var node = this.create(nodes.NestedProperties);
+        }
+        _parseNestedProperties() {
+            const node = this.create(nodes.NestedProperties);
             return this._parseBody(node, this._parseDeclaration.bind(this));
-        };
-        SCSSParser.prototype._parseExtends = function () {
+        }
+        _parseExtends() {
             if (this.peekKeyword('@extend')) {
-                var node = this.create(nodes.ExtendsReference);
+                const node = this.create(nodes.ExtendsReference);
                 this.consumeToken();
                 if (!node.getSelectors().addChild(this._parseSimpleSelector())) {
                     return this.finish(node, cssErrors_1.ParseError.SelectorExpected);
@@ -305,13 +287,13 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node);
             }
             return null;
-        };
-        SCSSParser.prototype._parseSimpleSelectorBody = function () {
-            return this._parseSelectorCombinator() || this._parseSelectorPlaceholder() || _super.prototype._parseSimpleSelectorBody.call(this);
-        };
-        SCSSParser.prototype._parseSelectorCombinator = function () {
+        }
+        _parseSimpleSelectorBody() {
+            return this._parseSelectorCombinator() || this._parseSelectorPlaceholder() || super._parseSimpleSelectorBody();
+        }
+        _parseSelectorCombinator() {
             if (this.peekDelim('&')) {
-                var node = this.createNode(nodes.NodeType.SelectorCombinator);
+                const node = this.createNode(nodes.NodeType.SelectorCombinator);
                 this.consumeToken();
                 while (!this.hasWhitespace() && (this.acceptDelim('-') || this.accept(cssScanner_1.TokenType.Num) || this.accept(cssScanner_1.TokenType.Dimension) || node.addChild(this._parseIdent()) || this.acceptDelim('&'))) {
                     //  support &-foo-1
@@ -319,60 +301,73 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node);
             }
             return null;
-        };
-        SCSSParser.prototype._parseSelectorPlaceholder = function () {
+        }
+        _parseSelectorPlaceholder() {
             if (this.peekDelim('%')) {
-                var node = this.createNode(nodes.NodeType.SelectorPlaceholder);
+                const node = this.createNode(nodes.NodeType.SelectorPlaceholder);
                 this.consumeToken();
                 this._parseIdent();
                 return this.finish(node);
             }
             else if (this.peekKeyword('@at-root')) {
-                var node = this.createNode(nodes.NodeType.SelectorPlaceholder);
+                const node = this.createNode(nodes.NodeType.SelectorPlaceholder);
                 this.consumeToken();
+                if (this.accept(cssScanner_1.TokenType.ParenthesisL)) {
+                    if (!this.acceptIdent('with') && !this.acceptIdent('without')) {
+                        return this.finish(node, cssErrors_1.ParseError.IdentifierExpected);
+                    }
+                    if (!this.accept(cssScanner_1.TokenType.Colon)) {
+                        return this.finish(node, cssErrors_1.ParseError.ColonExpected);
+                    }
+                    if (!node.addChild(this._parseIdent())) {
+                        return this.finish(node, cssErrors_1.ParseError.IdentifierExpected);
+                    }
+                    if (!this.accept(cssScanner_1.TokenType.ParenthesisR)) {
+                        return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected, [cssScanner_1.TokenType.CurlyR]);
+                    }
+                }
                 return this.finish(node);
             }
             return null;
-        };
-        SCSSParser.prototype._parseElementName = function () {
-            var pos = this.mark();
-            var node = _super.prototype._parseElementName.call(this);
+        }
+        _parseElementName() {
+            const pos = this.mark();
+            const node = super._parseElementName();
             if (node && !this.hasWhitespace() && this.peek(cssScanner_1.TokenType.ParenthesisL)) { // for #49589
                 this.restoreAtMark(pos);
                 return null;
             }
             return node;
-        };
-        SCSSParser.prototype._tryParsePseudoIdentifier = function () {
-            return this._parseInterpolation() || _super.prototype._tryParsePseudoIdentifier.call(this); // for #49589
-        };
-        SCSSParser.prototype._parseWarnAndDebug = function () {
+        }
+        _tryParsePseudoIdentifier() {
+            return this._parseInterpolation() || super._tryParsePseudoIdentifier(); // for #49589
+        }
+        _parseWarnAndDebug() {
             if (!this.peekKeyword('@debug')
                 && !this.peekKeyword('@warn')
                 && !this.peekKeyword('@error')) {
                 return null;
             }
-            var node = this.createNode(nodes.NodeType.Debug);
+            const node = this.createNode(nodes.NodeType.Debug);
             this.consumeToken(); // @debug, @warn or @error
             node.addChild(this._parseExpr()); // optional
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseControlStatement = function (parseStatement) {
-            if (parseStatement === void 0) { parseStatement = this._parseRuleSetDeclaration.bind(this); }
+        }
+        _parseControlStatement(parseStatement = this._parseRuleSetDeclaration.bind(this)) {
             if (!this.peek(cssScanner_1.TokenType.AtKeyword)) {
                 return null;
             }
             return this._parseIfStatement(parseStatement) || this._parseForStatement(parseStatement)
                 || this._parseEachStatement(parseStatement) || this._parseWhileStatement(parseStatement);
-        };
-        SCSSParser.prototype._parseIfStatement = function (parseStatement) {
+        }
+        _parseIfStatement(parseStatement) {
             if (!this.peekKeyword('@if')) {
                 return null;
             }
             return this._internalParseIfStatement(parseStatement);
-        };
-        SCSSParser.prototype._internalParseIfStatement = function (parseStatement) {
-            var node = this.create(nodes.IfStatement);
+        }
+        _internalParseIfStatement(parseStatement) {
+            const node = this.create(nodes.IfStatement);
             this.consumeToken(); // @if or if
             if (!node.setExpression(this._parseExpr(true))) {
                 return this.finish(node, cssErrors_1.ParseError.ExpressionExpected);
@@ -383,18 +378,18 @@ var __extends = (this && this.__extends) || (function () {
                     node.setElseClause(this._internalParseIfStatement(parseStatement));
                 }
                 else if (this.peek(cssScanner_1.TokenType.CurlyL)) {
-                    var elseNode = this.create(nodes.ElseStatement);
+                    const elseNode = this.create(nodes.ElseStatement);
                     this._parseBody(elseNode, parseStatement);
                     node.setElseClause(elseNode);
                 }
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseForStatement = function (parseStatement) {
+        }
+        _parseForStatement(parseStatement) {
             if (!this.peekKeyword('@for')) {
                 return null;
             }
-            var node = this.create(nodes.ForStatement);
+            const node = this.create(nodes.ForStatement);
             this.consumeToken(); // @for
             if (!node.setVariable(this._parseVariable())) {
                 return this.finish(node, cssErrors_1.ParseError.VariableNameExpected, [cssScanner_1.TokenType.CurlyR]);
@@ -412,14 +407,14 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node, cssErrors_1.ParseError.ExpressionExpected, [cssScanner_1.TokenType.CurlyR]);
             }
             return this._parseBody(node, parseStatement);
-        };
-        SCSSParser.prototype._parseEachStatement = function (parseStatement) {
+        }
+        _parseEachStatement(parseStatement) {
             if (!this.peekKeyword('@each')) {
                 return null;
             }
-            var node = this.create(nodes.EachStatement);
+            const node = this.create(nodes.EachStatement);
             this.consumeToken(); // @each
-            var variables = node.getVariables();
+            const variables = node.getVariables();
             if (!variables.addChild(this._parseVariable())) {
                 return this.finish(node, cssErrors_1.ParseError.VariableNameExpected, [cssScanner_1.TokenType.CurlyR]);
             }
@@ -436,27 +431,27 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node, cssErrors_1.ParseError.ExpressionExpected, [cssScanner_1.TokenType.CurlyR]);
             }
             return this._parseBody(node, parseStatement);
-        };
-        SCSSParser.prototype._parseWhileStatement = function (parseStatement) {
+        }
+        _parseWhileStatement(parseStatement) {
             if (!this.peekKeyword('@while')) {
                 return null;
             }
-            var node = this.create(nodes.WhileStatement);
+            const node = this.create(nodes.WhileStatement);
             this.consumeToken(); // @while
             if (!node.addChild(this._parseBinaryExpr())) {
                 return this.finish(node, cssErrors_1.ParseError.ExpressionExpected, [cssScanner_1.TokenType.CurlyR]);
             }
             return this._parseBody(node, parseStatement);
-        };
-        SCSSParser.prototype._parseFunctionBodyDeclaration = function () {
+        }
+        _parseFunctionBodyDeclaration() {
             return this._parseVariableDeclaration() || this._parseReturnStatement() || this._parseWarnAndDebug()
                 || this._parseControlStatement(this._parseFunctionBodyDeclaration.bind(this));
-        };
-        SCSSParser.prototype._parseFunctionDeclaration = function () {
+        }
+        _parseFunctionDeclaration() {
             if (!this.peekKeyword('@function')) {
                 return null;
             }
-            var node = this.create(nodes.FunctionDeclaration);
+            const node = this.create(nodes.FunctionDeclaration);
             this.consumeToken(); // @function
             if (!node.setIdentifier(this._parseIdent([nodes.ReferenceType.Function]))) {
                 return this.finish(node, cssErrors_1.ParseError.IdentifierExpected, [cssScanner_1.TokenType.CurlyR]);
@@ -478,23 +473,23 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected, [cssScanner_1.TokenType.CurlyR]);
             }
             return this._parseBody(node, this._parseFunctionBodyDeclaration.bind(this));
-        };
-        SCSSParser.prototype._parseReturnStatement = function () {
+        }
+        _parseReturnStatement() {
             if (!this.peekKeyword('@return')) {
                 return null;
             }
-            var node = this.createNode(nodes.NodeType.ReturnStatement);
+            const node = this.createNode(nodes.NodeType.ReturnStatement);
             this.consumeToken(); // @function
             if (!node.addChild(this._parseExpr())) {
                 return this.finish(node, cssErrors_1.ParseError.ExpressionExpected);
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseMixinDeclaration = function () {
+        }
+        _parseMixinDeclaration() {
             if (!this.peekKeyword('@mixin')) {
                 return null;
             }
-            var node = this.create(nodes.MixinDeclaration);
+            const node = this.create(nodes.MixinDeclaration);
             this.consumeToken();
             if (!node.setIdentifier(this._parseIdent([nodes.ReferenceType.Mixin]))) {
                 return this.finish(node, cssErrors_1.ParseError.IdentifierExpected, [cssScanner_1.TokenType.CurlyR]);
@@ -515,9 +510,9 @@ var __extends = (this && this.__extends) || (function () {
                 }
             }
             return this._parseBody(node, this._parseRuleSetDeclaration.bind(this));
-        };
-        SCSSParser.prototype._parseParameterDeclaration = function () {
-            var node = this.create(nodes.FunctionParameter);
+        }
+        _parseParameterDeclaration() {
+            const node = this.create(nodes.FunctionParameter);
             if (!node.setIdentifier(this._parseVariable())) {
                 return null;
             }
@@ -530,12 +525,12 @@ var __extends = (this && this.__extends) || (function () {
                 }
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseMixinContent = function () {
+        }
+        _parseMixinContent() {
             if (!this.peekKeyword('@content')) {
                 return null;
             }
-            var node = this.create(nodes.MixinContentReference);
+            const node = this.create(nodes.MixinContentReference);
             this.consumeToken();
             if (this.accept(cssScanner_1.TokenType.ParenthesisL)) {
                 if (node.getArguments().addChild(this._parseFunctionArgument())) {
@@ -553,25 +548,25 @@ var __extends = (this && this.__extends) || (function () {
                 }
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseMixinReference = function () {
+        }
+        _parseMixinReference() {
             if (!this.peekKeyword('@include')) {
                 return null;
             }
-            var node = this.create(nodes.MixinReference);
+            const node = this.create(nodes.MixinReference);
             this.consumeToken();
             // Could be module or mixin identifier, set as mixin as default.
-            var firstIdent = this._parseIdent([nodes.ReferenceType.Mixin]);
+            const firstIdent = this._parseIdent([nodes.ReferenceType.Mixin]);
             if (!node.setIdentifier(firstIdent)) {
                 return this.finish(node, cssErrors_1.ParseError.IdentifierExpected, [cssScanner_1.TokenType.CurlyR]);
             }
             // Is a module accessor.
             if (!this.hasWhitespace() && this.acceptDelim('.') && !this.hasWhitespace()) {
-                var secondIdent = this._parseIdent([nodes.ReferenceType.Mixin]);
+                const secondIdent = this._parseIdent([nodes.ReferenceType.Mixin]);
                 if (!secondIdent) {
                     return this.finish(node, cssErrors_1.ParseError.IdentifierExpected, [cssScanner_1.TokenType.CurlyR]);
                 }
-                var moduleToken = this.create(nodes.Module);
+                const moduleToken = this.create(nodes.Module);
                 // Re-purpose first matched ident as identifier for module token.
                 firstIdent.referenceTypes = [nodes.ReferenceType.Module];
                 moduleToken.setIdentifier(firstIdent);
@@ -598,9 +593,9 @@ var __extends = (this && this.__extends) || (function () {
                 node.setContent(this._parseMixinContentDeclaration());
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseMixinContentDeclaration = function () {
-            var node = this.create(nodes.MixinContentDeclaration);
+        }
+        _parseMixinContentDeclaration() {
+            const node = this.create(nodes.MixinContentDeclaration);
             if (this.acceptIdent('using')) {
                 if (!this.accept(cssScanner_1.TokenType.ParenthesisL)) {
                     return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected, [cssScanner_1.TokenType.CurlyL]);
@@ -623,15 +618,15 @@ var __extends = (this && this.__extends) || (function () {
                 this._parseBody(node, this._parseMixinReferenceBodyStatement.bind(this));
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseMixinReferenceBodyStatement = function () {
+        }
+        _parseMixinReferenceBodyStatement() {
             return this._tryParseKeyframeSelector() || this._parseRuleSetDeclaration();
-        };
-        SCSSParser.prototype._parseFunctionArgument = function () {
+        }
+        _parseFunctionArgument() {
             // [variableName ':'] expression | variableName '...'
-            var node = this.create(nodes.FunctionArgument);
-            var pos = this.mark();
-            var argument = this._parseVariable();
+            const node = this.create(nodes.FunctionArgument);
+            const pos = this.mark();
+            const argument = this._parseVariable();
             if (argument) {
                 if (!this.accept(cssScanner_1.TokenType.Colon)) {
                     if (this.accept(scssScanner.Ellipsis)) { // optional
@@ -655,23 +650,23 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node);
             }
             return null;
-        };
-        SCSSParser.prototype._parseURLArgument = function () {
-            var pos = this.mark();
-            var node = _super.prototype._parseURLArgument.call(this);
+        }
+        _parseURLArgument() {
+            const pos = this.mark();
+            const node = super._parseURLArgument();
             if (!node || !this.peek(cssScanner_1.TokenType.ParenthesisR)) {
                 this.restoreAtMark(pos);
-                var node_1 = this.create(nodes.Node);
-                node_1.addChild(this._parseBinaryExpr());
-                return this.finish(node_1);
+                const node = this.create(nodes.Node);
+                node.addChild(this._parseBinaryExpr());
+                return this.finish(node);
             }
             return node;
-        };
-        SCSSParser.prototype._parseOperation = function () {
+        }
+        _parseOperation() {
             if (!this.peek(cssScanner_1.TokenType.ParenthesisL)) {
                 return null;
             }
-            var node = this.create(nodes.Node);
+            const node = this.create(nodes.Node);
             this.consumeToken();
             while (node.addChild(this._parseListElement())) {
                 this.accept(cssScanner_1.TokenType.Comma); // optional
@@ -680,10 +675,10 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected);
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseListElement = function () {
-            var node = this.create(nodes.ListEntry);
-            var child = this._parseBinaryExpr();
+        }
+        _parseListElement() {
+            const node = this.create(nodes.ListEntry);
+            const child = this._parseBinaryExpr();
             if (!child) {
                 return null;
             }
@@ -697,12 +692,12 @@ var __extends = (this && this.__extends) || (function () {
                 node.setValue(child);
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseUse = function () {
+        }
+        _parseUse() {
             if (!this.peekKeyword('@use')) {
                 return null;
             }
-            var node = this.create(nodes.Use);
+            const node = this.create(nodes.Use);
             this.consumeToken(); // @use
             if (!node.addChild(this._parseStringLiteral())) {
                 return this.finish(node, cssErrors_1.ParseError.StringLiteralExpected);
@@ -740,9 +735,9 @@ var __extends = (this && this.__extends) || (function () {
                 return this.finish(node, cssErrors_1.ParseError.SemiColonExpected);
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseModuleConfigDeclaration = function () {
-            var node = this.create(nodes.ModuleConfiguration);
+        }
+        _parseModuleConfigDeclaration() {
+            const node = this.create(nodes.ModuleConfiguration);
             if (!node.setIdentifier(this._parseVariable())) {
                 return null;
             }
@@ -755,16 +750,26 @@ var __extends = (this && this.__extends) || (function () {
                 }
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseForward = function () {
+        }
+        _parseForward() {
             if (!this.peekKeyword('@forward')) {
                 return null;
             }
-            var node = this.create(nodes.Forward);
+            const node = this.create(nodes.Forward);
             this.consumeToken();
             if (!node.addChild(this._parseStringLiteral())) {
                 return this.finish(node, cssErrors_1.ParseError.StringLiteralExpected);
             }
+            if (this.acceptIdent('as')) {
+                const identifier = this._parseIdent([nodes.ReferenceType.Forward]);
+                if (!node.setIdentifier(identifier)) {
+                    return this.finish(node, cssErrors_1.ParseError.IdentifierExpected);
+                }
+                // Wildcard must be the next character after the identifier string.
+                if (this.hasWhitespace() || !this.acceptDelim('*')) {
+                    return this.finish(node, cssErrors_1.ParseError.WildcardExpected);
+                }
+            }
             if (this.acceptIdent('with')) {
                 if (!this.accept(cssScanner_1.TokenType.ParenthesisL)) {
                     return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected, [cssScanner_1.TokenType.ParenthesisR]);
@@ -785,33 +790,18 @@ var __extends = (this && this.__extends) || (function () {
                     return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected);
                 }
             }
-            if (!this.peek(cssScanner_1.TokenType.SemiColon) && !this.peek(cssScanner_1.TokenType.EOF)) {
-                if (!this.peekRegExp(cssScanner_1.TokenType.Ident, /as|hide|show/)) {
-                    return this.finish(node, cssErrors_1.ParseError.UnknownKeyword);
-                }
-                if (this.acceptIdent('as')) {
-                    var identifier = this._parseIdent([nodes.ReferenceType.Forward]);
-                    if (!node.setIdentifier(identifier)) {
-                        return this.finish(node, cssErrors_1.ParseError.IdentifierExpected);
-                    }
-                    // Wildcard must be the next character after the identifier string.
-                    if (this.hasWhitespace() || !this.acceptDelim('*')) {
-                        return this.finish(node, cssErrors_1.ParseError.WildcardExpected);
-                    }
-                }
-                if (this.peekIdent('hide') || this.peekIdent('show')) {
-                    if (!node.addChild(this._parseForwardVisibility())) {
-                        return this.finish(node, cssErrors_1.ParseError.IdentifierOrVariableExpected);
-                    }
+            else if (this.peekIdent('hide') || this.peekIdent('show')) {
+                if (!node.addChild(this._parseForwardVisibility())) {
+                    return this.finish(node, cssErrors_1.ParseError.IdentifierOrVariableExpected);
                 }
             }
             if (!this.accept(cssScanner_1.TokenType.SemiColon) && !this.accept(cssScanner_1.TokenType.EOF)) {
                 return this.finish(node, cssErrors_1.ParseError.SemiColonExpected);
             }
             return this.finish(node);
-        };
-        SCSSParser.prototype._parseForwardVisibility = function () {
-            var node = this.create(nodes.ForwardVisibility);
+        }
+        _parseForwardVisibility() {
+            const node = this.create(nodes.ForwardVisibility);
             // Assume to be "hide" or "show".
             node.setIdentifier(this._parseIdent());
             while (node.addChild(this._parseVariable() || this._parseIdent())) {
@@ -820,11 +810,10 @@ var __extends = (this && this.__extends) || (function () {
             }
             // More than just identifier 
             return node.getChildren().length > 1 ? node : null;
-        };
-        SCSSParser.prototype._parseSupportsCondition = function () {
-            return this._parseInterpolation() || _super.prototype._parseSupportsCondition.call(this);
-        };
-        return SCSSParser;
-    }(cssParser.Parser));
+        }
+        _parseSupportsCondition() {
+            return this._parseInterpolation() || super._parseSupportsCondition();
+        }
+    }
     exports.SCSSParser = SCSSParser;
 });