vscode-css-languageservice 6.2.11 → 6.2.13

package/lib/umd/parser/lessParser.js

@@ -285,6 +285,7 @@
                     || this._parseSupports(true) // @supports
                     || this._parseLayer() // @layer
                     || this._parsePropertyAtRule() // @property
+                    || this._parseContainer() // @container
                     || this._parseDetachedRuleSetMixin() // less detached ruleset mixin
                     || this._parseVariableDeclaration() // Variable declarations
                     || this._parseRuleSetDeclarationAtStatement();
@@ -654,7 +655,6 @@
             }
             const node = this.create(nodes.LessGuard);
             this.consumeToken(); // when
-            node.isNegated = this.acceptIdent('not');
             if (!node.getConditions().addChild(this._parseGuardCondition())) {
                 return this.finish(node, cssErrors_1.ParseError.ConditionExpected);
             }
@@ -666,11 +666,14 @@
             return this.finish(node);
         }
         _parseGuardCondition() {
-            if (!this.peek(cssScanner_1.TokenType.ParenthesisL)) {
+            const node = this.create(nodes.GuardCondition);
+            node.isNegated = this.acceptIdent('not');
+            if (!this.accept(cssScanner_1.TokenType.ParenthesisL)) {
+                if (node.isNegated) {
+                    return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected);
+                }
                 return null;
             }
-            const node = this.create(nodes.GuardCondition);
-            this.consumeToken(); // ParenthesisL
             if (!node.addChild(this._parseExpr())) {
                 // empty (?)
             }

package/lib/umd/parser/scssParser.js

@@ -230,6 +230,7 @@
                     || this._parseSupports(true) // @supports
                     || this._parseLayer() // @layer
                     || this._parsePropertyAtRule() // @property
+                    || this._parseContainer() // @container
                     || this._parseRuleSetDeclarationAtStatement();
             }
             return this._parseVariableDeclaration() // variable declaration
@@ -812,7 +813,7 @@
                 // Consume all variables and idents ahead.
                 this.accept(cssScanner_1.TokenType.Comma);
             }
-            // More than just identifier 
+            // More than just identifier
             return node.getChildren().length > 1 ? node : null;
         }
         _parseSupportsCondition() {

package/lib/umd/services/cssHover.js

@@ -40,12 +40,21 @@
              * Build up the hover by appending inner node's information
              */
             let hover = null;
+            let flagOpts;
             for (let i = 0; i < nodepath.length; i++) {
                 const node = nodepath[i];
+                if (node instanceof nodes.Media) {
+                    const regex = /@media[^\{]+/g;
+                    const matches = node.getText().match(regex);
+                    flagOpts = {
+                        isMedia: true,
+                        text: matches?.[0],
+                    };
+                }
                 if (node instanceof nodes.Selector) {
                     hover = {
-                        contents: this.selectorPrinting.selectorToMarkedString(node),
-                        range: getRange(node)
+                        contents: this.selectorPrinting.selectorToMarkedString(node, flagOpts),
+                        range: getRange(node),
                     };
                     break;
                 }
@@ -56,7 +65,7 @@
                     if (!(0, strings_1.startsWith)(node.getText(), '@')) {
                         hover = {
                             contents: this.selectorPrinting.simpleSelectorToMarkedString(node),
-                            range: getRange(node)
+                            range: getRange(node),
                         };
                     }
                     break;
@@ -69,7 +78,7 @@
                         if (contents) {
                             hover = {
                                 contents,
-                                range: getRange(node)
+                                range: getRange(node),
                             };
                         }
                         else {
@@ -86,7 +95,7 @@
                         if (contents) {
                             hover = {
                                 contents,
-                                range: getRange(node)
+                                range: getRange(node),
                             };
                         }
                         else {
@@ -97,15 +106,13 @@
                 }
                 if (node instanceof nodes.Node && node.type === nodes.NodeType.PseudoSelector) {
                     const selectorName = node.getText();
-                    const entry = selectorName.slice(0, 2) === '::'
-                        ? this.cssDataManager.getPseudoElement(selectorName)
-                        : this.cssDataManager.getPseudoClass(selectorName);
+                    const entry = selectorName.slice(0, 2) === '::' ? this.cssDataManager.getPseudoElement(selectorName) : this.cssDataManager.getPseudoClass(selectorName);
                     if (entry) {
                         const contents = languageFacts.getEntryDescription(entry, this.doesSupportMarkdown(), settings);
                         if (contents) {
                             hover = {
                                 contents,
-                                range: getRange(node)
+                                range: getRange(node),
                             };
                         }
                         else {
@@ -129,12 +136,12 @@
                 else if ('kind' in contents) {
                     return {
                         kind: 'plaintext',
-                        value: contents.value
+                        value: contents.value,
                     };
                 }
                 // MarkedString[]
                 else if (Array.isArray(contents)) {
-                    return contents.map(c => {
+                    return contents.map((c) => {
                         return typeof c === 'string' ? c : c.value;
                     });
                 }

package/lib/umd/services/selectorPrinting.js

@@ -126,7 +126,7 @@
             this.result = [];
             // empty
         }
-        print(element) {
+        print(element, flagOpts) {
             this.result = [];
             if (element instanceof RootElement) {
                 if (element.children) {
@@ -136,7 +136,13 @@
             else {
                 this.doPrint([element], 0);
             }
-            const value = this.result.join('\n');
+            let value;
+            if (flagOpts) {
+                value = `${flagOpts.text}\n … ` + this.result.join('\n');
+            }
+            else {
+                value = this.result.join('\n');
+            }
             return [{ language: 'html', value }];
         }
         doPrint(elements, indent) {
@@ -313,10 +319,10 @@
         constructor(cssDataManager) {
             this.cssDataManager = cssDataManager;
         }
-        selectorToMarkedString(node) {
+        selectorToMarkedString(node, flagOpts) {
             const root = selectorToElement(node);
             if (root) {
-                const markedStrings = new MarkedStringPrinter('"').print(root);
+                const markedStrings = new MarkedStringPrinter('"').print(root, flagOpts);
                 markedStrings.push(this.selectorToSpecificityMarkedString(node));
                 return markedStrings;
             }
@@ -335,7 +341,7 @@
             if (!match) {
                 return false;
             }
-            return !!this.cssDataManager.getPseudoElement("::" + match[1]);
+            return !!this.cssDataManager.getPseudoElement('::' + match[1]);
         }
         selectorToSpecificityMarkedString(node) {
             const calculateMostSpecificListItem = (childElements) => {
@@ -383,7 +389,7 @@
                             break;
                         case nodes.NodeType.ElementNameSelector:
                             //ignore universal selector
-                            if (element.matches("*")) {
+                            if (element.matches('*')) {
                                 break;
                             }
                             specificity.tag++;
@@ -432,7 +438,7 @@
                                 /* The specificity of the :nth-child(An+B [of S]?) pseudo-class is the specificity of a single pseudo-class plus, if S is specified, the specificity of the most specific complex selector in S */
                                 // https://www.w3.org/TR/selectors-4/#the-nth-child-pseudo
                                 specificity.attr++;
-                                // 23 = Binary Expression. 
+                                // 23 = Binary Expression.
                                 if (childElements.length === 3 && childElements[1].type === 23) {
                                     let mostSpecificListItem = calculateMostSpecificListItem(childElements[2].getChildren());
                                     specificity.id += mostSpecificListItem.id;
@@ -446,7 +452,7 @@
                                 parser.scanner.setSource(pseudoSelectorText);
                                 const firstToken = parser.scanner.scan();
                                 const secondToken = parser.scanner.scan();
-                                if (firstToken.text === 'n' || firstToken.text === '-n' && secondToken.text === 'of') {
+                                if (firstToken.text === 'n' || (firstToken.text === '-n' && secondToken.text === 'of')) {
                                     const complexSelectorListNodes = [];
                                     const complexSelectorText = pseudoSelectorText.slice(secondToken.offset + 2);
                                     const complexSelectorArray = complexSelectorText.split(',');
@@ -477,7 +483,7 @@
                 return specificity;
             };
             const specificity = calculateScore(node);
-            return `[${l10n.t("Selector Specificity")}](https://developer.mozilla.org/docs/Web/CSS/Specificity): (${specificity.id}, ${specificity.attr}, ${specificity.tag})`;
+            return `[${l10n.t('Selector Specificity')}](https://developer.mozilla.org/docs/Web/CSS/Specificity): (${specificity.id}, ${specificity.attr}, ${specificity.tag})`;
         }
     }
     exports.SelectorPrinting = SelectorPrinting;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-css-languageservice",
-  "version": "6.2.11",
+  "version": "6.2.13",
   "description": "Language service for CSS, LESS and SCSS",
   "main": "./lib/umd/cssLanguageService.js",
   "typings": "./lib/umd/cssLanguageService",
@@ -17,18 +17,18 @@
   "devDependencies": {
     "@types/mocha": "^10.0.6",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^6.13.0",
-    "@typescript-eslint/parser": "^6.13.0",
-    "@vscode/web-custom-data": "^0.4.8",
-    "eslint": "^8.54.0",
-    "js-beautify": "^1.14.11",
-    "mocha": "^10.2.0",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "@vscode/web-custom-data": "^0.4.9",
+    "eslint": "^8.57.0",
+    "js-beautify": "^1.15.1",
+    "mocha": "^10.3.0",
     "rimraf": "^5.0.5",
     "source-map-support": "^0.5.21",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@vscode/l10n": "^0.0.16",
+    "@vscode/l10n": "^0.0.18",
     "vscode-languageserver-textdocument": "^1.0.11",
     "vscode-languageserver-types": "3.17.5",
     "vscode-uri": "^3.0.8"