vscode-css-languageservice 5.1.6 → 5.1.10

package/lib/umd/languageFacts/colors.js

@@ -193,9 +193,22 @@
     }
     function getAngle(node) {
         var val = node.getText();
-        var m = val.match(/^([-+]?[0-9]*\.?[0-9]+)(deg)?$/);
+        var m = val.match(/^([-+]?[0-9]*\.?[0-9]+)(deg|rad|grad|turn)?$/);
         if (m) {
-            return parseFloat(val) % 360;
+            switch (m[2]) {
+                case 'deg':
+                    return parseFloat(val) % 360;
+                case 'rad':
+                    return (parseFloat(val) * 180 / Math.PI) % 360;
+                case 'grad':
+                    return (parseFloat(val) * 0.9) % 360;
+                case 'turn':
+                    return (parseFloat(val) * 360) % 360;
+                default:
+                    if ('undefined' === typeof m[2]) {
+                        return parseFloat(val) % 360;
+                    }
+            }
         }
         throw new Error();
     }
@@ -373,6 +386,21 @@
             var functionNode = node;
             var name = functionNode.getName();
             var colorValues = functionNode.getArguments().getChildren();
+            if (colorValues.length === 1) {
+                var functionArg = colorValues[0].getChildren();
+                if (functionArg.length === 1 && functionArg[0].type === nodes.NodeType.Expression) {
+                    colorValues = functionArg[0].getChildren();
+                    if (colorValues.length === 3) {
+                        var lastValue = colorValues[2];
+                        if (lastValue instanceof nodes.BinaryExpression) {
+                            var left = lastValue.getLeft(), right = lastValue.getRight(), operator = lastValue.getOperator();
+                            if (left && right && operator && operator.matches('/')) {
+                                colorValues = [colorValues[0], colorValues[1], left, right];
+                            }
+                        }
+                    }
+                }
+            }
             if (!name || colorValues.length < 3 || colorValues.length > 4) {
                 return null;
             }

package/lib/umd/languageFacts/entry.js

@@ -4,7 +4,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports"], factory);
+        define(["require", "exports", "../cssLanguageTypes"], factory);
     }
 })(function (require, exports) {
     /*---------------------------------------------------------------------------------------------
@@ -14,6 +14,7 @@
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getBrowserLabel = exports.textToMarkedString = exports.getEntryDescription = exports.browserNames = void 0;
+    var cssLanguageTypes_1 = require("../cssLanguageTypes");
     exports.browserNames = {
         E: 'Edge',
         FF: 'Firefox',
@@ -77,7 +78,7 @@
                 result += '\n(' + browserLabel + ')';
             }
             if ('syntax' in entry) {
-                result += "\n\nSyntax: " + entry.syntax;
+                result += "\n\nSyntax: ".concat(entry.syntax);
             }
         }
         if (entry.references && entry.references.length > 0 && (settings === null || settings === void 0 ? void 0 : settings.references) !== false) {
@@ -85,7 +86,7 @@
                 result += '\n\n';
             }
             result += entry.references.map(function (r) {
-                return r.name + ": " + r.url;
+                return "".concat(r.name, ": ").concat(r.url);
             }).join(' | ');
         }
         return result;
@@ -99,14 +100,18 @@
             if (entry.status) {
                 result += getEntryStatus(entry.status);
             }
-            var description = typeof entry.description === 'string' ? entry.description : entry.description.value;
-            result += textToMarkedString(description);
+            if (typeof entry.description === 'string') {
+                result += textToMarkedString(entry.description);
+            }
+            else {
+                result += entry.description.kind === cssLanguageTypes_1.MarkupKind.Markdown ? entry.description.value : textToMarkedString(entry.description.value);
+            }
             var browserLabel = getBrowserLabel(entry.browsers);
             if (browserLabel) {
                 result += '\n\n(' + textToMarkedString(browserLabel) + ')';
             }
             if ('syntax' in entry && entry.syntax) {
-                result += "\n\nSyntax: " + textToMarkedString(entry.syntax);
+                result += "\n\nSyntax: ".concat(textToMarkedString(entry.syntax));
             }
         }
         if (entry.references && entry.references.length > 0 && (settings === null || settings === void 0 ? void 0 : settings.references) !== false) {
@@ -114,7 +119,7 @@
                 result += '\n\n';
             }
             result += entry.references.map(function (r) {
-                return "[" + r.name + "](" + r.url + ")";
+                return "[".concat(r.name, "](").concat(r.url, ")");
             }).join(' | ');
         }
         return result;

package/lib/umd/parser/cssNodes.js

@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
      *--------------------------------------------------------------------------------------------*/
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.ParseErrorCollector = exports.Marker = exports.Level = exports.Module = exports.GuardCondition = exports.LessGuard = exports.ListEntry = exports.UnknownAtRule = exports.MixinDeclaration = exports.MixinReference = exports.MixinContentDeclaration = exports.MixinContentReference = exports.ExtendsReference = exports.Variable = exports.Interpolation = exports.VariableDeclaration = exports.NumericValue = exports.HexColorValue = exports.Operator = exports.AttributeSelector = exports.Term = exports.BinaryExpression = exports.Expression = exports.PageBoxMarginBox = exports.Page = exports.SupportsCondition = exports.MediaQuery = exports.Medialist = exports.Document = exports.Supports = exports.Media = exports.Namespace = exports.ForwardVisibility = exports.Forward = exports.ModuleConfiguration = exports.Use = exports.Import = exports.KeyframeSelector = exports.Keyframe = exports.NestedProperties = exports.FontFace = exports.ViewPort = exports.FunctionDeclaration = exports.ElseStatement = exports.WhileStatement = exports.EachStatement = exports.ForStatement = exports.IfStatement = exports.FunctionArgument = exports.FunctionParameter = exports.Function = exports.Invocation = exports.Property = exports.CustomPropertyDeclaration = exports.Declaration = exports.CustomPropertySet = exports.AbstractDeclaration = exports.AtApplyRule = exports.SimpleSelector = exports.Selector = exports.RuleSet = exports.BodyDeclaration = exports.Declarations = exports.Stylesheet = exports.Identifier = exports.Nodelist = exports.Node = exports.getParentDeclaration = exports.getNodePath = exports.getNodeAtOffset = exports.ReferenceType = exports.NodeType = void 0;
+    exports.ParseErrorCollector = exports.Marker = exports.Level = exports.Module = exports.GuardCondition = exports.LessGuard = exports.ListEntry = exports.UnknownAtRule = exports.MixinDeclaration = exports.MixinReference = exports.MixinContentDeclaration = exports.MixinContentReference = exports.ExtendsReference = exports.Variable = exports.Interpolation = exports.VariableDeclaration = exports.NumericValue = exports.RatioValue = exports.HexColorValue = exports.Operator = exports.AttributeSelector = exports.Term = exports.BinaryExpression = exports.Expression = exports.PageBoxMarginBox = exports.Page = exports.SupportsCondition = exports.MediaFeature = exports.MediaCondition = exports.MediaQuery = exports.Medialist = exports.Document = exports.Supports = exports.Media = exports.Namespace = exports.ForwardVisibility = exports.Forward = exports.ModuleConfiguration = exports.Use = exports.Import = exports.KeyframeSelector = exports.Keyframe = exports.NestedProperties = exports.FontFace = exports.ViewPort = exports.FunctionDeclaration = exports.ElseStatement = exports.WhileStatement = exports.EachStatement = exports.ForStatement = exports.IfStatement = exports.FunctionArgument = exports.FunctionParameter = exports.Function = exports.Invocation = exports.Property = exports.CustomPropertyDeclaration = exports.Declaration = exports.CustomPropertySet = exports.AbstractDeclaration = exports.AtApplyRule = exports.SimpleSelector = exports.Selector = exports.RuleSet = exports.BodyDeclaration = exports.Declarations = exports.Stylesheet = exports.Identifier = exports.Nodelist = exports.Node = exports.getParentDeclaration = exports.getNodePath = exports.getNodeAtOffset = exports.ReferenceType = exports.NodeType = void 0;
     var strings_1 = require("../utils/strings");
     /// <summary>
     /// Nodes for the css 2.1 specification. See for reference:
@@ -69,52 +69,55 @@ var __extends = (this && this.__extends) || (function () {
         NodeType[NodeType["Function"] = 30] = "Function";
         NodeType[NodeType["NumericValue"] = 31] = "NumericValue";
         NodeType[NodeType["HexColorValue"] = 32] = "HexColorValue";
-        NodeType[NodeType["MixinDeclaration"] = 33] = "MixinDeclaration";
-        NodeType[NodeType["MixinReference"] = 34] = "MixinReference";
-        NodeType[NodeType["VariableName"] = 35] = "VariableName";
-        NodeType[NodeType["VariableDeclaration"] = 36] = "VariableDeclaration";
-        NodeType[NodeType["Prio"] = 37] = "Prio";
-        NodeType[NodeType["Interpolation"] = 38] = "Interpolation";
-        NodeType[NodeType["NestedProperties"] = 39] = "NestedProperties";
-        NodeType[NodeType["ExtendsReference"] = 40] = "ExtendsReference";
-        NodeType[NodeType["SelectorPlaceholder"] = 41] = "SelectorPlaceholder";
-        NodeType[NodeType["Debug"] = 42] = "Debug";
-        NodeType[NodeType["If"] = 43] = "If";
-        NodeType[NodeType["Else"] = 44] = "Else";
-        NodeType[NodeType["For"] = 45] = "For";
-        NodeType[NodeType["Each"] = 46] = "Each";
-        NodeType[NodeType["While"] = 47] = "While";
-        NodeType[NodeType["MixinContentReference"] = 48] = "MixinContentReference";
-        NodeType[NodeType["MixinContentDeclaration"] = 49] = "MixinContentDeclaration";
-        NodeType[NodeType["Media"] = 50] = "Media";
-        NodeType[NodeType["Keyframe"] = 51] = "Keyframe";
-        NodeType[NodeType["FontFace"] = 52] = "FontFace";
-        NodeType[NodeType["Import"] = 53] = "Import";
-        NodeType[NodeType["Namespace"] = 54] = "Namespace";
-        NodeType[NodeType["Invocation"] = 55] = "Invocation";
-        NodeType[NodeType["FunctionDeclaration"] = 56] = "FunctionDeclaration";
-        NodeType[NodeType["ReturnStatement"] = 57] = "ReturnStatement";
-        NodeType[NodeType["MediaQuery"] = 58] = "MediaQuery";
-        NodeType[NodeType["FunctionParameter"] = 59] = "FunctionParameter";
-        NodeType[NodeType["FunctionArgument"] = 60] = "FunctionArgument";
-        NodeType[NodeType["KeyframeSelector"] = 61] = "KeyframeSelector";
-        NodeType[NodeType["ViewPort"] = 62] = "ViewPort";
-        NodeType[NodeType["Document"] = 63] = "Document";
-        NodeType[NodeType["AtApplyRule"] = 64] = "AtApplyRule";
-        NodeType[NodeType["CustomPropertyDeclaration"] = 65] = "CustomPropertyDeclaration";
-        NodeType[NodeType["CustomPropertySet"] = 66] = "CustomPropertySet";
-        NodeType[NodeType["ListEntry"] = 67] = "ListEntry";
-        NodeType[NodeType["Supports"] = 68] = "Supports";
-        NodeType[NodeType["SupportsCondition"] = 69] = "SupportsCondition";
-        NodeType[NodeType["NamespacePrefix"] = 70] = "NamespacePrefix";
-        NodeType[NodeType["GridLine"] = 71] = "GridLine";
-        NodeType[NodeType["Plugin"] = 72] = "Plugin";
-        NodeType[NodeType["UnknownAtRule"] = 73] = "UnknownAtRule";
-        NodeType[NodeType["Use"] = 74] = "Use";
-        NodeType[NodeType["ModuleConfiguration"] = 75] = "ModuleConfiguration";
-        NodeType[NodeType["Forward"] = 76] = "Forward";
-        NodeType[NodeType["ForwardVisibility"] = 77] = "ForwardVisibility";
-        NodeType[NodeType["Module"] = 78] = "Module";
+        NodeType[NodeType["RatioValue"] = 33] = "RatioValue";
+        NodeType[NodeType["MixinDeclaration"] = 34] = "MixinDeclaration";
+        NodeType[NodeType["MixinReference"] = 35] = "MixinReference";
+        NodeType[NodeType["VariableName"] = 36] = "VariableName";
+        NodeType[NodeType["VariableDeclaration"] = 37] = "VariableDeclaration";
+        NodeType[NodeType["Prio"] = 38] = "Prio";
+        NodeType[NodeType["Interpolation"] = 39] = "Interpolation";
+        NodeType[NodeType["NestedProperties"] = 40] = "NestedProperties";
+        NodeType[NodeType["ExtendsReference"] = 41] = "ExtendsReference";
+        NodeType[NodeType["SelectorPlaceholder"] = 42] = "SelectorPlaceholder";
+        NodeType[NodeType["Debug"] = 43] = "Debug";
+        NodeType[NodeType["If"] = 44] = "If";
+        NodeType[NodeType["Else"] = 45] = "Else";
+        NodeType[NodeType["For"] = 46] = "For";
+        NodeType[NodeType["Each"] = 47] = "Each";
+        NodeType[NodeType["While"] = 48] = "While";
+        NodeType[NodeType["MixinContentReference"] = 49] = "MixinContentReference";
+        NodeType[NodeType["MixinContentDeclaration"] = 50] = "MixinContentDeclaration";
+        NodeType[NodeType["Media"] = 51] = "Media";
+        NodeType[NodeType["Keyframe"] = 52] = "Keyframe";
+        NodeType[NodeType["FontFace"] = 53] = "FontFace";
+        NodeType[NodeType["Import"] = 54] = "Import";
+        NodeType[NodeType["Namespace"] = 55] = "Namespace";
+        NodeType[NodeType["Invocation"] = 56] = "Invocation";
+        NodeType[NodeType["FunctionDeclaration"] = 57] = "FunctionDeclaration";
+        NodeType[NodeType["ReturnStatement"] = 58] = "ReturnStatement";
+        NodeType[NodeType["MediaQuery"] = 59] = "MediaQuery";
+        NodeType[NodeType["MediaCondition"] = 60] = "MediaCondition";
+        NodeType[NodeType["MediaFeature"] = 61] = "MediaFeature";
+        NodeType[NodeType["FunctionParameter"] = 62] = "FunctionParameter";
+        NodeType[NodeType["FunctionArgument"] = 63] = "FunctionArgument";
+        NodeType[NodeType["KeyframeSelector"] = 64] = "KeyframeSelector";
+        NodeType[NodeType["ViewPort"] = 65] = "ViewPort";
+        NodeType[NodeType["Document"] = 66] = "Document";
+        NodeType[NodeType["AtApplyRule"] = 67] = "AtApplyRule";
+        NodeType[NodeType["CustomPropertyDeclaration"] = 68] = "CustomPropertyDeclaration";
+        NodeType[NodeType["CustomPropertySet"] = 69] = "CustomPropertySet";
+        NodeType[NodeType["ListEntry"] = 70] = "ListEntry";
+        NodeType[NodeType["Supports"] = 71] = "Supports";
+        NodeType[NodeType["SupportsCondition"] = 72] = "SupportsCondition";
+        NodeType[NodeType["NamespacePrefix"] = 73] = "NamespacePrefix";
+        NodeType[NodeType["GridLine"] = 74] = "GridLine";
+        NodeType[NodeType["Plugin"] = 75] = "Plugin";
+        NodeType[NodeType["UnknownAtRule"] = 76] = "UnknownAtRule";
+        NodeType[NodeType["Use"] = 77] = "Use";
+        NodeType[NodeType["ModuleConfiguration"] = 78] = "ModuleConfiguration";
+        NodeType[NodeType["Forward"] = 79] = "Forward";
+        NodeType[NodeType["ForwardVisibility"] = 80] = "ForwardVisibility";
+        NodeType[NodeType["Module"] = 81] = "Module";
     })(NodeType = exports.NodeType || (exports.NodeType = {}));
     var ReferenceType;
     (function (ReferenceType) {
@@ -1210,6 +1213,36 @@ var __extends = (this && this.__extends) || (function () {
         return MediaQuery;
     }(Node));
     exports.MediaQuery = MediaQuery;
+    var MediaCondition = /** @class */ (function (_super) {
+        __extends(MediaCondition, _super);
+        function MediaCondition(offset, length) {
+            return _super.call(this, offset, length) || this;
+        }
+        Object.defineProperty(MediaCondition.prototype, "type", {
+            get: function () {
+                return NodeType.MediaCondition;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return MediaCondition;
+    }(Node));
+    exports.MediaCondition = MediaCondition;
+    var MediaFeature = /** @class */ (function (_super) {
+        __extends(MediaFeature, _super);
+        function MediaFeature(offset, length) {
+            return _super.call(this, offset, length) || this;
+        }
+        Object.defineProperty(MediaFeature.prototype, "type", {
+            get: function () {
+                return NodeType.MediaFeature;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return MediaFeature;
+    }(Node));
+    exports.MediaFeature = MediaFeature;
     var SupportsCondition = /** @class */ (function (_super) {
         __extends(SupportsCondition, _super);
         function SupportsCondition(offset, length) {
@@ -1399,6 +1432,21 @@ var __extends = (this && this.__extends) || (function () {
         return HexColorValue;
     }(Node));
     exports.HexColorValue = HexColorValue;
+    var RatioValue = /** @class */ (function (_super) {
+        __extends(RatioValue, _super);
+        function RatioValue(offset, length) {
+            return _super.call(this, offset, length) || this;
+        }
+        Object.defineProperty(RatioValue.prototype, "type", {
+            get: function () {
+                return NodeType.RatioValue;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return RatioValue;
+    }(Node));
+    exports.RatioValue = RatioValue;
     var _dot = '.'.charCodeAt(0), _0 = '0'.charCodeAt(0), _9 = '9'.charCodeAt(0);
     var NumericValue = /** @class */ (function (_super) {
         __extends(NumericValue, _super);

package/lib/umd/parser/cssParser.js

@@ -826,66 +826,145 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
         };
         Parser.prototype._parseMediaQueryList = function () {
             var node = this.create(nodes.Medialist);
-            if (!node.addChild(this._parseMediaQuery([cssScanner_1.TokenType.CurlyL]))) {
+            if (!node.addChild(this._parseMediaQuery())) {
                 return this.finish(node, cssErrors_1.ParseError.MediaQueryExpected);
             }
             while (this.accept(cssScanner_1.TokenType.Comma)) {
-                if (!node.addChild(this._parseMediaQuery([cssScanner_1.TokenType.CurlyL]))) {
+                if (!node.addChild(this._parseMediaQuery())) {
                     return this.finish(node, cssErrors_1.ParseError.MediaQueryExpected);
                 }
             }
             return this.finish(node);
         };
-        Parser.prototype._parseMediaQuery = function (resyncStopToken) {
-            // http://www.w3.org/TR/css3-mediaqueries/
-            // media_query : [ONLY | NOT]? S* IDENT S* [ AND S* expression ]* | expression [ AND S* expression ]*
-            // expression : '(' S* IDENT S* [ ':' S* expr ]? ')' S*
+        Parser.prototype._parseMediaQuery = function () {
+            // <media-query> = <media-condition> | [ not | only ]? <media-type> [ and <media-condition-without-or> ]?
             var node = this.create(nodes.MediaQuery);
-            var parseExpression = true;
-            var hasContent = false;
+            var pos = this.mark();
+            this.acceptIdent('not');
             if (!this.peek(cssScanner_1.TokenType.ParenthesisL)) {
-                if (this.acceptIdent('only') || this.acceptIdent('not')) {
+                if (this.acceptIdent('only')) {
                     // optional
                 }
                 if (!node.addChild(this._parseIdent())) {
                     return null;
                 }
-                hasContent = true;
-                parseExpression = this.acceptIdent('and');
+                if (this.acceptIdent('and')) {
+                    node.addChild(this._parseMediaCondition());
+                }
+            }
+            else {
+                this.restoreAtMark(pos); // 'not' is part of the MediaCondition
+                node.addChild(this._parseMediaCondition());
+            }
+            return this.finish(node);
+        };
+        Parser.prototype._parseRatio = function () {
+            var pos = this.mark();
+            var node = this.create(nodes.RatioValue);
+            if (!this._parseNumeric()) {
+                return null;
+            }
+            if (!this.acceptDelim('/')) {
+                this.restoreAtMark(pos);
+                return null;
             }
+            if (!this._parseNumeric()) {
+                return this.finish(node, cssErrors_1.ParseError.NumberExpected);
+            }
+            return this.finish(node);
+        };
+        Parser.prototype._parseMediaCondition = function () {
+            // <media-condition> = <media-not> | <media-and> | <media-or> | <media-in-parens>
+            // <media-not> = not <media-in-parens>
+            // <media-and> = <media-in-parens> [ and <media-in-parens> ]+
+            // <media-or> = <media-in-parens> [ or <media-in-parens> ]+
+            // <media-in-parens> = ( <media-condition> ) | <media-feature> | <general-enclosed>
+            var node = this.create(nodes.MediaCondition);
+            this.acceptIdent('not');
+            var parseExpression = true;
             while (parseExpression) {
-                // Allow short-circuting for other language constructs.
-                if (node.addChild(this._parseMediaContentStart())) {
-                    parseExpression = this.acceptIdent('and');
-                    continue;
-                }
                 if (!this.accept(cssScanner_1.TokenType.ParenthesisL)) {
-                    if (hasContent) {
-                        return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected, [], resyncStopToken);
+                    return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected, [], [cssScanner_1.TokenType.CurlyL]);
+                }
+                if (this.peek(cssScanner_1.TokenType.ParenthesisL) || this.peekIdent('not')) {
+                    // <media-condition>
+                    node.addChild(this._parseMediaCondition());
+                }
+                else {
+                    node.addChild(this._parseMediaFeature());
+                }
+                // not yet implemented: general enclosed
+                if (!this.accept(cssScanner_1.TokenType.ParenthesisR)) {
+                    return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected, [], [cssScanner_1.TokenType.CurlyL]);
+                }
+                parseExpression = this.acceptIdent('and') || this.acceptIdent('or');
+            }
+            return this.finish(node);
+        };
+        Parser.prototype._parseMediaFeature = function () {
+            var _this = this;
+            var resyncStopToken = [cssScanner_1.TokenType.ParenthesisR];
+            var node = this.create(nodes.MediaFeature);
+            // <media-feature> = ( [ <mf-plain> | <mf-boolean> | <mf-range> ] )
+            // <mf-plain> = <mf-name> : <mf-value>
+            // <mf-boolean> = <mf-name>
+            // <mf-range> = <mf-name> [ '<' | '>' ]? '='? <mf-value> | <mf-value> [ '<' | '>' ]? '='? <mf-name> | <mf-value> '<' '='? <mf-name> '<' '='? <mf-value> | <mf-value> '>' '='? <mf-name> '>' '='? <mf-value>
+            var parseRangeOperator = function () {
+                if (_this.acceptDelim('<') || _this.acceptDelim('>')) {
+                    if (!_this.hasWhitespace()) {
+                        _this.acceptDelim('=');
                     }
-                    return null;
+                    return true;
                 }
-                if (!node.addChild(this._parseMediaFeatureName())) {
-                    return this.finish(node, cssErrors_1.ParseError.IdentifierExpected, [], resyncStopToken);
+                else if (_this.acceptDelim('=')) {
+                    return true;
                 }
+                return false;
+            };
+            if (node.addChild(this._parseMediaFeatureName())) {
                 if (this.accept(cssScanner_1.TokenType.Colon)) {
-                    if (!node.addChild(this._parseExpr())) {
+                    if (!node.addChild(this._parseMediaFeatureValue())) {
                         return this.finish(node, cssErrors_1.ParseError.TermExpected, [], resyncStopToken);
                     }
                 }
-                if (!this.accept(cssScanner_1.TokenType.ParenthesisR)) {
-                    return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected, [], resyncStopToken);
+                else if (parseRangeOperator()) {
+                    if (!node.addChild(this._parseMediaFeatureValue())) {
+                        return this.finish(node, cssErrors_1.ParseError.TermExpected, [], resyncStopToken);
+                    }
+                    if (parseRangeOperator()) {
+                        if (!node.addChild(this._parseMediaFeatureValue())) {
+                            return this.finish(node, cssErrors_1.ParseError.TermExpected, [], resyncStopToken);
+                        }
+                    }
+                }
+                else {
+                    // <mf-boolean> = <mf-name>
+                }
+            }
+            else if (node.addChild(this._parseMediaFeatureValue())) {
+                if (!parseRangeOperator()) {
+                    return this.finish(node, cssErrors_1.ParseError.OperatorExpected, [], resyncStopToken);
+                }
+                if (!node.addChild(this._parseMediaFeatureName())) {
+                    return this.finish(node, cssErrors_1.ParseError.IdentifierExpected, [], resyncStopToken);
+                }
+                if (parseRangeOperator()) {
+                    if (!node.addChild(this._parseMediaFeatureValue())) {
+                        return this.finish(node, cssErrors_1.ParseError.TermExpected, [], resyncStopToken);
+                    }
                 }
-                parseExpression = this.acceptIdent('and');
+            }
+            else {
+                return this.finish(node, cssErrors_1.ParseError.IdentifierExpected, [], resyncStopToken);
             }
             return this.finish(node);
         };
-        Parser.prototype._parseMediaContentStart = function () {
-            return null;
-        };
         Parser.prototype._parseMediaFeatureName = function () {
             return this._parseIdent();
         };
+        Parser.prototype._parseMediaFeatureValue = function () {
+            return this._parseRatio() || this._parseTermExpression();
+        };
         Parser.prototype._parseMedium = function () {
             var node = this.create(nodes.Node);
             if (node.addChild(this._parseIdent())) {
@@ -1191,6 +1270,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
             if (node.setOperator(this._parseOperator())) {
                 node.setValue(this._parseBinaryExpr());
                 this.acceptIdent('i'); // case insensitive matching
+                this.acceptIdent('s'); // case sensitive matching
             }
             if (!this.accept(cssScanner_1.TokenType.BracketR)) {
                 return this.finish(node, cssErrors_1.ParseError.RightSquareBracketExpected);

package/lib/umd/parser/lessParser.js

@@ -97,8 +97,8 @@ var __extends = (this && this.__extends) || (function () {
             }
             return this.finish(node);
         };
-        LESSParser.prototype._parseMediaQuery = function (resyncStopToken) {
-            var node = _super.prototype._parseMediaQuery.call(this, resyncStopToken);
+        LESSParser.prototype._parseMediaQuery = function () {
+            var node = _super.prototype._parseMediaQuery.call(this);
             if (!node) {
                 var node_1 = this.create(nodes.MediaQuery);
                 if (node_1.addChild(this._parseVariable())) {

package/lib/umd/parser/scssParser.js

@@ -115,8 +115,8 @@ var __extends = (this && this.__extends) || (function () {
             }
             return this.finish(node);
         };
-        SCSSParser.prototype._parseMediaContentStart = function () {
-            return this._parseInterpolation();
+        SCSSParser.prototype._parseMediaCondition = function () {
+            return this._parseInterpolation() || _super.prototype._parseMediaCondition.call(this);
         };
         SCSSParser.prototype._parseMediaFeatureName = function () {
             return this._parseModuleMember()

package/lib/umd/services/cssCompletion.js

@@ -468,7 +468,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             var symbols = this.getSymbolContext().findSymbolsAtOffset(this.offset, nodes.ReferenceType.Variable);
             for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
                 var symbol = symbols_1[_i];
-                var insertText = strings.startsWith(symbol.name, '--') ? "var(" + symbol.name + ")" : symbol.name;
+                var insertText = strings.startsWith(symbol.name, '--') ? "var(".concat(symbol.name, ")") : symbol.name;
                 var completionItem = {
                     label: symbol.name,
                     documentation: symbol.value ? strings.getLimitedString(symbol.value) : symbol.value,
@@ -490,22 +490,35 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             return result;
         };
         CSSCompletion.prototype.getVariableProposalsForCSSVarFunction = function (result) {
+            var allReferencedVariables = new Set();
+            this.styleSheet.acceptVisitor(new VariableCollector(allReferencedVariables, this.offset));
             var symbols = this.getSymbolContext().findSymbolsAtOffset(this.offset, nodes.ReferenceType.Variable);
-            symbols = symbols.filter(function (symbol) {
-                return strings.startsWith(symbol.name, '--');
-            });
             for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
                 var symbol = symbols_2[_i];
-                var completionItem = {
-                    label: symbol.name,
-                    documentation: symbol.value ? strings.getLimitedString(symbol.value) : symbol.value,
-                    textEdit: cssLanguageTypes_1.TextEdit.replace(this.getCompletionRange(null), symbol.name),
-                    kind: cssLanguageTypes_1.CompletionItemKind.Variable
-                };
-                if (typeof completionItem.documentation === 'string' && isColorString(completionItem.documentation)) {
-                    completionItem.kind = cssLanguageTypes_1.CompletionItemKind.Color;
+                if (strings.startsWith(symbol.name, '--')) {
+                    var completionItem = {
+                        label: symbol.name,
+                        documentation: symbol.value ? strings.getLimitedString(symbol.value) : symbol.value,
+                        textEdit: cssLanguageTypes_1.TextEdit.replace(this.getCompletionRange(null), symbol.name),
+                        kind: cssLanguageTypes_1.CompletionItemKind.Variable
+                    };
+                    if (typeof completionItem.documentation === 'string' && isColorString(completionItem.documentation)) {
+                        completionItem.kind = cssLanguageTypes_1.CompletionItemKind.Color;
+                    }
+                    result.items.push(completionItem);
+                }
+                allReferencedVariables.remove(symbol.name);
+            }
+            for (var _a = 0, _b = allReferencedVariables.getEntries(); _a < _b.length; _a++) {
+                var name = _b[_a];
+                if (strings.startsWith(name, '--')) {
+                    var completionItem = {
+                        label: name,
+                        textEdit: cssLanguageTypes_1.TextEdit.replace(this.getCompletionRange(null), name),
+                        kind: cssLanguageTypes_1.CompletionItemKind.Variable
+                    };
+                    result.items.push(completionItem);
                 }
-                result.items.push(completionItem);
             }
             return result;
         };
@@ -1056,24 +1069,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         }
         return false;
     }
-    /**
-     * Rank number should all be same length strings
-     */
-    function computeRankNumber(n) {
-        var nstr = n.toString();
-        switch (nstr.length) {
-            case 4:
-                return nstr;
-            case 3:
-                return '0' + nstr;
-            case 2:
-                return '00' + nstr;
-            case 1:
-                return '000' + nstr;
-            default:
-                return '0000';
-        }
-    }
     var Set = /** @class */ (function () {
         function Set() {
             this.entries = {};
@@ -1081,6 +1076,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         Set.prototype.add = function (entry) {
             this.entries[entry] = true;
         };
+        Set.prototype.remove = function (entry) {
+            delete this.entries[entry];
+        };
         Set.prototype.getEntries = function () {
             return Object.keys(this.entries);
         };
@@ -1132,6 +1130,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         };
         return ColorValueCollector;
     }());
+    var VariableCollector = /** @class */ (function () {
+        function VariableCollector(entries, currentOffset) {
+            this.entries = entries;
+            this.currentOffset = currentOffset;
+            // nothing to do
+        }
+        VariableCollector.prototype.visitNode = function (node) {
+            if (node instanceof nodes.Identifier && node.isCustomProperty) {
+                if (this.currentOffset < node.offset || node.end < this.currentOffset) {
+                    this.entries.add(node.getText());
+                }
+            }
+            return true;
+        };
+        return VariableCollector;
+    }());
     function getCurrentWord(document, offset) {
         var i = offset - 1;
         var text = document.getText();