vscode-css-languageservice 5.1.5 → 5.1.9

package/lib/umd/services/cssCompletion.js

@@ -60,6 +60,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     var pathCompletion_1 = require("./pathCompletion");
     var localize = nls.loadMessageBundle();
     var SnippetFormat = cssLanguageTypes_1.InsertTextFormat.Snippet;
+    var retriggerCommand = {
+        title: 'Suggest',
+        command: 'editor.action.triggerSuggest'
+    };
     var SortTexts;
     (function (SortTexts) {
         // char code 32, comes before everything
@@ -293,10 +297,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                     retrigger = false;
                 }
                 if (triggerPropertyValueCompletion && retrigger) {
-                    item.command = {
-                        title: 'Suggest',
-                        command: 'editor.action.triggerSuggest'
-                    };
+                    item.command = retriggerCommand;
                 }
                 var relevance = typeof entry.relevance === 'number' ? Math.min(Math.max(entry.relevance, 0), 99) : 50;
                 var sortTextSuffix = (255 - relevance).toString(16);
@@ -444,6 +445,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                     kind: cssLanguageTypes_1.CompletionItemKind.Value
                 });
             }
+            for (var func in languageFacts.cssWideFunctions) {
+                var insertText = moveCursorInsideParenthesis(func);
+                result.items.push({
+                    label: func,
+                    documentation: languageFacts.cssWideFunctions[func],
+                    textEdit: cssLanguageTypes_1.TextEdit.replace(this.getCompletionRange(existingNode), insertText),
+                    kind: cssLanguageTypes_1.CompletionItemKind.Function,
+                    insertTextFormat: SnippetFormat,
+                    command: strings.startsWith(func, 'var') ? retriggerCommand : undefined
+                });
+            }
             return result;
         };
         CSSCompletion.prototype.getCompletionsForInterpolation = function (node, result) {
@@ -478,22 +490,35 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             return result;
         };
         CSSCompletion.prototype.getVariableProposalsForCSSVarFunction = function (result) {
+            var allReferencedVariables = new Set();
+            this.styleSheet.acceptVisitor(new VariableCollector(allReferencedVariables, this.offset));
             var symbols = this.getSymbolContext().findSymbolsAtOffset(this.offset, nodes.ReferenceType.Variable);
-            symbols = symbols.filter(function (symbol) {
-                return strings.startsWith(symbol.name, '--');
-            });
             for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
                 var symbol = symbols_2[_i];
-                var completionItem = {
-                    label: symbol.name,
-                    documentation: symbol.value ? strings.getLimitedString(symbol.value) : symbol.value,
-                    textEdit: cssLanguageTypes_1.TextEdit.replace(this.getCompletionRange(null), symbol.name),
-                    kind: cssLanguageTypes_1.CompletionItemKind.Variable
-                };
-                if (typeof completionItem.documentation === 'string' && isColorString(completionItem.documentation)) {
-                    completionItem.kind = cssLanguageTypes_1.CompletionItemKind.Color;
+                if (strings.startsWith(symbol.name, '--')) {
+                    var completionItem = {
+                        label: symbol.name,
+                        documentation: symbol.value ? strings.getLimitedString(symbol.value) : symbol.value,
+                        textEdit: cssLanguageTypes_1.TextEdit.replace(this.getCompletionRange(null), symbol.name),
+                        kind: cssLanguageTypes_1.CompletionItemKind.Variable
+                    };
+                    if (typeof completionItem.documentation === 'string' && isColorString(completionItem.documentation)) {
+                        completionItem.kind = cssLanguageTypes_1.CompletionItemKind.Color;
+                    }
+                    result.items.push(completionItem);
+                }
+                allReferencedVariables.remove(symbol.name);
+            }
+            for (var _a = 0, _b = allReferencedVariables.getEntries(); _a < _b.length; _a++) {
+                var name = _b[_a];
+                if (strings.startsWith(name, '--')) {
+                    var completionItem = {
+                        label: name,
+                        textEdit: cssLanguageTypes_1.TextEdit.replace(this.getCompletionRange(null), name),
+                        kind: cssLanguageTypes_1.CompletionItemKind.Variable
+                    };
+                    result.items.push(completionItem);
                 }
-                result.items.push(completionItem);
             }
             return result;
         };
@@ -1044,24 +1069,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         }
         return false;
     }
-    /**
-     * Rank number should all be same length strings
-     */
-    function computeRankNumber(n) {
-        var nstr = n.toString();
-        switch (nstr.length) {
-            case 4:
-                return nstr;
-            case 3:
-                return '0' + nstr;
-            case 2:
-                return '00' + nstr;
-            case 1:
-                return '000' + nstr;
-            default:
-                return '0000';
-        }
-    }
     var Set = /** @class */ (function () {
         function Set() {
             this.entries = {};
@@ -1069,6 +1076,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         Set.prototype.add = function (entry) {
             this.entries[entry] = true;
         };
+        Set.prototype.remove = function (entry) {
+            delete this.entries[entry];
+        };
         Set.prototype.getEntries = function () {
             return Object.keys(this.entries);
         };
@@ -1120,6 +1130,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         };
         return ColorValueCollector;
     }());
+    var VariableCollector = /** @class */ (function () {
+        function VariableCollector(entries, currentOffset) {
+            this.entries = entries;
+            this.currentOffset = currentOffset;
+            // nothing to do
+        }
+        VariableCollector.prototype.visitNode = function (node) {
+            if (node instanceof nodes.Identifier && node.isCustomProperty) {
+                if (this.currentOffset < node.offset || node.end < this.currentOffset) {
+                    this.entries.add(node.getText());
+                }
+            }
+            return true;
+        };
+        return VariableCollector;
+    }());
     function getCurrentWord(document, offset) {
         var i = offset - 1;
         var text = document.getText();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-css-languageservice",
-  "version": "5.1.5",
+  "version": "5.1.9",
   "description": "Language service for CSS, LESS and SCSS",
   "main": "./lib/umd/cssLanguageService.js",
   "typings": "./lib/umd/cssLanguageService",
@@ -15,12 +15,12 @@
     "url": "https://github.com/Microsoft/vscode-css-languageservice"
   },
   "devDependencies": {
-    "@types/mocha": "^8.2.2",
+    "@types/mocha": "^9.0.0",
     "@types/node": "^10.12.21",
-    "@typescript-eslint/eslint-plugin": "^4.31.0",
-    "@typescript-eslint/parser": "^4.31.0",
+    "@typescript-eslint/eslint-plugin": "^4.32.0",
+    "@typescript-eslint/parser": "^4.32.0",
     "eslint": "^7.32.0",
-    "mocha": "^8.4.0",
+    "mocha": "^9.1.2",
     "rimraf": "^3.0.2",
     "typescript": "^4.4.2",
     "vscode-web-custom-data": "^0.3.5"