vscode-css-languageservice 5.4.2 → 6.1.0

package/lib/esm/services/selectorPrinting.js

@@ -3,43 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 'use strict';
-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 __());
-    };
-})();
 import * as nodes from '../parser/cssNodes';
 import { Scanner } from '../parser/cssScanner';
 import * as nls from 'vscode-nls';
-var localize = nls.loadMessageBundle();
-var Element = /** @class */ (function () {
-    function Element() {
+const localize = nls.loadMessageBundle();
+export 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;
         }
@@ -47,103 +31,88 @@ var Element = /** @class */ (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;
-}());
-export { Element };
-var RootElement = /** @class */ (function (_super) {
-    __extends(RootElement, _super);
-    function RootElement() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return RootElement;
-}(Element));
-export { 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));
-export { LabelElement };
-var MarkedStringPrinter = /** @class */ (function () {
-    function MarkedStringPrinter(quote) {
+    }
+}
+export class RootElement extends Element {
+}
+export class LabelElement extends Element {
+    constructor(label) {
+        super();
+        this.addAttr('name', label);
+    }
+}
+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) {
@@ -153,31 +122,30 @@ var MarkedStringPrinter = /** @class */ (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);
@@ -187,12 +155,11 @@ var MarkedStringPrinter = /** @class */ (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));
@@ -202,9 +169,8 @@ var MarkedStringPrinter = /** @class */ (function () {
         }
         content.push('>');
         this.writeLine(indent, content.join(''));
-    };
-    return MarkedStringPrinter;
-}());
+    }
+}
 var quotes;
 (function (quotes) {
     function ensure(value, which) {
@@ -212,7 +178,7 @@ var quotes;
     }
     quotes.ensure = ensure;
     function remove(value) {
-        var match = value.match(/^['"](.*)["']$/);
+        const match = value.match(/^['"](.*)["']$/);
         if (match) {
             return match[1];
         }
@@ -220,8 +186,8 @@ var quotes;
     }
     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`) */
@@ -229,16 +195,14 @@ var Specificity = /** @class */ (function () {
         /** Count of tag names (`div`), and pseudo-elements (`::before`) */
         this.tag = 0;
     }
-    return Specificity;
-}());
+}
 export 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]);
@@ -246,12 +210,12 @@ export function toElement(node, parentElement) {
                     }
                     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;
                         }
@@ -265,7 +229,7 @@ export function toElement(node, parentElement) {
                 }
             // 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:
@@ -281,33 +245,33 @@ export function toElement(node, parentElement) {
                 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()));
@@ -322,49 +286,47 @@ export function toElement(node, parentElement) {
     return result;
 }
 function unescape(content) {
-    var scanner = new Scanner();
+    const scanner = new 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) {
+export 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++;
@@ -381,8 +343,8 @@ var SelectorPrinting = /** @class */ (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;
                         }
@@ -392,19 +354,17 @@ var SelectorPrinting = /** @class */ (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;
@@ -434,7 +394,7 @@ var SelectorPrinting = /** @class */ (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;
@@ -442,23 +402,21 @@ var SelectorPrinting = /** @class */ (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;
-}());
-export { 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;
@@ -467,11 +425,10 @@ var SelectorElementBuilder = /** @class */ (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;
                 }
@@ -481,8 +438,8 @@ var SelectorElementBuilder = /** @class */ (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;
             }
@@ -494,9 +451,8 @@ var SelectorElementBuilder = /** @class */ (function () {
                 this.prev = selectorChild;
             }
         }
-    };
-    return SelectorElementBuilder;
-}());
+    }
+}
 function isNewSelectorContext(node) {
     switch (node.type) {
         case nodes.NodeType.MixinDeclaration:
@@ -509,11 +465,11 @@ export function selectorToElement(node) {
     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')) {
@@ -524,9 +480,9 @@ export function selectorToElement(node) {
             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/esm/utils/arrays.js

@@ -9,12 +9,12 @@
  * @returns the least x for which p(x) is true or array.length if no element fullfills the given function.
  */
 export 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;
         }
@@ -27,16 +27,10 @@ export function findFirst(array, p) {
 export function includes(array, item) {
     return array.indexOf(item) !== -1;
 }
-export 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];
+export function union(...arrays) {
+    const result = [];
+    for (const array of arrays) {
+        for (const item of array) {
             if (!includes(result, item)) {
                 result.push(item);
             }

package/lib/esm/utils/objects.js

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 export function values(obj) {
-    return Object.keys(obj).map(function (key) { return obj[key]; });
+    return Object.keys(obj).map(key => obj[key]);
 }
 export function isDefined(obj) {
     return typeof obj !== 'undefined';

package/lib/esm/utils/resources.js

@@ -2,23 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 import { URI, Utils } from 'vscode-uri';
 export function dirname(uriString) {
-    return Utils.dirname(URI.parse(uriString)).toString();
+    return Utils.dirname(URI.parse(uriString)).toString(true);
 }
-export function joinPath(uriString) {
-    var paths = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        paths[_i - 1] = arguments[_i];
-    }
-    return Utils.joinPath.apply(Utils, __spreadArray([URI.parse(uriString)], paths, false)).toString();
+export function joinPath(uriString, ...paths) {
+    return Utils.joinPath(URI.parse(uriString), ...paths).toString(true);
 }