vscode-css-languageservice 6.2.8 → 6.2.10

package/lib/esm/parser/cssNodes.js

@@ -97,6 +97,7 @@ export var NodeType;
     NodeType[NodeType["LayerNameList"] = 84] = "LayerNameList";
     NodeType[NodeType["LayerName"] = 85] = "LayerName";
     NodeType[NodeType["PropertyAtRule"] = 86] = "PropertyAtRule";
+    NodeType[NodeType["Container"] = 87] = "Container";
 })(NodeType || (NodeType = {}));
 export var ReferenceType;
 (function (ReferenceType) {
@@ -922,6 +923,14 @@ export class Document extends BodyDeclaration {
         return NodeType.Document;
     }
 }
+export class Container extends BodyDeclaration {
+    constructor(offset, length) {
+        super(offset, length);
+    }
+    get type() {
+        return NodeType.Container;
+    }
+}
 export class Medialist extends Node {
     constructor(offset, length) {
         super(offset, length);

package/lib/esm/parser/cssParser.js

@@ -276,6 +276,7 @@ export class Parser {
             || this._parseViewPort()
             || this._parseNamespace()
             || this._parseDocument()
+            || this._parseContainer()
             || this._parseUnknownAtRule();
     }
     _tryParseRuleset(isNested) {
@@ -1134,6 +1135,111 @@ export class Parser {
         this.resync([], [TokenType.CurlyL]); // ignore all the rules
         return this._parseBody(node, this._parseStylesheetStatement.bind(this));
     }
+    _parseContainer() {
+        if (!this.peekKeyword('@container')) {
+            return null;
+        }
+        const node = this.create(nodes.Container);
+        this.consumeToken(); // @container
+        node.addChild(this._parseIdent()); // optional container name
+        node.addChild(this._parseContainerQuery());
+        return this._parseBody(node, this._parseStylesheetStatement.bind(this));
+    }
+    _parseContainerQuery() {
+        // <container-query>     = not <query-in-parens>
+        //                         | <query-in-parens> [ [ and <query-in-parens> ]* | [ or <query-in-parens> ]* ]
+        const node = this.create(nodes.Node);
+        if (this.acceptIdent('not')) {
+            node.addChild(this._parseContainerQueryInParens());
+        }
+        else {
+            node.addChild(this._parseContainerQueryInParens());
+            if (this.peekIdent('and')) {
+                while (this.acceptIdent('and')) {
+                    node.addChild(this._parseContainerQueryInParens());
+                }
+            }
+            else if (this.peekIdent('or')) {
+                while (this.acceptIdent('or')) {
+                    node.addChild(this._parseContainerQueryInParens());
+                }
+            }
+        }
+        return this.finish(node);
+    }
+    _parseContainerQueryInParens() {
+        // <query-in-parens>     = ( <container-query> )
+        // 					  | ( <size-feature> )
+        // 					  | style( <style-query> )
+        // 					  | <general-enclosed>
+        const node = this.create(nodes.Node);
+        if (this.accept(TokenType.ParenthesisL)) {
+            if (this.peekIdent('not') || this.peek(TokenType.ParenthesisL)) {
+                node.addChild(this._parseContainerQuery());
+            }
+            else {
+                node.addChild(this._parseMediaFeature());
+            }
+            if (!this.accept(TokenType.ParenthesisR)) {
+                return this.finish(node, ParseError.RightParenthesisExpected, [], [TokenType.CurlyL]);
+            }
+        }
+        else if (this.acceptIdent('style')) {
+            if (this.hasWhitespace() || !this.accept(TokenType.ParenthesisL)) {
+                return this.finish(node, ParseError.LeftParenthesisExpected, [], [TokenType.CurlyL]);
+            }
+            node.addChild(this._parseStyleQuery());
+            if (!this.accept(TokenType.ParenthesisR)) {
+                return this.finish(node, ParseError.RightParenthesisExpected, [], [TokenType.CurlyL]);
+            }
+        }
+        else {
+            return this.finish(node, ParseError.LeftParenthesisExpected, [], [TokenType.CurlyL]);
+        }
+        return this.finish(node);
+    }
+    _parseStyleQuery() {
+        // <style-query>         = not <style-in-parens>
+        // 					  | <style-in-parens> [ [ and <style-in-parens> ]* | [ or <style-in-parens> ]* ]
+        // 					  | <style-feature>
+        // <style-in-parens>     = ( <style-query> )
+        // 					  | ( <style-feature> )
+        // 					  | <general-enclosed>
+        const node = this.create(nodes.Node);
+        if (this.acceptIdent('not')) {
+            node.addChild(this._parseStyleInParens());
+        }
+        else if (this.peek(TokenType.ParenthesisL)) {
+            node.addChild(this._parseStyleInParens());
+            if (this.peekIdent('and')) {
+                while (this.acceptIdent('and')) {
+                    node.addChild(this._parseStyleInParens());
+                }
+            }
+            else if (this.peekIdent('or')) {
+                while (this.acceptIdent('or')) {
+                    node.addChild(this._parseStyleInParens());
+                }
+            }
+        }
+        else {
+            node.addChild(this._parseDeclaration([TokenType.ParenthesisR]));
+        }
+        return this.finish(node);
+    }
+    _parseStyleInParens() {
+        const node = this.create(nodes.Node);
+        if (this.accept(TokenType.ParenthesisL)) {
+            node.addChild(this._parseStyleQuery());
+            if (!this.accept(TokenType.ParenthesisR)) {
+                return this.finish(node, ParseError.RightParenthesisExpected, [], [TokenType.CurlyL]);
+            }
+        }
+        else {
+            return this.finish(node, ParseError.LeftParenthesisExpected, [], [TokenType.CurlyL]);
+        }
+        return this.finish(node);
+    }
     // https://www.w3.org/TR/css-syntax-3/#consume-an-at-rule
     _parseUnknownAtRule() {
         if (!this.peek(TokenType.AtKeyword)) {
@@ -1562,6 +1668,7 @@ export class Parser {
             this.peek(TokenType.Angle) ||
             this.peek(TokenType.Time) ||
             this.peek(TokenType.Dimension) ||
+            this.peek(TokenType.ContainerQueryLength) ||
             this.peek(TokenType.Freq)) {
             const node = this.create(nodes.NumericValue);
             this.consumeToken();

package/lib/esm/parser/cssScanner.js

@@ -48,6 +48,7 @@ export var TokenType;
     TokenType[TokenType["SingleLineComment"] = 40] = "SingleLineComment";
     TokenType[TokenType["EOF"] = 41] = "EOF";
     TokenType[TokenType["CustomToken"] = 42] = "CustomToken";
+    TokenType[TokenType["ContainerQueryLength"] = 43] = "ContainerQueryLength";
 })(TokenType || (TokenType = {}));
 export class MultiLineStream {
     constructor(source) {
@@ -184,6 +185,12 @@ staticUnitTable['%'] = TokenType.Percentage;
 staticUnitTable['fr'] = TokenType.Percentage;
 staticUnitTable['dpi'] = TokenType.Resolution;
 staticUnitTable['dpcm'] = TokenType.Resolution;
+staticUnitTable['cqw'] = TokenType.ContainerQueryLength;
+staticUnitTable['cqh'] = TokenType.ContainerQueryLength;
+staticUnitTable['cqi'] = TokenType.ContainerQueryLength;
+staticUnitTable['cqb'] = TokenType.ContainerQueryLength;
+staticUnitTable['cqmin'] = TokenType.ContainerQueryLength;
+staticUnitTable['cqmax'] = TokenType.ContainerQueryLength;
 export class Scanner {
     constructor() {
         this.stream = new MultiLineStream('');

package/lib/umd/parser/cssNodes.js

@@ -13,7 +13,7 @@
      *--------------------------------------------------------------------------------------------*/
     '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.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.PropertyAtRule = exports.Layer = 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.UnicodeRange = 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.Container = exports.Document = exports.PropertyAtRule = exports.Layer = 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.UnicodeRange = exports.Nodelist = exports.Node = exports.getParentDeclaration = exports.getNodePath = exports.getNodeAtOffset = exports.ReferenceType = exports.NodeType = void 0;
     const strings_1 = require("../utils/strings");
     /// <summary>
     /// Nodes for the css 2.1 specification. See for reference:
@@ -108,6 +108,7 @@
         NodeType[NodeType["LayerNameList"] = 84] = "LayerNameList";
         NodeType[NodeType["LayerName"] = 85] = "LayerName";
         NodeType[NodeType["PropertyAtRule"] = 86] = "PropertyAtRule";
+        NodeType[NodeType["Container"] = 87] = "Container";
     })(NodeType || (exports.NodeType = NodeType = {}));
     var ReferenceType;
     (function (ReferenceType) {
@@ -978,6 +979,15 @@
         }
     }
     exports.Document = Document;
+    class Container extends BodyDeclaration {
+        constructor(offset, length) {
+            super(offset, length);
+        }
+        get type() {
+            return NodeType.Container;
+        }
+    }
+    exports.Container = Container;
     class Medialist extends Node {
         constructor(offset, length) {
             super(offset, length);

package/lib/umd/parser/cssParser.js

@@ -287,6 +287,7 @@
                 || this._parseViewPort()
                 || this._parseNamespace()
                 || this._parseDocument()
+                || this._parseContainer()
                 || this._parseUnknownAtRule();
         }
         _tryParseRuleset(isNested) {
@@ -1145,6 +1146,111 @@
             this.resync([], [cssScanner_1.TokenType.CurlyL]); // ignore all the rules
             return this._parseBody(node, this._parseStylesheetStatement.bind(this));
         }
+        _parseContainer() {
+            if (!this.peekKeyword('@container')) {
+                return null;
+            }
+            const node = this.create(nodes.Container);
+            this.consumeToken(); // @container
+            node.addChild(this._parseIdent()); // optional container name
+            node.addChild(this._parseContainerQuery());
+            return this._parseBody(node, this._parseStylesheetStatement.bind(this));
+        }
+        _parseContainerQuery() {
+            // <container-query>     = not <query-in-parens>
+            //                         | <query-in-parens> [ [ and <query-in-parens> ]* | [ or <query-in-parens> ]* ]
+            const node = this.create(nodes.Node);
+            if (this.acceptIdent('not')) {
+                node.addChild(this._parseContainerQueryInParens());
+            }
+            else {
+                node.addChild(this._parseContainerQueryInParens());
+                if (this.peekIdent('and')) {
+                    while (this.acceptIdent('and')) {
+                        node.addChild(this._parseContainerQueryInParens());
+                    }
+                }
+                else if (this.peekIdent('or')) {
+                    while (this.acceptIdent('or')) {
+                        node.addChild(this._parseContainerQueryInParens());
+                    }
+                }
+            }
+            return this.finish(node);
+        }
+        _parseContainerQueryInParens() {
+            // <query-in-parens>     = ( <container-query> )
+            // 					  | ( <size-feature> )
+            // 					  | style( <style-query> )
+            // 					  | <general-enclosed>
+            const node = this.create(nodes.Node);
+            if (this.accept(cssScanner_1.TokenType.ParenthesisL)) {
+                if (this.peekIdent('not') || this.peek(cssScanner_1.TokenType.ParenthesisL)) {
+                    node.addChild(this._parseContainerQuery());
+                }
+                else {
+                    node.addChild(this._parseMediaFeature());
+                }
+                if (!this.accept(cssScanner_1.TokenType.ParenthesisR)) {
+                    return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected, [], [cssScanner_1.TokenType.CurlyL]);
+                }
+            }
+            else if (this.acceptIdent('style')) {
+                if (this.hasWhitespace() || !this.accept(cssScanner_1.TokenType.ParenthesisL)) {
+                    return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected, [], [cssScanner_1.TokenType.CurlyL]);
+                }
+                node.addChild(this._parseStyleQuery());
+                if (!this.accept(cssScanner_1.TokenType.ParenthesisR)) {
+                    return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected, [], [cssScanner_1.TokenType.CurlyL]);
+                }
+            }
+            else {
+                return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected, [], [cssScanner_1.TokenType.CurlyL]);
+            }
+            return this.finish(node);
+        }
+        _parseStyleQuery() {
+            // <style-query>         = not <style-in-parens>
+            // 					  | <style-in-parens> [ [ and <style-in-parens> ]* | [ or <style-in-parens> ]* ]
+            // 					  | <style-feature>
+            // <style-in-parens>     = ( <style-query> )
+            // 					  | ( <style-feature> )
+            // 					  | <general-enclosed>
+            const node = this.create(nodes.Node);
+            if (this.acceptIdent('not')) {
+                node.addChild(this._parseStyleInParens());
+            }
+            else if (this.peek(cssScanner_1.TokenType.ParenthesisL)) {
+                node.addChild(this._parseStyleInParens());
+                if (this.peekIdent('and')) {
+                    while (this.acceptIdent('and')) {
+                        node.addChild(this._parseStyleInParens());
+                    }
+                }
+                else if (this.peekIdent('or')) {
+                    while (this.acceptIdent('or')) {
+                        node.addChild(this._parseStyleInParens());
+                    }
+                }
+            }
+            else {
+                node.addChild(this._parseDeclaration([cssScanner_1.TokenType.ParenthesisR]));
+            }
+            return this.finish(node);
+        }
+        _parseStyleInParens() {
+            const node = this.create(nodes.Node);
+            if (this.accept(cssScanner_1.TokenType.ParenthesisL)) {
+                node.addChild(this._parseStyleQuery());
+                if (!this.accept(cssScanner_1.TokenType.ParenthesisR)) {
+                    return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected, [], [cssScanner_1.TokenType.CurlyL]);
+                }
+            }
+            else {
+                return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected, [], [cssScanner_1.TokenType.CurlyL]);
+            }
+            return this.finish(node);
+        }
         // https://www.w3.org/TR/css-syntax-3/#consume-an-at-rule
         _parseUnknownAtRule() {
             if (!this.peek(cssScanner_1.TokenType.AtKeyword)) {
@@ -1573,6 +1679,7 @@
                 this.peek(cssScanner_1.TokenType.Angle) ||
                 this.peek(cssScanner_1.TokenType.Time) ||
                 this.peek(cssScanner_1.TokenType.Dimension) ||
+                this.peek(cssScanner_1.TokenType.ContainerQueryLength) ||
                 this.peek(cssScanner_1.TokenType.Freq)) {
                 const node = this.create(nodes.NumericValue);
                 this.consumeToken();

package/lib/umd/parser/cssScanner.js

@@ -59,6 +59,7 @@
         TokenType[TokenType["SingleLineComment"] = 40] = "SingleLineComment";
         TokenType[TokenType["EOF"] = 41] = "EOF";
         TokenType[TokenType["CustomToken"] = 42] = "CustomToken";
+        TokenType[TokenType["ContainerQueryLength"] = 43] = "ContainerQueryLength";
     })(TokenType || (exports.TokenType = TokenType = {}));
     class MultiLineStream {
         constructor(source) {
@@ -196,6 +197,12 @@
     staticUnitTable['fr'] = TokenType.Percentage;
     staticUnitTable['dpi'] = TokenType.Resolution;
     staticUnitTable['dpcm'] = TokenType.Resolution;
+    staticUnitTable['cqw'] = TokenType.ContainerQueryLength;
+    staticUnitTable['cqh'] = TokenType.ContainerQueryLength;
+    staticUnitTable['cqi'] = TokenType.ContainerQueryLength;
+    staticUnitTable['cqb'] = TokenType.ContainerQueryLength;
+    staticUnitTable['cqmin'] = TokenType.ContainerQueryLength;
+    staticUnitTable['cqmax'] = TokenType.ContainerQueryLength;
     class Scanner {
         constructor() {
             this.stream = new MultiLineStream('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-css-languageservice",
-  "version": "6.2.8",
+  "version": "6.2.10",
   "description": "Language service for CSS, LESS and SCSS",
   "main": "./lib/umd/cssLanguageService.js",
   "typings": "./lib/umd/cssLanguageService",
@@ -15,23 +15,23 @@
     "url": "https://github.com/Microsoft/vscode-css-languageservice"
   },
   "devDependencies": {
-    "@types/mocha": "^10.0.1",
+    "@types/mocha": "^10.0.2",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.3",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
     "@vscode/web-custom-data": "^0.4.8",
     "eslint": "^8.50.0",
     "js-beautify": "^1.14.9",
     "mocha": "^10.2.0",
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.5",
     "source-map-support": "^0.5.21",
     "typescript": "^5.2.2"
   },
   "dependencies": {
     "@vscode/l10n": "^0.0.16",
-    "vscode-languageserver-textdocument": "^1.0.8",
-    "vscode-languageserver-types": "^3.17.4",
-    "vscode-uri": "^3.0.7"
+    "vscode-languageserver-textdocument": "^1.0.11",
+    "vscode-languageserver-types": "3.17.5",
+    "vscode-uri": "^3.0.8"
   },
   "scripts": {
     "prepack": "npm run clean && npm run compile-esm && npm run test && npm run remove-sourcemap-refs",