vscode-css-languageservice 6.2.12 → 6.2.14

package/lib/esm/beautify/beautify-css.js

@@ -1,5 +1,5 @@
 // copied from js-beautify/js/lib/beautify-css.js
-// version: 1.14.11
+// version: 1.15.1
 /* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
@@ -570,10 +570,10 @@ function Options(options, merge_child_field) {
 
   this.indent_empty_lines = this._get_boolean('indent_empty_lines');
 
-  // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty']
-  // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
+  // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
+  // For now, 'auto' = all off for javascript, all except angular on for html (and inline javascript/css).
   // other values ignored
-  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'angular', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
 }
 
 Options.prototype._get_array = function(name, default_value) {

package/lib/esm/parser/cssParser.js

@@ -276,7 +276,7 @@ export class Parser {
             || this._parseViewPort()
             || this._parseNamespace()
             || this._parseDocument()
-            || this._parseContainer()
+            || this._parseContainer(isNested)
             || this._parseUnknownAtRule();
     }
     _tryParseRuleset(isNested) {
@@ -310,6 +310,7 @@ export class Parser {
         return this._parseMedia(true)
             || this._parseSupports(true)
             || this._parseLayer(true)
+            || this._parseContainer(true)
             || this._parseUnknownAtRule();
     }
     _parseRuleSetDeclaration() {
@@ -1137,7 +1138,14 @@ export class Parser {
         this.resync([], [TokenType.CurlyL]); // ignore all the rules
         return this._parseBody(node, this._parseStylesheetStatement.bind(this));
     }
-    _parseContainer() {
+    _parseContainerDeclaration(isNested = false) {
+        if (isNested) {
+            // if nested, the body can contain rulesets, but also declarations
+            return this._tryParseRuleset(true) || this._tryToParseDeclaration() || this._parseStylesheetStatement(true);
+        }
+        return this._parseStylesheetStatement(false);
+    }
+    _parseContainer(isNested = false) {
         if (!this.peekKeyword('@container')) {
             return null;
         }
@@ -1145,7 +1153,7 @@ export class Parser {
         this.consumeToken(); // @container
         node.addChild(this._parseIdent()); // optional container name
         node.addChild(this._parseContainerQuery());
-        return this._parseBody(node, this._parseStylesheetStatement.bind(this));
+        return this._parseBody(node, this._parseContainerDeclaration.bind(this, isNested));
     }
     _parseContainerQuery() {
         // <container-query>     = not <query-in-parens>

package/lib/esm/parser/lessParser.js

@@ -274,6 +274,7 @@ export class LESSParser extends cssParser.Parser {
                 || this._parseSupports(true) // @supports
                 || this._parseLayer() // @layer
                 || this._parsePropertyAtRule() // @property
+                || this._parseContainer(true) // @container
                 || this._parseDetachedRuleSetMixin() // less detached ruleset mixin
                 || this._parseVariableDeclaration() // Variable declarations
                 || this._parseRuleSetDeclarationAtStatement();

package/lib/esm/parser/scssParser.js

@@ -219,6 +219,7 @@ export class SCSSParser extends cssParser.Parser {
                 || this._parseSupports(true) // @supports
                 || this._parseLayer() // @layer
                 || this._parsePropertyAtRule() // @property
+                || this._parseContainer(true) // nested @container
                 || this._parseRuleSetDeclarationAtStatement();
         }
         return this._parseVariableDeclaration() // variable declaration
@@ -801,7 +802,7 @@ export class SCSSParser extends cssParser.Parser {
             // Consume all variables and idents ahead.
             this.accept(TokenType.Comma);
         }
-        // More than just identifier 
+        // More than just identifier
         return node.getChildren().length > 1 ? node : null;
     }
     _parseSupportsCondition() {

package/lib/esm/services/cssHover.js

@@ -29,12 +29,21 @@ export class CSSHover {
          * 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;
             }
@@ -45,7 +54,7 @@ export class CSSHover {
                 if (!startsWith(node.getText(), '@')) {
                     hover = {
                         contents: this.selectorPrinting.simpleSelectorToMarkedString(node),
-                        range: getRange(node)
+                        range: getRange(node),
                     };
                 }
                 break;
@@ -58,7 +67,7 @@ export class CSSHover {
                     if (contents) {
                         hover = {
                             contents,
-                            range: getRange(node)
+                            range: getRange(node),
                         };
                     }
                     else {
@@ -75,7 +84,7 @@ export class CSSHover {
                     if (contents) {
                         hover = {
                             contents,
-                            range: getRange(node)
+                            range: getRange(node),
                         };
                     }
                     else {
@@ -86,15 +95,13 @@ export class CSSHover {
             }
             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 {
@@ -118,12 +125,12 @@ export class CSSHover {
             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/esm/services/selectorPrinting.js

@@ -112,7 +112,7 @@ class MarkedStringPrinter {
         this.result = [];
         // empty
     }
-    print(element) {
+    print(element, flagOpts) {
         this.result = [];
         if (element instanceof RootElement) {
             if (element.children) {
@@ -122,7 +122,13 @@ class MarkedStringPrinter {
         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) {
@@ -298,10 +304,10 @@ export class SelectorPrinting {
     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;
         }
@@ -320,7 +326,7 @@ export class SelectorPrinting {
         if (!match) {
             return false;
         }
-        return !!this.cssDataManager.getPseudoElement("::" + match[1]);
+        return !!this.cssDataManager.getPseudoElement('::' + match[1]);
     }
     selectorToSpecificityMarkedString(node) {
         const calculateMostSpecificListItem = (childElements) => {
@@ -368,7 +374,7 @@ export class SelectorPrinting {
                         break;
                     case nodes.NodeType.ElementNameSelector:
                         //ignore universal selector
-                        if (element.matches("*")) {
+                        if (element.matches('*')) {
                             break;
                         }
                         specificity.tag++;
@@ -417,7 +423,7 @@ export class SelectorPrinting {
                             /* 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;
@@ -431,7 +437,7 @@ export class SelectorPrinting {
                             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(',');
@@ -462,7 +468,7 @@ export class SelectorPrinting {
             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})`;
     }
 }
 class SelectorElementBuilder {

package/lib/umd/beautify/beautify-css.js

@@ -1,5 +1,5 @@
 // copied from js-beautify/js/lib/beautify-css.js
-// version: 1.14.11
+// version: 1.15.1
 /* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
@@ -573,10 +573,10 @@ function Options(options, merge_child_field) {
 
   this.indent_empty_lines = this._get_boolean('indent_empty_lines');
 
-  // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty']
-  // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
+  // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
+  // For now, 'auto' = all off for javascript, all except angular on for html (and inline javascript/css).
   // other values ignored
-  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'angular', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
 }
 
 Options.prototype._get_array = function(name, default_value) {

package/lib/umd/parser/cssParser.js

@@ -287,7 +287,7 @@
                 || this._parseViewPort()
                 || this._parseNamespace()
                 || this._parseDocument()
-                || this._parseContainer()
+                || this._parseContainer(isNested)
                 || this._parseUnknownAtRule();
         }
         _tryParseRuleset(isNested) {
@@ -321,6 +321,7 @@
             return this._parseMedia(true)
                 || this._parseSupports(true)
                 || this._parseLayer(true)
+                || this._parseContainer(true)
                 || this._parseUnknownAtRule();
         }
         _parseRuleSetDeclaration() {
@@ -1148,7 +1149,14 @@
             this.resync([], [cssScanner_1.TokenType.CurlyL]); // ignore all the rules
             return this._parseBody(node, this._parseStylesheetStatement.bind(this));
         }
-        _parseContainer() {
+        _parseContainerDeclaration(isNested = false) {
+            if (isNested) {
+                // if nested, the body can contain rulesets, but also declarations
+                return this._tryParseRuleset(true) || this._tryToParseDeclaration() || this._parseStylesheetStatement(true);
+            }
+            return this._parseStylesheetStatement(false);
+        }
+        _parseContainer(isNested = false) {
             if (!this.peekKeyword('@container')) {
                 return null;
             }
@@ -1156,7 +1164,7 @@
             this.consumeToken(); // @container
             node.addChild(this._parseIdent()); // optional container name
             node.addChild(this._parseContainerQuery());
-            return this._parseBody(node, this._parseStylesheetStatement.bind(this));
+            return this._parseBody(node, this._parseContainerDeclaration.bind(this, isNested));
         }
         _parseContainerQuery() {
             // <container-query>     = not <query-in-parens>

package/lib/umd/parser/lessParser.js

@@ -285,6 +285,7 @@
                     || this._parseSupports(true) // @supports
                     || this._parseLayer() // @layer
                     || this._parsePropertyAtRule() // @property
+                    || this._parseContainer(true) // @container
                     || this._parseDetachedRuleSetMixin() // less detached ruleset mixin
                     || this._parseVariableDeclaration() // Variable declarations
                     || this._parseRuleSetDeclarationAtStatement();

package/lib/umd/parser/scssParser.js

@@ -230,6 +230,7 @@
                     || this._parseSupports(true) // @supports
                     || this._parseLayer() // @layer
                     || this._parsePropertyAtRule() // @property
+                    || this._parseContainer(true) // nested @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.12",
+  "version": "6.2.14",
   "description": "Language service for CSS, LESS and SCSS",
   "main": "./lib/umd/cssLanguageService.js",
   "typings": "./lib/umd/cssLanguageService",
@@ -17,15 +17,15 @@
   "devDependencies": {
     "@types/mocha": "^10.0.6",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
-    "@typescript-eslint/parser": "^6.19.1",
+    "@typescript-eslint/eslint-plugin": "^7.7.0",
+    "@typescript-eslint/parser": "^7.7.0",
     "@vscode/web-custom-data": "^0.4.9",
-    "eslint": "^8.56.0",
-    "js-beautify": "^1.14.11",
-    "mocha": "^10.2.0",
+    "eslint": "^8.57.0",
+    "js-beautify": "^1.15.1",
+    "mocha": "^10.4.0",
     "rimraf": "^5.0.5",
     "source-map-support": "^0.5.21",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "@vscode/l10n": "^0.0.18",