vscode-css-languageservice 5.1.8 → 5.1.12

package/lib/umd/languageFacts/colors.js

@@ -193,9 +193,22 @@
     }
     function getAngle(node) {
         var val = node.getText();
-        var m = val.match(/^([-+]?[0-9]*\.?[0-9]+)(deg)?$/);
+        var m = val.match(/^([-+]?[0-9]*\.?[0-9]+)(deg|rad|grad|turn)?$/);
         if (m) {
-            return parseFloat(val) % 360;
+            switch (m[2]) {
+                case 'deg':
+                    return parseFloat(val) % 360;
+                case 'rad':
+                    return (parseFloat(val) * 180 / Math.PI) % 360;
+                case 'grad':
+                    return (parseFloat(val) * 0.9) % 360;
+                case 'turn':
+                    return (parseFloat(val) * 360) % 360;
+                default:
+                    if ('undefined' === typeof m[2]) {
+                        return parseFloat(val) % 360;
+                    }
+            }
         }
         throw new Error();
     }
@@ -373,6 +386,21 @@
             var functionNode = node;
             var name = functionNode.getName();
             var colorValues = functionNode.getArguments().getChildren();
+            if (colorValues.length === 1) {
+                var functionArg = colorValues[0].getChildren();
+                if (functionArg.length === 1 && functionArg[0].type === nodes.NodeType.Expression) {
+                    colorValues = functionArg[0].getChildren();
+                    if (colorValues.length === 3) {
+                        var lastValue = colorValues[2];
+                        if (lastValue instanceof nodes.BinaryExpression) {
+                            var left = lastValue.getLeft(), right = lastValue.getRight(), operator = lastValue.getOperator();
+                            if (left && right && operator && operator.matches('/')) {
+                                colorValues = [colorValues[0], colorValues[1], left, right];
+                            }
+                        }
+                    }
+                }
+            }
             if (!name || colorValues.length < 3 || colorValues.length > 4) {
                 return null;
             }

package/lib/umd/languageFacts/entry.js

@@ -4,7 +4,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports"], factory);
+        define(["require", "exports", "../cssLanguageTypes"], factory);
     }
 })(function (require, exports) {
     /*---------------------------------------------------------------------------------------------
@@ -14,6 +14,7 @@
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getBrowserLabel = exports.textToMarkedString = exports.getEntryDescription = exports.browserNames = void 0;
+    var cssLanguageTypes_1 = require("../cssLanguageTypes");
     exports.browserNames = {
         E: 'Edge',
         FF: 'Firefox',
@@ -77,7 +78,7 @@
                 result += '\n(' + browserLabel + ')';
             }
             if ('syntax' in entry) {
-                result += "\n\nSyntax: " + entry.syntax;
+                result += "\n\nSyntax: ".concat(entry.syntax);
             }
         }
         if (entry.references && entry.references.length > 0 && (settings === null || settings === void 0 ? void 0 : settings.references) !== false) {
@@ -85,7 +86,7 @@
                 result += '\n\n';
             }
             result += entry.references.map(function (r) {
-                return r.name + ": " + r.url;
+                return "".concat(r.name, ": ").concat(r.url);
             }).join(' | ');
         }
         return result;
@@ -99,14 +100,18 @@
             if (entry.status) {
                 result += getEntryStatus(entry.status);
             }
-            var description = typeof entry.description === 'string' ? entry.description : entry.description.value;
-            result += textToMarkedString(description);
+            if (typeof entry.description === 'string') {
+                result += textToMarkedString(entry.description);
+            }
+            else {
+                result += entry.description.kind === cssLanguageTypes_1.MarkupKind.Markdown ? entry.description.value : textToMarkedString(entry.description.value);
+            }
             var browserLabel = getBrowserLabel(entry.browsers);
             if (browserLabel) {
                 result += '\n\n(' + textToMarkedString(browserLabel) + ')';
             }
             if ('syntax' in entry && entry.syntax) {
-                result += "\n\nSyntax: " + textToMarkedString(entry.syntax);
+                result += "\n\nSyntax: ".concat(textToMarkedString(entry.syntax));
             }
         }
         if (entry.references && entry.references.length > 0 && (settings === null || settings === void 0 ? void 0 : settings.references) !== false) {
@@ -114,7 +119,7 @@
                 result += '\n\n';
             }
             result += entry.references.map(function (r) {
-                return "[" + r.name + "](" + r.url + ")";
+                return "[".concat(r.name, "](").concat(r.url, ")");
             }).join(' | ');
         }
         return result;

package/lib/umd/parser/cssParser.js

@@ -1270,6 +1270,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
             if (node.setOperator(this._parseOperator())) {
                 node.setValue(this._parseBinaryExpr());
                 this.acceptIdent('i'); // case insensitive matching
+                this.acceptIdent('s'); // case sensitive matching
             }
             if (!this.accept(cssScanner_1.TokenType.BracketR)) {
                 return this.finish(node, cssErrors_1.ParseError.RightSquareBracketExpected);

package/lib/umd/services/cssCompletion.js

@@ -468,7 +468,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             var symbols = this.getSymbolContext().findSymbolsAtOffset(this.offset, nodes.ReferenceType.Variable);
             for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
                 var symbol = symbols_1[_i];
-                var insertText = strings.startsWith(symbol.name, '--') ? "var(" + symbol.name + ")" : symbol.name;
+                var insertText = strings.startsWith(symbol.name, '--') ? "var(".concat(symbol.name, ")") : symbol.name;
                 var completionItem = {
                     label: symbol.name,
                     documentation: symbol.value ? strings.getLimitedString(symbol.value) : symbol.value,

package/lib/umd/services/cssNavigation.js

@@ -61,8 +61,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     var startsWithSchemeRegex = /^\w+:\/\//;
     var startsWithData = /^data:/;
     var CSSNavigation = /** @class */ (function () {
-        function CSSNavigation(fileSystemProvider) {
+        function CSSNavigation(fileSystemProvider, resolveModuleReferences) {
             this.fileSystemProvider = fileSystemProvider;
+            this.resolveModuleReferences = resolveModuleReferences;
         }
         CSSNavigation.prototype.findDefinition = function (document, position, stylesheet) {
             var symbols = new cssSymbolScope_1.Symbols(stylesheet);
@@ -292,25 +293,25 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             var red256 = Math.round(color.red * 255), green256 = Math.round(color.green * 255), blue256 = Math.round(color.blue * 255);
             var label;
             if (color.alpha === 1) {
-                label = "rgb(" + red256 + ", " + green256 + ", " + blue256 + ")";
+                label = "rgb(".concat(red256, ", ").concat(green256, ", ").concat(blue256, ")");
             }
             else {
-                label = "rgba(" + red256 + ", " + green256 + ", " + blue256 + ", " + color.alpha + ")";
+                label = "rgba(".concat(red256, ", ").concat(green256, ", ").concat(blue256, ", ").concat(color.alpha, ")");
             }
             result.push({ label: label, textEdit: cssLanguageTypes_1.TextEdit.replace(range, label) });
             if (color.alpha === 1) {
-                label = "#" + toTwoDigitHex(red256) + toTwoDigitHex(green256) + toTwoDigitHex(blue256);
+                label = "#".concat(toTwoDigitHex(red256)).concat(toTwoDigitHex(green256)).concat(toTwoDigitHex(blue256));
             }
             else {
-                label = "#" + toTwoDigitHex(red256) + toTwoDigitHex(green256) + toTwoDigitHex(blue256) + toTwoDigitHex(Math.round(color.alpha * 255));
+                label = "#".concat(toTwoDigitHex(red256)).concat(toTwoDigitHex(green256)).concat(toTwoDigitHex(blue256)).concat(toTwoDigitHex(Math.round(color.alpha * 255)));
             }
             result.push({ label: label, textEdit: cssLanguageTypes_1.TextEdit.replace(range, label) });
             var hsl = (0, facts_1.hslFromColor)(color);
             if (hsl.a === 1) {
-                label = "hsl(" + hsl.h + ", " + Math.round(hsl.s * 100) + "%, " + Math.round(hsl.l * 100) + "%)";
+                label = "hsl(".concat(hsl.h, ", ").concat(Math.round(hsl.s * 100), "%, ").concat(Math.round(hsl.l * 100), "%)");
             }
             else {
-                label = "hsla(" + hsl.h + ", " + Math.round(hsl.s * 100) + "%, " + Math.round(hsl.l * 100) + "%, " + hsl.a + ")";
+                label = "hsla(".concat(hsl.h, ", ").concat(Math.round(hsl.s * 100), "%, ").concat(Math.round(hsl.l * 100), "%, ").concat(hsl.a, ")");
             }
             result.push({ label: label, textEdit: cssLanguageTypes_1.TextEdit.replace(range, label) });
             return result;
@@ -323,14 +324,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                 changes: (_a = {}, _a[document.uri] = edits, _a)
             };
         };
-        CSSNavigation.prototype.resolveRelativeReference = function (ref, documentUri, documentContext, isRawLink) {
+        CSSNavigation.prototype.resolveModuleReference = function (ref, documentUri, documentContext) {
             return __awaiter(this, void 0, void 0, function () {
                 var moduleName, rootFolderUri, documentFolderUri, modulePath, pathWithinModule;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            if (!(ref[0] === '~' && ref[1] !== '/' && this.fileSystemProvider)) return [3 /*break*/, 3];
-                            ref = ref.substring(1);
                             if (!(0, strings_1.startsWith)(documentUri, 'file://')) return [3 /*break*/, 2];
                             moduleName = getModuleNameFromPath(ref);
                             rootFolderUri = documentContext.resolveReference('/', documentUri);
@@ -343,8 +342,36 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                                 return [2 /*return*/, (0, resources_1.joinPath)(modulePath, pathWithinModule)];
                             }
                             _a.label = 2;
-                        case 2: return [2 /*return*/, documentContext.resolveReference(ref, documentUri)];
-                        case 3: return [2 /*return*/, documentContext.resolveReference(ref, documentUri)];
+                        case 2: return [2 /*return*/, undefined];
+                    }
+                });
+            });
+        };
+        CSSNavigation.prototype.resolveRelativeReference = function (ref, documentUri, documentContext, isRawLink) {
+            return __awaiter(this, void 0, void 0, function () {
+                var relativeReference, _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            relativeReference = documentContext.resolveReference(ref, documentUri);
+                            if (!(ref[0] === '~' && ref[1] !== '/' && this.fileSystemProvider)) return [3 /*break*/, 2];
+                            ref = ref.substring(1);
+                            return [4 /*yield*/, this.resolveModuleReference(ref, documentUri, documentContext)];
+                        case 1: return [2 /*return*/, (_b.sent()) || relativeReference];
+                        case 2:
+                            if (!this.resolveModuleReferences) return [3 /*break*/, 7];
+                            _a = relativeReference;
+                            if (!_a) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.fileExists(relativeReference)];
+                        case 3:
+                            _a = (_b.sent());
+                            _b.label = 4;
+                        case 4:
+                            if (!_a) return [3 /*break*/, 5];
+                            return [2 /*return*/, relativeReference];
+                        case 5: return [4 /*yield*/, this.resolveModuleReference(ref, documentUri, documentContext)];
+                        case 6: return [2 /*return*/, (_b.sent()) || relativeReference];
+                        case 7: return [2 /*return*/, relativeReference];
                     }
                 });
             });

package/lib/umd/services/lint.js

@@ -173,7 +173,7 @@
             if (atDirective) {
                 return false;
             }
-            this.addEntry(atRuleName, lintRules_1.Rules.UnknownAtRules, "Unknown at rule " + atRuleName.getText());
+            this.addEntry(atRuleName, lintRules_1.Rules.UnknownAtRules, "Unknown at rule ".concat(atRuleName.getText()));
             return true;
         };
         LintVisitor.prototype.visitKeyframe = function (node) {

package/lib/umd/services/scssCompletion.js

@@ -55,7 +55,7 @@ var __extends = (this && this.__extends) || (function () {
                     var item = {
                         label: p.label,
                         documentation: p.documentation,
-                        textEdit: cssLanguageTypes_1.TextEdit.replace(this.getCompletionRange(importPathNode), "'" + p.label + "'"),
+                        textEdit: cssLanguageTypes_1.TextEdit.replace(this.getCompletionRange(importPathNode), "'".concat(p.label, "'")),
                         kind: cssLanguageTypes_1.CompletionItemKind.Module
                     };
                     result.items.push(item);
@@ -380,7 +380,7 @@ var __extends = (this && this.__extends) || (function () {
                 markdownDoc.value += '\n\n';
                 markdownDoc.value += i.references
                     .map(function (r) {
-                    return "[" + r.name + "](" + r.url + ")";
+                    return "[".concat(r.name, "](").concat(r.url, ")");
                 })
                     .join(' | ');
                 i.documentation = markdownDoc;

package/lib/umd/services/scssNavigation.js

@@ -72,7 +72,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     var SCSSNavigation = /** @class */ (function (_super) {
         __extends(SCSSNavigation, _super);
         function SCSSNavigation(fileSystemProvider) {
-            return _super.call(this, fileSystemProvider) || this;
+            return _super.call(this, fileSystemProvider, true) || this;
         }
         SCSSNavigation.prototype.isRawStringDocumentLinkNode = function (node) {
             return (_super.prototype.isRawStringDocumentLinkNode.call(this, node) ||

package/lib/umd/services/selectorPrinting.js

@@ -302,23 +302,23 @@ var __extends = (this && this.__extends) || (function () {
                             switch (unescape(operator.getText())) {
                                 case '|=':
                                     // excatly or followed by -words
-                                    value = quotes.remove(unescape(expression.getText())) + "-\u2026";
+                                    value = "".concat(quotes.remove(unescape(expression.getText())), "-\u2026");
                                     break;
                                 case '^=':
                                     // prefix
-                                    value = quotes.remove(unescape(expression.getText())) + "\u2026";
+                                    value = "".concat(quotes.remove(unescape(expression.getText())), "\u2026");
                                     break;
                                 case '$=':
                                     // suffix
-                                    value = "\u2026" + quotes.remove(unescape(expression.getText()));
+                                    value = "\u2026".concat(quotes.remove(unescape(expression.getText())));
                                     break;
                                 case '~=':
                                     // one of a list of words
-                                    value = " \u2026 " + quotes.remove(unescape(expression.getText())) + " \u2026 ";
+                                    value = " \u2026 ".concat(quotes.remove(unescape(expression.getText())), " \u2026 ");
                                     break;
                                 case '*=':
                                     // substring
-                                    value = "\u2026" + quotes.remove(unescape(expression.getText())) + "\u2026";
+                                    value = "\u2026".concat(quotes.remove(unescape(expression.getText())), "\u2026");
                                     break;
                                 default:
                                     value = quotes.remove(unescape(expression.getText()));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-css-languageservice",
-  "version": "5.1.8",
+  "version": "5.1.12",
   "description": "Language service for CSS, LESS and SCSS",
   "main": "./lib/umd/cssLanguageService.js",
   "typings": "./lib/umd/cssLanguageService",
@@ -15,15 +15,15 @@
     "url": "https://github.com/Microsoft/vscode-css-languageservice"
   },
   "devDependencies": {
-    "@types/mocha": "^9.0.0",
+    "@types/mocha": "^9.1.0",
     "@types/node": "^10.12.21",
-    "@typescript-eslint/eslint-plugin": "^4.32.0",
-    "@typescript-eslint/parser": "^4.32.0",
-    "eslint": "^7.32.0",
-    "mocha": "^9.1.2",
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
+    "@vscode/web-custom-data": "^0.3.7",
+    "eslint": "^8.7.0",
+    "mocha": "^9.2.0",
     "rimraf": "^3.0.2",
-    "typescript": "^4.4.2",
-    "vscode-web-custom-data": "^0.3.5"
+    "typescript": "^4.5.5"
   },
   "dependencies": {
     "vscode-languageserver-textdocument": "^1.0.1",
@@ -43,7 +43,7 @@
     "mocha": "mocha",
     "coverage": "npm run compile && npx nyc --reporter=html --reporter=text  mocha",
     "lint": "eslint src/**/*.ts",
-    "update-data": "yarn add vscode-web-custom-data && node ./build/generateData.js",
+    "update-data": "yarn add @vscode/web-custom-data -D && node ./build/generateData.js",
     "install-types-next": "yarn add vscode-languageserver-types@next -f -S && yarn add vscode-languageserver-textdocument@next -f -S",
     "preversion": "npm test",
     "postversion": "git push && git push --tags"