vscode-css-languageservice 5.4.2 → 6.1.0

package/lib/umd/services/lintRules.js

@@ -14,31 +14,29 @@
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.LintConfigurationSettings = exports.Settings = exports.Rules = exports.Setting = exports.Rule = void 0;
-    var nodes = require("../parser/cssNodes");
-    var nls = require("vscode-nls");
-    var localize = nls.loadMessageBundle();
-    var Warning = nodes.Level.Warning;
-    var Error = nodes.Level.Error;
-    var Ignore = nodes.Level.Ignore;
-    var Rule = /** @class */ (function () {
-        function Rule(id, message, defaultValue) {
+    const nodes = require("../parser/cssNodes");
+    const nls = require("vscode-nls");
+    const localize = nls.loadMessageBundle();
+    const Warning = nodes.Level.Warning;
+    const Error = nodes.Level.Error;
+    const Ignore = nodes.Level.Ignore;
+    class Rule {
+        constructor(id, message, defaultValue) {
             this.id = id;
             this.message = message;
             this.defaultValue = defaultValue;
             // nothing to do
         }
-        return Rule;
-    }());
+    }
     exports.Rule = Rule;
-    var Setting = /** @class */ (function () {
-        function Setting(id, message, defaultValue) {
+    class Setting {
+        constructor(id, message, defaultValue) {
             this.id = id;
             this.message = message;
             this.defaultValue = defaultValue;
             // nothing to do
         }
-        return Setting;
-    }());
+    }
     exports.Setting = Setting;
     exports.Rules = {
         AllVendorPrefixes: new Rule('compatibleVendorPrefixes', localize('rule.vendorprefixes.all', "When using a vendor-specific prefix make sure to also include all other vendor-specific properties"), Ignore),
@@ -64,25 +62,23 @@
     exports.Settings = {
         ValidProperties: new Setting('validProperties', localize('rule.validProperties', "A list of properties that are not validated against the `unknownProperties` rule."), [])
     };
-    var LintConfigurationSettings = /** @class */ (function () {
-        function LintConfigurationSettings(conf) {
-            if (conf === void 0) { conf = {}; }
+    class LintConfigurationSettings {
+        constructor(conf = {}) {
             this.conf = conf;
         }
-        LintConfigurationSettings.prototype.getRule = function (rule) {
+        getRule(rule) {
             if (this.conf.hasOwnProperty(rule.id)) {
-                var level = toLevel(this.conf[rule.id]);
+                const level = toLevel(this.conf[rule.id]);
                 if (level) {
                     return level;
                 }
             }
             return rule.defaultValue;
-        };
-        LintConfigurationSettings.prototype.getSetting = function (setting) {
+        }
+        getSetting(setting) {
             return this.conf[setting.id];
-        };
-        return LintConfigurationSettings;
-    }());
+        }
+    }
     exports.LintConfigurationSettings = LintConfigurationSettings;
     function toLevel(level) {
         switch (level) {

package/lib/umd/services/lintUtil.js

@@ -14,17 +14,16 @@
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Element = void 0;
-    var arrays_1 = require("../utils/arrays");
-    var Element = /** @class */ (function () {
-        function Element(decl) {
+    const arrays_1 = require("../utils/arrays");
+    class Element {
+        constructor(decl) {
             this.fullPropertyName = decl.getFullPropertyName().toLowerCase();
             this.node = decl;
         }
-        return Element;
-    }());
+    }
     exports.Element = Element;
     function setSide(model, side, value, property) {
-        var state = model[side];
+        const state = model[side];
         state.value = value;
         if (value) {
             if (!(0, arrays_1.includes)(state.properties, property)) {
@@ -73,8 +72,7 @@
         }
     }
     function matches(value, candidates) {
-        for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
-            var candidate = candidates_1[_i];
+        for (let candidate of candidates) {
             if (value.matches(candidate)) {
                 return true;
             }
@@ -85,8 +83,7 @@
      * @param allowsKeywords whether the initial value of property is zero, so keywords `initial` and `unset` count as zero
      * @return `true` if this node represents a non-zero border; otherwise, `false`
      */
-    function checkLineWidth(value, allowsKeywords) {
-        if (allowsKeywords === void 0) { allowsKeywords = true; }
+    function checkLineWidth(value, allowsKeywords = true) {
         if (allowsKeywords && matches(value, ['initial', 'unset'])) {
             return false;
         }
@@ -94,16 +91,14 @@
         // so use `parseFloat` to strip the unit
         return parseFloat(value.getText()) !== 0;
     }
-    function checkLineWidthList(nodes, allowsKeywords) {
-        if (allowsKeywords === void 0) { allowsKeywords = true; }
-        return nodes.map(function (node) { return checkLineWidth(node, allowsKeywords); });
+    function checkLineWidthList(nodes, allowsKeywords = true) {
+        return nodes.map(node => checkLineWidth(node, allowsKeywords));
     }
     /**
      * @param allowsKeywords whether keywords `initial` and `unset` count as zero
      * @return `true` if this node represents a non-zero border; otherwise, `false`
      */
-    function checkLineStyle(valueNode, allowsKeywords) {
-        if (allowsKeywords === void 0) { allowsKeywords = true; }
+    function checkLineStyle(valueNode, allowsKeywords = true) {
         if (matches(valueNode, ['none', 'hidden'])) {
             return false;
         }
@@ -112,23 +107,21 @@
         }
         return true;
     }
-    function checkLineStyleList(nodes, allowsKeywords) {
-        if (allowsKeywords === void 0) { allowsKeywords = true; }
-        return nodes.map(function (node) { return checkLineStyle(node, allowsKeywords); });
+    function checkLineStyleList(nodes, allowsKeywords = true) {
+        return nodes.map(node => checkLineStyle(node, allowsKeywords));
     }
     function checkBorderShorthand(node) {
-        var children = node.getChildren();
+        const children = node.getChildren();
         // the only child can be a keyword, a <line-width>, or a <line-style>
         // if either check returns false, the result is no border
         if (children.length === 1) {
-            var value = children[0];
+            const value = children[0];
             return checkLineWidth(value) && checkLineStyle(value);
         }
         // multiple children can't contain keywords
         // if any child means no border, the result is no border
-        for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
-            var child = children_1[_i];
-            var value = child;
+        for (const child of children) {
+            const value = child;
             if (!checkLineWidth(value, /* allowsKeywords: */ false) ||
                 !checkLineStyle(value, /* allowsKeywords: */ false)) {
                 return false;
@@ -137,15 +130,14 @@
         return true;
     }
     function calculateBoxModel(propertyTable) {
-        var model = {
+        const model = {
             top: { value: false, properties: [] },
             right: { value: false, properties: [] },
             bottom: { value: false, properties: [] },
             left: { value: false, properties: [] },
         };
-        for (var _i = 0, propertyTable_1 = propertyTable; _i < propertyTable_1.length; _i++) {
-            var property = propertyTable_1[_i];
-            var value = property.node.value;
+        for (const property of propertyTable) {
+            const value = property.node.value;
             if (typeof value === 'undefined') {
                 continue;
             }
@@ -165,7 +157,7 @@
                     model.height = property;
                     break;
                 default:
-                    var segments = property.fullPropertyName.split('-');
+                    const segments = property.fullPropertyName.split('-');
                     switch (segments[0]) {
                         case 'border':
                             switch (segments[1]) {

package/lib/umd/services/pathCompletion.js

@@ -2,42 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -50,134 +14,97 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.PathCompletionParticipant = void 0;
-    var cssLanguageTypes_1 = require("../cssLanguageTypes");
-    var strings_1 = require("../utils/strings");
-    var resources_1 = require("../utils/resources");
-    var PathCompletionParticipant = /** @class */ (function () {
-        function PathCompletionParticipant(readDirectory) {
+    const cssLanguageTypes_1 = require("../cssLanguageTypes");
+    const strings_1 = require("../utils/strings");
+    const resources_1 = require("../utils/resources");
+    class PathCompletionParticipant {
+        constructor(readDirectory) {
             this.readDirectory = readDirectory;
             this.literalCompletions = [];
             this.importCompletions = [];
         }
-        PathCompletionParticipant.prototype.onCssURILiteralValue = function (context) {
+        onCssURILiteralValue(context) {
             this.literalCompletions.push(context);
-        };
-        PathCompletionParticipant.prototype.onCssImportPath = function (context) {
+        }
+        onCssImportPath(context) {
             this.importCompletions.push(context);
-        };
-        PathCompletionParticipant.prototype.computeCompletions = function (document, documentContext) {
-            return __awaiter(this, void 0, void 0, function () {
-                var result, _i, _a, literalCompletion, uriValue, fullValue, items, _b, items_1, item, _c, _d, importCompletion, pathValue, fullValue, suggestions, _e, suggestions_1, item;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
-                        case 0:
-                            result = { items: [], isIncomplete: false };
-                            _i = 0, _a = this.literalCompletions;
-                            _f.label = 1;
-                        case 1:
-                            if (!(_i < _a.length)) return [3 /*break*/, 5];
-                            literalCompletion = _a[_i];
-                            uriValue = literalCompletion.uriValue;
-                            fullValue = stripQuotes(uriValue);
-                            if (!(fullValue === '.' || fullValue === '..')) return [3 /*break*/, 2];
-                            result.isIncomplete = true;
-                            return [3 /*break*/, 4];
-                        case 2: return [4 /*yield*/, this.providePathSuggestions(uriValue, literalCompletion.position, literalCompletion.range, document, documentContext)];
-                        case 3:
-                            items = _f.sent();
-                            for (_b = 0, items_1 = items; _b < items_1.length; _b++) {
-                                item = items_1[_b];
-                                result.items.push(item);
-                            }
-                            _f.label = 4;
-                        case 4:
-                            _i++;
-                            return [3 /*break*/, 1];
-                        case 5:
-                            _c = 0, _d = this.importCompletions;
-                            _f.label = 6;
-                        case 6:
-                            if (!(_c < _d.length)) return [3 /*break*/, 10];
-                            importCompletion = _d[_c];
-                            pathValue = importCompletion.pathValue;
-                            fullValue = stripQuotes(pathValue);
-                            if (!(fullValue === '.' || fullValue === '..')) return [3 /*break*/, 7];
-                            result.isIncomplete = true;
-                            return [3 /*break*/, 9];
-                        case 7: return [4 /*yield*/, this.providePathSuggestions(pathValue, importCompletion.position, importCompletion.range, document, documentContext)];
-                        case 8:
-                            suggestions = _f.sent();
-                            if (document.languageId === 'scss') {
-                                suggestions.forEach(function (s) {
-                                    if ((0, strings_1.startsWith)(s.label, '_') && (0, strings_1.endsWith)(s.label, '.scss')) {
-                                        if (s.textEdit) {
-                                            s.textEdit.newText = s.label.slice(1, -5);
-                                        }
-                                        else {
-                                            s.label = s.label.slice(1, -5);
-                                        }
-                                    }
-                                });
-                            }
-                            for (_e = 0, suggestions_1 = suggestions; _e < suggestions_1.length; _e++) {
-                                item = suggestions_1[_e];
-                                result.items.push(item);
-                            }
-                            _f.label = 9;
-                        case 9:
-                            _c++;
-                            return [3 /*break*/, 6];
-                        case 10: return [2 /*return*/, result];
+        }
+        async computeCompletions(document, documentContext) {
+            const result = { items: [], isIncomplete: false };
+            for (const literalCompletion of this.literalCompletions) {
+                const uriValue = literalCompletion.uriValue;
+                const fullValue = stripQuotes(uriValue);
+                if (fullValue === '.' || fullValue === '..') {
+                    result.isIncomplete = true;
+                }
+                else {
+                    const items = await this.providePathSuggestions(uriValue, literalCompletion.position, literalCompletion.range, document, documentContext);
+                    for (let item of items) {
+                        result.items.push(item);
                     }
-                });
-            });
-        };
-        PathCompletionParticipant.prototype.providePathSuggestions = function (pathValue, position, range, document, documentContext) {
-            return __awaiter(this, void 0, void 0, function () {
-                var fullValue, isValueQuoted, valueBeforeCursor, currentDocUri, fullValueRange, replaceRange, valueBeforeLastSlash, parentDir, result, infos, _i, infos_1, _a, name, type, e_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            fullValue = stripQuotes(pathValue);
-                            isValueQuoted = (0, strings_1.startsWith)(pathValue, "'") || (0, strings_1.startsWith)(pathValue, "\"");
-                            valueBeforeCursor = isValueQuoted
-                                ? fullValue.slice(0, position.character - (range.start.character + 1))
-                                : fullValue.slice(0, position.character - range.start.character);
-                            currentDocUri = document.uri;
-                            fullValueRange = isValueQuoted ? shiftRange(range, 1, -1) : range;
-                            replaceRange = pathToReplaceRange(valueBeforeCursor, fullValue, fullValueRange);
-                            valueBeforeLastSlash = valueBeforeCursor.substring(0, valueBeforeCursor.lastIndexOf('/') + 1);
-                            parentDir = documentContext.resolveReference(valueBeforeLastSlash || '.', currentDocUri);
-                            if (!parentDir) return [3 /*break*/, 4];
-                            _b.label = 1;
-                        case 1:
-                            _b.trys.push([1, 3, , 4]);
-                            result = [];
-                            return [4 /*yield*/, this.readDirectory(parentDir)];
-                        case 2:
-                            infos = _b.sent();
-                            for (_i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
-                                _a = infos_1[_i], name = _a[0], type = _a[1];
-                                // Exclude paths that start with `.`
-                                if (name.charCodeAt(0) !== CharCode_dot && (type === cssLanguageTypes_1.FileType.Directory || (0, resources_1.joinPath)(parentDir, name) !== currentDocUri)) {
-                                    result.push(createCompletionItem(name, type === cssLanguageTypes_1.FileType.Directory, replaceRange));
+                }
+            }
+            for (const importCompletion of this.importCompletions) {
+                const pathValue = importCompletion.pathValue;
+                const fullValue = stripQuotes(pathValue);
+                if (fullValue === '.' || fullValue === '..') {
+                    result.isIncomplete = true;
+                }
+                else {
+                    let suggestions = await this.providePathSuggestions(pathValue, importCompletion.position, importCompletion.range, document, documentContext);
+                    if (document.languageId === 'scss') {
+                        suggestions.forEach(s => {
+                            if ((0, strings_1.startsWith)(s.label, '_') && (0, strings_1.endsWith)(s.label, '.scss')) {
+                                if (s.textEdit) {
+                                    s.textEdit.newText = s.label.slice(1, -5);
+                                }
+                                else {
+                                    s.label = s.label.slice(1, -5);
                                 }
                             }
-                            return [2 /*return*/, result];
-                        case 3:
-                            e_1 = _b.sent();
-                            return [3 /*break*/, 4];
-                        case 4: return [2 /*return*/, []];
+                        });
+                    }
+                    for (let item of suggestions) {
+                        result.items.push(item);
+                    }
+                }
+            }
+            return result;
+        }
+        async providePathSuggestions(pathValue, position, range, document, documentContext) {
+            const fullValue = stripQuotes(pathValue);
+            const isValueQuoted = (0, strings_1.startsWith)(pathValue, `'`) || (0, strings_1.startsWith)(pathValue, `"`);
+            const valueBeforeCursor = isValueQuoted
+                ? fullValue.slice(0, position.character - (range.start.character + 1))
+                : fullValue.slice(0, position.character - range.start.character);
+            const currentDocUri = document.uri;
+            const fullValueRange = isValueQuoted ? shiftRange(range, 1, -1) : range;
+            const replaceRange = pathToReplaceRange(valueBeforeCursor, fullValue, fullValueRange);
+            const valueBeforeLastSlash = valueBeforeCursor.substring(0, valueBeforeCursor.lastIndexOf('/') + 1); // keep the last slash
+            let parentDir = documentContext.resolveReference(valueBeforeLastSlash || '.', currentDocUri);
+            if (parentDir) {
+                try {
+                    const result = [];
+                    const infos = await this.readDirectory(parentDir);
+                    for (const [name, type] of infos) {
+                        // Exclude paths that start with `.`
+                        if (name.charCodeAt(0) !== CharCode_dot && (type === cssLanguageTypes_1.FileType.Directory || (0, resources_1.joinPath)(parentDir, name) !== currentDocUri)) {
+                            result.push(createCompletionItem(name, type === cssLanguageTypes_1.FileType.Directory, replaceRange));
+                        }
                     }
-                });
-            });
-        };
-        return PathCompletionParticipant;
-    }());
+                    return result;
+                }
+                catch (e) {
+                    // ignore
+                }
+            }
+            return [];
+        }
+    }
     exports.PathCompletionParticipant = PathCompletionParticipant;
-    var CharCode_dot = '.'.charCodeAt(0);
+    const CharCode_dot = '.'.charCodeAt(0);
     function stripQuotes(fullValue) {
-        if ((0, strings_1.startsWith)(fullValue, "'") || (0, strings_1.startsWith)(fullValue, "\"")) {
+        if ((0, strings_1.startsWith)(fullValue, `'`) || (0, strings_1.startsWith)(fullValue, `"`)) {
             return fullValue.slice(1, -1);
         }
         else {
@@ -185,19 +112,19 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         }
     }
     function pathToReplaceRange(valueBeforeCursor, fullValue, fullValueRange) {
-        var replaceRange;
-        var lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
+        let replaceRange;
+        const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
         if (lastIndexOfSlash === -1) {
             replaceRange = fullValueRange;
         }
         else {
             // For cases where cursor is in the middle of attribute value, like <script src="./s|rc/test.js">
             // Find the last slash before cursor, and calculate the start of replace range from there
-            var valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1);
-            var startPos = shiftPosition(fullValueRange.end, -valueAfterLastSlash.length);
+            const valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1);
+            const startPos = shiftPosition(fullValueRange.end, -valueAfterLastSlash.length);
             // If whitespace exists, replace until it
-            var whitespaceIndex = valueAfterLastSlash.indexOf(' ');
-            var endPos = void 0;
+            const whitespaceIndex = valueAfterLastSlash.indexOf(' ');
+            let endPos;
             if (whitespaceIndex !== -1) {
                 endPos = shiftPosition(startPos, whitespaceIndex);
             }
@@ -237,8 +164,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         return cssLanguageTypes_1.Position.create(pos.line, pos.character + offset);
     }
     function shiftRange(range, startOffset, endOffset) {
-        var start = shiftPosition(range.start, startOffset);
-        var end = shiftPosition(range.end, endOffset);
+        const start = shiftPosition(range.start, startOffset);
+        const end = shiftPosition(range.end, endOffset);
         return cssLanguageTypes_1.Range.create(start, end);
     }
 });