vscode-css-languageservice - npm Package Compare versions

Comparing version 3.0.9-next.18 to 3.0.9-next.19

lib/esm/parser/cssNodes.js

@@ -94,2 +94,3 @@ /*---------------------------------------------------------------------------------------------
     NodeType[NodeType["Plugin"] = 71] = "Plugin";
+    NodeType[NodeType["UnknownAtRule"] = 72] = "UnknownAtRule";
 })(NodeType || (NodeType = {}));
@@ -1467,2 +1468,23 @@ export var ReferenceType;
 export { MixinDeclaration };
+var UnknownAtRule = /** @class */ (function (_super) {
+    __extends(UnknownAtRule, _super);
+    function UnknownAtRule(offset, length) {
+        return _super.call(this, offset, length) || this;
+    }
+    Object.defineProperty(UnknownAtRule.prototype, "type", {
+        get: function () {
+            return NodeType.UnknownAtRule;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    UnknownAtRule.prototype.setAtRuleName = function (atRuleName) {
+        this.atRuleName = atRuleName;
+    };
+    UnknownAtRule.prototype.getAtRuleName = function (atRuleName) {
+        return this.atRuleName;
+    };
+    return UnknownAtRule;
+}(BodyDeclaration));
+export { UnknownAtRule };
 var ListEntry = /** @class */ (function (_super) {
@@ -1469,0 +1491,0 @@ __extends(ListEntry, _super);

lib/esm/parser/cssParser.js

@@ -236,14 +236,18 @@ /*---------------------------------------------------------------------------------------------
         if (this.peek(TokenType.AtKeyword)) {
-            return this._parseImport()
-                || this._parseMedia()
-                || this._parsePage()
-                || this._parseFontFace()
-                || this._parseKeyframe()
-                || this._parseSupports()
-                || this._parseViewPort()
-                || this._parseNamespace()
-                || this._parseDocument();
+            return this._parseStylesheetAtStatement();
         }
         return this._parseRuleset(false);
     };
+    Parser.prototype._parseStylesheetAtStatement = function () {
+        return this._parseImport()
+            || this._parseMedia()
+            || this._parsePage()
+            || this._parseFontFace()
+            || this._parseKeyframe()
+            || this._parseSupports()
+            || this._parseViewPort()
+            || this._parseNamespace()
+            || this._parseDocument()
+            || this._parseUnknownAtRule();
+    };
     Parser.prototype._tryParseRuleset = function (isNested) {
@@ -875,2 +879,74 @@ var mark = this.mark();
     };
+    // https://www.w3.org/TR/css-syntax-3/#consume-an-at-rule
+    Parser.prototype._parseUnknownAtRule = function () {
+        var node = this.create(nodes.UnknownAtRule);
+        node.addChild(this._parseUnknownAtRuleName());
+        var isTopLevel = function () { return curlyDepth === 0 && parensDepth === 0 && bracketsDepth === 0; };
+        var curlyDepth = 0;
+        var parensDepth = 0;
+        var bracketsDepth = 0;
+        done: while (true) {
+            switch (this.token.type) {
+                case TokenType.SemiColon:
+                    if (isTopLevel()) {
+                        break done;
+                    }
+                    break;
+                case TokenType.EOF:
+                    if (curlyDepth > 0) {
+                        return this.finish(node, ParseError.RightCurlyExpected);
+                    }
+                    else if (bracketsDepth > 0) {
+                        return this.finish(node, ParseError.RightSquareBracketExpected);
+                    }
+                    else if (parensDepth > 0) {
+                        return this.finish(node, ParseError.RightParenthesisExpected);
+                    }
+                    else {
+                        return this.finish(node);
+                    }
+                case TokenType.CurlyL:
+                    curlyDepth++;
+                    break;
+                case TokenType.CurlyR:
+                    curlyDepth--;
+                    if (curlyDepth < 0) {
+                        // The property value has been terminated without a semicolon, and
+                        // this is the last declaration in the ruleset.
+                        if (parensDepth === 0 && bracketsDepth === 0) {
+                            break done;
+                        }
+                        return this.finish(node, ParseError.LeftCurlyExpected);
+                    }
+                    break;
+                case TokenType.ParenthesisL:
+                    parensDepth++;
+                    break;
+                case TokenType.ParenthesisR:
+                    parensDepth--;
+                    if (parensDepth < 0) {
+                        return this.finish(node, ParseError.LeftParenthesisExpected);
+                    }
+                    break;
+                case TokenType.BracketL:
+                    bracketsDepth++;
+                    break;
+                case TokenType.BracketR:
+                    bracketsDepth--;
+                    if (bracketsDepth < 0) {
+                        return this.finish(node, ParseError.LeftSquareBracketExpected);
+                    }
+                    break;
+            }
+            this.consumeToken();
+        }
+        return node;
+    };
+    Parser.prototype._parseUnknownAtRuleName = function () {
+        var node = this.create(nodes.Node);
+        if (this.accept(TokenType.AtKeyword)) {
+            return this.finish(node);
+        }
+        return node;
+    };
     Parser.prototype._parseOperator = function () {
@@ -877,0 +953,0 @@ // these are operators for binary expressions

lib/esm/parser/lessParser.js

@@ -31,7 +31,10 @@ /*---------------------------------------------------------------------------------------------
     LESSParser.prototype._parseStylesheetStatement = function () {
+        if (this.peek(TokenType.AtKeyword)) {
+            return this._parseVariableDeclaration()
+                || this._parsePlugin()
+                || _super.prototype._parseStylesheetAtStatement.call(this);
+        }
         return this._tryParseMixinDeclaration()
             || this._tryParseMixinReference(true)
-            || _super.prototype._parseStylesheetStatement.call(this)
-            || this._parseVariableDeclaration()
-            || this._parsePlugin();
+            || this._parseRuleset(true);
     };
@@ -38,0 +41,0 @@ LESSParser.prototype._parseImport = function () {

lib/esm/parser/scssParser.js

@@ -32,6 +32,2 @@ /*---------------------------------------------------------------------------------------------
     SCSSParser.prototype._parseStylesheetStatement = function () {
-        var node = _super.prototype._parseStylesheetStatement.call(this);
-        if (node) {
-            return node;
-        }
         if (this.peek(TokenType.AtKeyword)) {
@@ -43,5 +39,6 @@ return this._parseWarnAndDebug()
                 || this._parseMixinReference() // @include
-                || this._parseFunctionDeclaration();
+                || this._parseFunctionDeclaration()
+                || _super.prototype._parseStylesheetAtStatement.call(this);
         }
-        return this._parseVariableDeclaration();
+        return this._parseRuleset(true) || this._parseVariableDeclaration();
     };
@@ -48,0 +45,0 @@ SCSSParser.prototype._parseImport = function () {

lib/esm/services/lint.js

@@ -115,2 +115,4 @@ /*---------------------------------------------------------------------------------------------
         switch (node.type) {
+            case nodes.NodeType.UnknownAtRule:
+                return this.visitUnknownAtRule(node);
             case nodes.NodeType.Keyframe:
@@ -140,2 +142,10 @@ return this.visitKeyframe(node);
     };
+    LintVisitor.prototype.visitUnknownAtRule = function (node) {
+        var atRuleName = node.getChild(0);
+        if (!atRuleName) {
+            return false;
+        }
+        this.addEntry(atRuleName, Rules.UnknownAtRules, "Unknown at rule " + atRuleName.getText());
+        return true;
+    };
     LintVisitor.prototype.visitKeyframe = function (node) {
@@ -142,0 +152,0 @@ var keyword = node.getKeyword();

lib/esm/services/lintRules.js

@@ -35,2 +35,3 @@ /*---------------------------------------------------------------------------------------------
     UnknownProperty: new Rule('unknownProperties', localize('rule.unknownProperty', "Unknown property."), Warning),
+    UnknownAtRules: new Rule('unknownAtRules', localize('rule.unknownAtRules', "Unknown at-rule."), Warning),
     IEStarHack: new Rule('ieHack', localize('rule.ieHack', "IE hacks are only necessary when supporting IE7 and older"), Ignore),
@@ -37,0 +38,0 @@ UnknownVendorSpecificProperty: new Rule('unknownVendorSpecificProperties', localize('rule.unknownVendorSpecificProperty', "Unknown vendor specific property."), Ignore),

lib/umd/parser/lessParser.js

@@ -41,7 +41,10 @@ var __extends = (this && this.__extends) || (function () {
         LESSParser.prototype._parseStylesheetStatement = function () {
+            if (this.peek(cssScanner_1.TokenType.AtKeyword)) {
+                return this._parseVariableDeclaration()
+                    || this._parsePlugin()
+                    || _super.prototype._parseStylesheetAtStatement.call(this);
+            }
             return this._tryParseMixinDeclaration()
                 || this._tryParseMixinReference(true)
-                || _super.prototype._parseStylesheetStatement.call(this)
-                || this._parseVariableDeclaration()
-                || this._parsePlugin();
+                || this._parseRuleset(true);
         };
@@ -48,0 +51,0 @@ LESSParser.prototype._parseImport = function () {

lib/umd/parser/scssParser.js

@@ -42,6 +42,2 @@ var __extends = (this && this.__extends) || (function () {
         SCSSParser.prototype._parseStylesheetStatement = function () {
-            var node = _super.prototype._parseStylesheetStatement.call(this);
-            if (node) {
-                return node;
-            }
             if (this.peek(cssScanner_1.TokenType.AtKeyword)) {
@@ -53,5 +49,6 @@ return this._parseWarnAndDebug()
                     || this._parseMixinReference() // @include
-                    || this._parseFunctionDeclaration();
+                    || this._parseFunctionDeclaration()
+                    || _super.prototype._parseStylesheetAtStatement.call(this);
             }
-            return this._parseVariableDeclaration();
+            return this._parseRuleset(true) || this._parseVariableDeclaration();
         };
@@ -58,0 +55,0 @@ SCSSParser.prototype._parseImport = function () {

lib/umd/services/lint.js

@@ -125,2 +125,4 @@ (function (factory) {
             switch (node.type) {
+                case nodes.NodeType.UnknownAtRule:
+                    return this.visitUnknownAtRule(node);
                 case nodes.NodeType.Keyframe:
@@ -150,2 +152,10 @@ return this.visitKeyframe(node);
         };
+        LintVisitor.prototype.visitUnknownAtRule = function (node) {
+            var atRuleName = node.getChild(0);
+            if (!atRuleName) {
+                return false;
+            }
+            this.addEntry(atRuleName, lintRules_1.Rules.UnknownAtRules, "Unknown at rule " + atRuleName.getText());
+            return true;
+        };
         LintVisitor.prototype.visitKeyframe = function (node) {
@@ -152,0 +162,0 @@ var keyword = node.getKeyword();

lib/umd/services/lintRules.js

@@ -45,2 +45,3 @@ (function (factory) {
         UnknownProperty: new Rule('unknownProperties', localize('rule.unknownProperty', "Unknown property."), Warning),
+        UnknownAtRules: new Rule('unknownAtRules', localize('rule.unknownAtRules', "Unknown at-rule."), Warning),
         IEStarHack: new Rule('ieHack', localize('rule.ieHack', "IE hacks are only necessary when supporting IE7 and older"), Ignore),
@@ -47,0 +48,0 @@ UnknownVendorSpecificProperty: new Rule('unknownVendorSpecificProperties', localize('rule.unknownVendorSpecificProperty', "Unknown vendor specific property."), Ignore),

package.json

 {
   "name": "vscode-css-languageservice",
-  "version": "3.0.9-next.18",
+  "version": "3.0.9-next.19",
   "description": "Language service for CSS, LESS and SCSS",
@@ -21,2 +21,3 @@ "main": "./lib/umd/cssLanguageService.js",
     "istanbul": "^0.4.5",
+    "mdn-browser-compat-data": "^0.0.38",
     "mdn-data": "^1.1.2",
@@ -23,0 +24,0 @@ "mkdirp": "^0.5.1",

No alert changes

Improved metrics

Total package byte prevSize

2131659

1.26%

Lines of code

46503

1.36%

Worsened metrics

Dev dependency count

11

10%

No dependency changes