vscode-css-languageservice 5.4.2 → 6.1.0

package/lib/umd/services/selectorPrinting.js

@@ -1,18 +1,3 @@
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -29,28 +14,27 @@ var __extends = (this && this.__extends) || (function () {
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.selectorToElement = exports.SelectorPrinting = exports.toElement = exports.LabelElement = exports.RootElement = exports.Element = void 0;
-    var nodes = require("../parser/cssNodes");
-    var cssScanner_1 = require("../parser/cssScanner");
-    var nls = require("vscode-nls");
-    var localize = nls.loadMessageBundle();
-    var Element = /** @class */ (function () {
-        function Element() {
+    const nodes = require("../parser/cssNodes");
+    const cssScanner_1 = require("../parser/cssScanner");
+    const nls = require("vscode-nls");
+    const localize = nls.loadMessageBundle();
+    class Element {
+        constructor() {
             this.parent = null;
             this.children = null;
             this.attributes = null;
         }
-        Element.prototype.findAttribute = function (name) {
+        findAttribute(name) {
             if (this.attributes) {
-                for (var _i = 0, _a = this.attributes; _i < _a.length; _i++) {
-                    var attribute = _a[_i];
+                for (const attribute of this.attributes) {
                     if (attribute.name === name) {
                         return attribute.value;
                     }
                 }
             }
             return null;
-        };
-        Element.prototype.addChild = function (child) {
+        }
+        addChild(child) {
             if (child instanceof Element) {
                 child.parent = this;
             }
@@ -58,103 +42,91 @@ var __extends = (this && this.__extends) || (function () {
                 this.children = [];
             }
             this.children.push(child);
-        };
-        Element.prototype.append = function (text) {
+        }
+        append(text) {
             if (this.attributes) {
-                var last = this.attributes[this.attributes.length - 1];
+                const last = this.attributes[this.attributes.length - 1];
                 last.value = last.value + text;
             }
-        };
-        Element.prototype.prepend = function (text) {
+        }
+        prepend(text) {
             if (this.attributes) {
-                var first = this.attributes[0];
+                const first = this.attributes[0];
                 first.value = text + first.value;
             }
-        };
-        Element.prototype.findRoot = function () {
-            var curr = this;
+        }
+        findRoot() {
+            let curr = this;
             while (curr.parent && !(curr.parent instanceof RootElement)) {
                 curr = curr.parent;
             }
             return curr;
-        };
-        Element.prototype.removeChild = function (child) {
+        }
+        removeChild(child) {
             if (this.children) {
-                var index = this.children.indexOf(child);
+                const index = this.children.indexOf(child);
                 if (index !== -1) {
                     this.children.splice(index, 1);
                     return true;
                 }
             }
             return false;
-        };
-        Element.prototype.addAttr = function (name, value) {
+        }
+        addAttr(name, value) {
             if (!this.attributes) {
                 this.attributes = [];
             }
-            for (var _i = 0, _a = this.attributes; _i < _a.length; _i++) {
-                var attribute = _a[_i];
+            for (const attribute of this.attributes) {
                 if (attribute.name === name) {
                     attribute.value += ' ' + value;
                     return;
                 }
             }
-            this.attributes.push({ name: name, value: value });
-        };
-        Element.prototype.clone = function (cloneChildren) {
-            if (cloneChildren === void 0) { cloneChildren = true; }
-            var elem = new Element();
+            this.attributes.push({ name, value });
+        }
+        clone(cloneChildren = true) {
+            const elem = new Element();
             if (this.attributes) {
                 elem.attributes = [];
-                for (var _i = 0, _a = this.attributes; _i < _a.length; _i++) {
-                    var attribute = _a[_i];
+                for (const attribute of this.attributes) {
                     elem.addAttr(attribute.name, attribute.value);
                 }
             }
             if (cloneChildren && this.children) {
                 elem.children = [];
-                for (var index = 0; index < this.children.length; index++) {
+                for (let index = 0; index < this.children.length; index++) {
                     elem.addChild(this.children[index].clone());
                 }
             }
             return elem;
-        };
-        Element.prototype.cloneWithParent = function () {
-            var clone = this.clone(false);
+        }
+        cloneWithParent() {
+            const clone = this.clone(false);
             if (this.parent && !(this.parent instanceof RootElement)) {
-                var parentClone = this.parent.cloneWithParent();
+                const parentClone = this.parent.cloneWithParent();
                 parentClone.addChild(clone);
             }
             return clone;
-        };
-        return Element;
-    }());
-    exports.Element = Element;
-    var RootElement = /** @class */ (function (_super) {
-        __extends(RootElement, _super);
-        function RootElement() {
-            return _super !== null && _super.apply(this, arguments) || this;
         }
-        return RootElement;
-    }(Element));
+    }
+    exports.Element = Element;
+    class RootElement extends Element {
+    }
     exports.RootElement = RootElement;
-    var LabelElement = /** @class */ (function (_super) {
-        __extends(LabelElement, _super);
-        function LabelElement(label) {
-            var _this = _super.call(this) || this;
-            _this.addAttr('name', label);
-            return _this;
-        }
-        return LabelElement;
-    }(Element));
+    class LabelElement extends Element {
+        constructor(label) {
+            super();
+            this.addAttr('name', label);
+        }
+    }
     exports.LabelElement = LabelElement;
-    var MarkedStringPrinter = /** @class */ (function () {
-        function MarkedStringPrinter(quote) {
+    class MarkedStringPrinter {
+        constructor(quote) {
             this.quote = quote;
             this.result = [];
             // empty
         }
-        MarkedStringPrinter.prototype.print = function (element) {
+        print(element) {
             this.result = [];
             if (element instanceof RootElement) {
                 if (element.children) {
@@ -164,31 +136,30 @@ var __extends = (this && this.__extends) || (function () {
             else {
                 this.doPrint([element], 0);
             }
-            var value = this.result.join('\n');
-            return [{ language: 'html', value: value }];
-        };
-        MarkedStringPrinter.prototype.doPrint = function (elements, indent) {
-            for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
-                var element = elements_1[_i];
+            const value = this.result.join('\n');
+            return [{ language: 'html', value }];
+        }
+        doPrint(elements, indent) {
+            for (const element of elements) {
                 this.doPrintElement(element, indent);
                 if (element.children) {
                     this.doPrint(element.children, indent + 1);
                 }
             }
-        };
-        MarkedStringPrinter.prototype.writeLine = function (level, content) {
-            var indent = new Array(level + 1).join('  ');
+        }
+        writeLine(level, content) {
+            const indent = new Array(level + 1).join('  ');
             this.result.push(indent + content);
-        };
-        MarkedStringPrinter.prototype.doPrintElement = function (element, indent) {
-            var name = element.findAttribute('name');
+        }
+        doPrintElement(element, indent) {
+            const name = element.findAttribute('name');
             // special case: a simple label
             if (element instanceof LabelElement || name === '\u2026') {
                 this.writeLine(indent, name);
                 return;
             }
             // the real deal
-            var content = ['<'];
+            const content = ['<'];
             // element name
             if (name) {
                 content.push(name);
@@ -198,12 +169,11 @@ var __extends = (this && this.__extends) || (function () {
             }
             // attributes
             if (element.attributes) {
-                for (var _i = 0, _a = element.attributes; _i < _a.length; _i++) {
-                    var attr = _a[_i];
+                for (const attr of element.attributes) {
                     if (attr.name !== 'name') {
                         content.push(' ');
                         content.push(attr.name);
-                        var value = attr.value;
+                        const value = attr.value;
                         if (value) {
                             content.push('=');
                             content.push(quotes.ensure(value, this.quote));
@@ -213,9 +183,8 @@ var __extends = (this && this.__extends) || (function () {
             }
             content.push('>');
             this.writeLine(indent, content.join(''));
-        };
-        return MarkedStringPrinter;
-    }());
+        }
+    }
     var quotes;
     (function (quotes) {
         function ensure(value, which) {
@@ -223,7 +192,7 @@ var __extends = (this && this.__extends) || (function () {
         }
         quotes.ensure = ensure;
         function remove(value) {
-            var match = value.match(/^['"](.*)["']$/);
+            const match = value.match(/^['"](.*)["']$/);
             if (match) {
                 return match[1];
             }
@@ -231,8 +200,8 @@ var __extends = (this && this.__extends) || (function () {
         }
         quotes.remove = remove;
     })(quotes || (quotes = {}));
-    var Specificity = /** @class */ (function () {
-        function Specificity() {
+    class Specificity {
+        constructor() {
             /** Count of identifiers (e.g., `#app`) */
             this.id = 0;
             /** Count of attributes (`[type="number"]`), classes (`.container-fluid`), and pseudo-classes (`:hover`) */
@@ -240,16 +209,14 @@ var __extends = (this && this.__extends) || (function () {
             /** Count of tag names (`div`), and pseudo-elements (`::before`) */
             this.tag = 0;
         }
-        return Specificity;
-    }());
+    }
     function toElement(node, parentElement) {
-        var result = new Element();
-        for (var _i = 0, _a = node.getChildren(); _i < _a.length; _i++) {
-            var child = _a[_i];
+        let result = new Element();
+        for (const child of node.getChildren()) {
             switch (child.type) {
                 case nodes.NodeType.SelectorCombinator:
                     if (parentElement) {
-                        var segments = child.getText().split('&');
+                        const segments = child.getText().split('&');
                         if (segments.length === 1) {
                             // should not happen
                             result.addAttr('name', segments[0]);
@@ -257,12 +224,12 @@ var __extends = (this && this.__extends) || (function () {
                         }
                         result = parentElement.cloneWithParent();
                         if (segments[0]) {
-                            var root = result.findRoot();
+                            const root = result.findRoot();
                             root.prepend(segments[0]);
                         }
-                        for (var i = 1; i < segments.length; i++) {
+                        for (let i = 1; i < segments.length; i++) {
                             if (i > 1) {
-                                var clone = parentElement.cloneWithParent();
+                                const clone = parentElement.cloneWithParent();
                                 result.addChild(clone.findRoot());
                                 result = clone;
                             }
@@ -276,7 +243,7 @@ var __extends = (this && this.__extends) || (function () {
                     }
                 // fall through
                 case nodes.NodeType.ElementNameSelector:
-                    var text = child.getText();
+                    const text = child.getText();
                     result.addAttr('name', text === '*' ? 'element' : unescape(text));
                     break;
                 case nodes.NodeType.ClassSelector:
@@ -292,33 +259,33 @@ var __extends = (this && this.__extends) || (function () {
                     result.addAttr(unescape(child.getText()), '');
                     break;
                 case nodes.NodeType.AttributeSelector:
-                    var selector = child;
-                    var identifier = selector.getIdentifier();
+                    const selector = child;
+                    const identifier = selector.getIdentifier();
                     if (identifier) {
-                        var expression = selector.getValue();
-                        var operator = selector.getOperator();
-                        var value = void 0;
+                        const expression = selector.getValue();
+                        const operator = selector.getOperator();
+                        let value;
                         if (expression && operator) {
                             switch (unescape(operator.getText())) {
                                 case '|=':
                                     // excatly or followed by -words
-                                    value = "".concat(quotes.remove(unescape(expression.getText())), "-\u2026");
+                                    value = `${quotes.remove(unescape(expression.getText()))}-\u2026`;
                                     break;
                                 case '^=':
                                     // prefix
-                                    value = "".concat(quotes.remove(unescape(expression.getText())), "\u2026");
+                                    value = `${quotes.remove(unescape(expression.getText()))}\u2026`;
                                     break;
                                 case '$=':
                                     // suffix
-                                    value = "\u2026".concat(quotes.remove(unescape(expression.getText())));
+                                    value = `\u2026${quotes.remove(unescape(expression.getText()))}`;
                                     break;
                                 case '~=':
                                     // one of a list of words
-                                    value = " \u2026 ".concat(quotes.remove(unescape(expression.getText())), " \u2026 ");
+                                    value = ` \u2026 ${quotes.remove(unescape(expression.getText()))} \u2026 `;
                                     break;
                                 case '*=':
                                     // substring
-                                    value = "\u2026".concat(quotes.remove(unescape(expression.getText())), "\u2026");
+                                    value = `\u2026${quotes.remove(unescape(expression.getText()))}\u2026`;
                                     break;
                                 default:
                                     value = quotes.remove(unescape(expression.getText()));
@@ -334,49 +301,47 @@ var __extends = (this && this.__extends) || (function () {
     }
     exports.toElement = toElement;
     function unescape(content) {
-        var scanner = new cssScanner_1.Scanner();
+        const scanner = new cssScanner_1.Scanner();
         scanner.setSource(content);
-        var token = scanner.scanUnquotedString();
+        const token = scanner.scanUnquotedString();
         if (token) {
             return token.text;
         }
         return content;
     }
-    var SelectorPrinting = /** @class */ (function () {
-        function SelectorPrinting(cssDataManager) {
+    class SelectorPrinting {
+        constructor(cssDataManager) {
             this.cssDataManager = cssDataManager;
         }
-        SelectorPrinting.prototype.selectorToMarkedString = function (node) {
-            var root = selectorToElement(node);
+        selectorToMarkedString(node) {
+            const root = selectorToElement(node);
             if (root) {
-                var markedStrings = new MarkedStringPrinter('"').print(root);
+                const markedStrings = new MarkedStringPrinter('"').print(root);
                 markedStrings.push(this.selectorToSpecificityMarkedString(node));
                 return markedStrings;
             }
             else {
                 return [];
             }
-        };
-        SelectorPrinting.prototype.simpleSelectorToMarkedString = function (node) {
-            var element = toElement(node);
-            var markedStrings = new MarkedStringPrinter('"').print(element);
+        }
+        simpleSelectorToMarkedString(node) {
+            const element = toElement(node);
+            const markedStrings = new MarkedStringPrinter('"').print(element);
             markedStrings.push(this.selectorToSpecificityMarkedString(node));
             return markedStrings;
-        };
-        SelectorPrinting.prototype.isPseudoElementIdentifier = function (text) {
-            var match = text.match(/^::?([\w-]+)/);
+        }
+        isPseudoElementIdentifier(text) {
+            const match = text.match(/^::?([\w-]+)/);
             if (!match) {
                 return false;
             }
             return !!this.cssDataManager.getPseudoElement("::" + match[1]);
-        };
-        SelectorPrinting.prototype.selectorToSpecificityMarkedString = function (node) {
-            var _this = this;
+        }
+        selectorToSpecificityMarkedString(node) {
             //https://www.w3.org/TR/selectors-3/#specificity
-            var calculateScore = function (node) {
-                var specificity = new Specificity();
-                elementLoop: for (var _i = 0, _a = node.getChildren(); _i < _a.length; _i++) {
-                    var element = _a[_i];
+            const calculateScore = (node) => {
+                const specificity = new Specificity();
+                elementLoop: for (const element of node.getChildren()) {
                     switch (element.type) {
                         case nodes.NodeType.IdentifierSelector:
                             specificity.id++;
@@ -393,8 +358,8 @@ var __extends = (this && this.__extends) || (function () {
                             specificity.tag++;
                             break;
                         case nodes.NodeType.PseudoSelector:
-                            var text = element.getText();
-                            if (_this.isPseudoElementIdentifier(text)) {
+                            const text = element.getText();
+                            if (this.isPseudoElementIdentifier(text)) {
                                 specificity.tag++; // pseudo element
                                 continue elementLoop;
                             }
@@ -404,19 +369,17 @@ var __extends = (this && this.__extends) || (function () {
                             }
                             // the most specific child selector
                             if (text.match(/^:(not|has|is)/i) && element.getChildren().length > 0) {
-                                var mostSpecificListItem = new Specificity();
-                                for (var _b = 0, _c = element.getChildren(); _b < _c.length; _b++) {
-                                    var containerElement = _c[_b];
-                                    var list = void 0;
+                                let mostSpecificListItem = new Specificity();
+                                for (const containerElement of element.getChildren()) {
+                                    let list;
                                     if (containerElement.type === nodes.NodeType.Undefined) { // containerElement is a list of selectors
                                         list = containerElement.getChildren();
                                     }
                                     else { // containerElement is a selector
                                         list = [containerElement];
                                     }
-                                    for (var _d = 0, _e = containerElement.getChildren(); _d < _e.length; _d++) {
-                                        var childElement = _e[_d];
-                                        var itemSpecificity = calculateScore(childElement);
+                                    for (const childElement of containerElement.getChildren()) {
+                                        const itemSpecificity = calculateScore(childElement);
                                         if (itemSpecificity.id > mostSpecificListItem.id) {
                                             mostSpecificListItem = itemSpecificity;
                                             continue;
@@ -446,7 +409,7 @@ var __extends = (this && this.__extends) || (function () {
                             continue elementLoop;
                     }
                     if (element.getChildren().length > 0) {
-                        var itemSpecificity = calculateScore(element);
+                        const itemSpecificity = calculateScore(element);
                         specificity.id += itemSpecificity.id;
                         specificity.attr += itemSpecificity.attr;
                         specificity.tag += itemSpecificity.tag;
@@ -454,23 +417,22 @@ var __extends = (this && this.__extends) || (function () {
                 }
                 return specificity;
             };
-            var specificity = calculateScore(node);
+            const specificity = calculateScore(node);
             ;
             return localize('specificity', "[Selector Specificity](https://developer.mozilla.org/en-US/docs/Web/CSS/Specificity): ({0}, {1}, {2})", specificity.id, specificity.attr, specificity.tag);
-        };
-        return SelectorPrinting;
-    }());
+        }
+    }
     exports.SelectorPrinting = SelectorPrinting;
-    var SelectorElementBuilder = /** @class */ (function () {
-        function SelectorElementBuilder(element) {
+    class SelectorElementBuilder {
+        constructor(element) {
             this.prev = null;
             this.element = element;
         }
-        SelectorElementBuilder.prototype.processSelector = function (selector) {
-            var parentElement = null;
+        processSelector(selector) {
+            let parentElement = null;
             if (!(this.element instanceof RootElement)) {
-                if (selector.getChildren().some(function (c) { return c.hasChildren() && c.getChild(0).type === nodes.NodeType.SelectorCombinator; })) {
-                    var curr = this.element.findRoot();
+                if (selector.getChildren().some((c) => c.hasChildren() && c.getChild(0).type === nodes.NodeType.SelectorCombinator)) {
+                    const curr = this.element.findRoot();
                     if (curr.parent instanceof RootElement) {
                         parentElement = this.element;
                         this.element = curr.parent;
@@ -479,11 +441,10 @@ var __extends = (this && this.__extends) || (function () {
                     }
                 }
             }
-            for (var _i = 0, _a = selector.getChildren(); _i < _a.length; _i++) {
-                var selectorChild = _a[_i];
+            for (const selectorChild of selector.getChildren()) {
                 if (selectorChild instanceof nodes.SimpleSelector) {
                     if (this.prev instanceof nodes.SimpleSelector) {
-                        var labelElement = new LabelElement('\u2026');
+                        const labelElement = new LabelElement('\u2026');
                         this.element.addChild(labelElement);
                         this.element = labelElement;
                     }
@@ -493,8 +454,8 @@ var __extends = (this && this.__extends) || (function () {
                     if (this.prev && this.prev.matches('~')) {
                         this.element.addChild(new LabelElement('\u22EE'));
                     }
-                    var thisElement = toElement(selectorChild, parentElement);
-                    var root = thisElement.findRoot();
+                    const thisElement = toElement(selectorChild, parentElement);
+                    const root = thisElement.findRoot();
                     this.element.addChild(root);
                     this.element = thisElement;
                 }
@@ -506,9 +467,8 @@ var __extends = (this && this.__extends) || (function () {
                     this.prev = selectorChild;
                 }
             }
-        };
-        return SelectorElementBuilder;
-    }());
+        }
+    }
     function isNewSelectorContext(node) {
         switch (node.type) {
             case nodes.NodeType.MixinDeclaration:
@@ -521,11 +481,11 @@ var __extends = (this && this.__extends) || (function () {
         if (node.matches('@at-root')) {
             return null;
         }
-        var root = new RootElement();
-        var parentRuleSets = [];
-        var ruleSet = node.getParent();
+        const root = new RootElement();
+        const parentRuleSets = [];
+        const ruleSet = node.getParent();
         if (ruleSet instanceof nodes.RuleSet) {
-            var parent = ruleSet.getParent(); // parent of the selector's ruleset
+            let parent = ruleSet.getParent(); // parent of the selector's ruleset
             while (parent && !isNewSelectorContext(parent)) {
                 if (parent instanceof nodes.RuleSet) {
                     if (parent.getSelectors().matches('@at-root')) {
@@ -536,9 +496,9 @@ var __extends = (this && this.__extends) || (function () {
                 parent = parent.getParent();
             }
         }
-        var builder = new SelectorElementBuilder(root);
-        for (var i = parentRuleSets.length - 1; i >= 0; i--) {
-            var selector = parentRuleSets[i].getSelectors().getChild(0);
+        const builder = new SelectorElementBuilder(root);
+        for (let i = parentRuleSets.length - 1; i >= 0; i--) {
+            const selector = parentRuleSets[i].getSelectors().getChild(0);
             if (selector) {
                 builder.processSelector(selector);
             }

package/lib/umd/utils/arrays.js

@@ -20,12 +20,12 @@
      * @returns the least x for which p(x) is true or array.length if no element fullfills the given function.
      */
     function findFirst(array, p) {
-        var low = 0, high = array.length;
+        let low = 0, high = array.length;
         if (high === 0) {
             return 0; // no children
         }
         while (low < high) {
-            var mid = Math.floor((low + high) / 2);
+            let mid = Math.floor((low + high) / 2);
             if (p(array[mid])) {
                 high = mid;
             }
@@ -40,16 +40,10 @@
         return array.indexOf(item) !== -1;
     }
     exports.includes = includes;
-    function union() {
-        var arrays = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            arrays[_i] = arguments[_i];
-        }
-        var result = [];
-        for (var _a = 0, arrays_1 = arrays; _a < arrays_1.length; _a++) {
-            var array = arrays_1[_a];
-            for (var _b = 0, array_1 = array; _b < array_1.length; _b++) {
-                var item = array_1[_b];
+    function union(...arrays) {
+        const result = [];
+        for (const array of arrays) {
+            for (const item of array) {
                 if (!includes(result, item)) {
                     result.push(item);
                 }

package/lib/umd/utils/objects.js

@@ -15,7 +15,7 @@
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.isDefined = exports.values = void 0;
     function values(obj) {
-        return Object.keys(obj).map(function (key) { return obj[key]; });
+        return Object.keys(obj).map(key => obj[key]);
     }
     exports.values = values;
     function isDefined(obj) {