vscode-css-languageservice 5.1.13 → 5.4.1

package/lib/umd/parser/cssNodes.js

@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
      *--------------------------------------------------------------------------------------------*/
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.ParseErrorCollector = exports.Marker = exports.Level = exports.Module = exports.GuardCondition = exports.LessGuard = exports.ListEntry = exports.UnknownAtRule = exports.MixinDeclaration = exports.MixinReference = exports.MixinContentDeclaration = exports.MixinContentReference = exports.ExtendsReference = exports.Variable = exports.Interpolation = exports.VariableDeclaration = exports.NumericValue = exports.RatioValue = exports.HexColorValue = exports.Operator = exports.AttributeSelector = exports.Term = exports.BinaryExpression = exports.Expression = exports.PageBoxMarginBox = exports.Page = exports.SupportsCondition = exports.MediaFeature = exports.MediaCondition = exports.MediaQuery = exports.Medialist = exports.Document = exports.Supports = exports.Media = exports.Namespace = exports.ForwardVisibility = exports.Forward = exports.ModuleConfiguration = exports.Use = exports.Import = exports.KeyframeSelector = exports.Keyframe = exports.NestedProperties = exports.FontFace = exports.ViewPort = exports.FunctionDeclaration = exports.ElseStatement = exports.WhileStatement = exports.EachStatement = exports.ForStatement = exports.IfStatement = exports.FunctionArgument = exports.FunctionParameter = exports.Function = exports.Invocation = exports.Property = exports.CustomPropertyDeclaration = exports.Declaration = exports.CustomPropertySet = exports.AbstractDeclaration = exports.AtApplyRule = exports.SimpleSelector = exports.Selector = exports.RuleSet = exports.BodyDeclaration = exports.Declarations = exports.Stylesheet = exports.Identifier = exports.Nodelist = exports.Node = exports.getParentDeclaration = exports.getNodePath = exports.getNodeAtOffset = exports.ReferenceType = exports.NodeType = void 0;
+    exports.ParseErrorCollector = exports.Marker = exports.Level = exports.Module = exports.GuardCondition = exports.LessGuard = exports.ListEntry = exports.UnknownAtRule = exports.MixinDeclaration = exports.MixinReference = exports.MixinContentDeclaration = exports.MixinContentReference = exports.ExtendsReference = exports.Variable = exports.Interpolation = exports.VariableDeclaration = exports.NumericValue = exports.RatioValue = exports.HexColorValue = exports.Operator = exports.AttributeSelector = exports.Term = exports.BinaryExpression = exports.Expression = exports.PageBoxMarginBox = exports.Page = exports.SupportsCondition = exports.MediaFeature = exports.MediaCondition = exports.MediaQuery = exports.Medialist = exports.Document = exports.Supports = exports.Media = exports.Namespace = exports.ForwardVisibility = exports.Forward = exports.ModuleConfiguration = exports.Use = exports.Import = exports.KeyframeSelector = exports.Keyframe = exports.NestedProperties = exports.FontFace = exports.ViewPort = exports.FunctionDeclaration = exports.ElseStatement = exports.WhileStatement = exports.EachStatement = exports.ForStatement = exports.IfStatement = exports.FunctionArgument = exports.FunctionParameter = exports.Function = exports.Invocation = exports.Property = exports.CustomPropertyDeclaration = exports.Declaration = exports.CustomPropertySet = exports.AbstractDeclaration = exports.AtApplyRule = exports.SimpleSelector = exports.Selector = exports.RuleSet = exports.BodyDeclaration = exports.Declarations = exports.Stylesheet = exports.Identifier = exports.UnicodeRange = exports.Nodelist = exports.Node = exports.getParentDeclaration = exports.getNodePath = exports.getNodeAtOffset = exports.ReferenceType = exports.NodeType = void 0;
     var strings_1 = require("../utils/strings");
     /// <summary>
     /// Nodes for the css 2.1 specification. See for reference:
@@ -118,6 +118,7 @@ var __extends = (this && this.__extends) || (function () {
         NodeType[NodeType["Forward"] = 79] = "Forward";
         NodeType[NodeType["ForwardVisibility"] = 80] = "ForwardVisibility";
         NodeType[NodeType["Module"] = 81] = "Module";
+        NodeType[NodeType["UnicodeRange"] = 82] = "UnicodeRange";
     })(NodeType = exports.NodeType || (exports.NodeType = {}));
     var ReferenceType;
     (function (ReferenceType) {
@@ -408,6 +409,33 @@ var __extends = (this && this.__extends) || (function () {
         return Nodelist;
     }(Node));
     exports.Nodelist = Nodelist;
+    var UnicodeRange = /** @class */ (function (_super) {
+        __extends(UnicodeRange, _super);
+        function UnicodeRange(offset, length) {
+            return _super.call(this, offset, length) || this;
+        }
+        Object.defineProperty(UnicodeRange.prototype, "type", {
+            get: function () {
+                return NodeType.UnicodeRange;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        UnicodeRange.prototype.setRangeStart = function (rangeStart) {
+            return this.setNode('rangeStart', rangeStart);
+        };
+        UnicodeRange.prototype.getRangeStart = function () {
+            return this.rangeStart;
+        };
+        UnicodeRange.prototype.setRangeEnd = function (rangeEnd) {
+            return this.setNode('rangeEnd', rangeEnd);
+        };
+        UnicodeRange.prototype.getRangeEnd = function () {
+            return this.rangeEnd;
+        };
+        return UnicodeRange;
+    }(Node));
+    exports.UnicodeRange = UnicodeRange;
     var Identifier = /** @class */ (function (_super) {
         __extends(Identifier, _super);
         function Identifier(offset, length) {

package/lib/umd/parser/cssParser.js

@@ -73,6 +73,15 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
             this.prevToken = this.token;
             this.token = this.scanner.scan();
         };
+        Parser.prototype.acceptUnicodeRange = function () {
+            var token = this.scanner.tryScanUnicode();
+            if (token) {
+                this.prevToken = token;
+                this.token = this.scanner.scan();
+                return true;
+            }
+            return false;
+        };
         Parser.prototype.mark = function () {
             return {
                 prev: this.prevToken,
@@ -327,7 +336,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
             return this._parseUnknownAtRule();
         };
         Parser.prototype._parseRuleSetDeclaration = function () {
-            // https://www.w3.org/TR/css-syntax-3/#consume-a-list-of-declarations0
+            // https://www.w3.org/TR/css-syntax-3/#consume-a-list-of-declarations
             if (this.peek(cssScanner_1.TokenType.AtKeyword)) {
                 return this._parseRuleSetDeclarationAtStatement();
             }
@@ -1355,12 +1364,25 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
                     }
                     this.consumeToken();
                 }
+                else if (!this.hasWhitespace()) {
+                    break;
+                }
                 if (!node.addChild(this._parseBinaryExpr())) {
                     break;
                 }
             }
             return this.finish(node);
         };
+        Parser.prototype._parseUnicodeRange = function () {
+            if (!this.peekIdent('u')) {
+                return null;
+            }
+            var node = this.create(nodes.UnicodeRange);
+            if (!this.acceptUnicodeRange()) {
+                return null;
+            }
+            return this.finish(node);
+        };
         Parser.prototype._parseNamedLine = function () {
             // https://www.w3.org/TR/css-grid-1/#named-lines
             if (!this.peek(cssScanner_1.TokenType.BracketL)) {
@@ -1405,6 +1427,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
         };
         Parser.prototype._parseTermExpression = function () {
             return this._parseURILiteral() || // url before function
+                this._parseUnicodeRange() ||
                 this._parseFunction() || // function before ident
                 this._parseIdent() ||
                 this._parseStringLiteral() ||

package/lib/umd/parser/cssScanner.js

@@ -129,6 +129,7 @@
     var _a = 'a'.charCodeAt(0);
     var _f = 'f'.charCodeAt(0);
     var _z = 'z'.charCodeAt(0);
+    var _u = 'u'.charCodeAt(0);
     var _A = 'A'.charCodeAt(0);
     var _F = 'F'.charCodeAt(0);
     var _Z = 'Z'.charCodeAt(0);
@@ -167,6 +168,8 @@
     var _CMA = ','.charCodeAt(0);
     var _DOT = '.'.charCodeAt(0);
     var _BNG = '!'.charCodeAt(0);
+    var _QSM = '?'.charCodeAt(0);
+    var _PLS = '+'.charCodeAt(0);
     var staticTokenTable = {};
     staticTokenTable[_SEM] = TokenType.SemiColon;
     staticTokenTable[_COL] = TokenType.Colon;
@@ -245,6 +248,19 @@
             }
             return this.scanNext(offset);
         };
+        /**
+         * Read the range as described in https://www.w3.org/TR/CSS21/syndata.html#tokenization
+         * Assume the `u` has aleady been consumed
+         * @returns if reading the unicode was successful
+         */
+        Scanner.prototype.tryScanUnicode = function () {
+            var offset = this.stream.pos();
+            if (!this.stream.eos() && this._unicodeRange()) {
+                return this.finishToken(offset, TokenType.UnicodeRange);
+            }
+            this.stream.goBackTo(offset);
+            return undefined;
+        };
         Scanner.prototype.scanNext = function (offset) {
             // CDO <!--
             if (this.stream.advanceIfChars([_LAN, _BNG, _MIN, _MIN])) {
@@ -569,6 +585,26 @@
             }
             return false;
         };
+        Scanner.prototype._unicodeRange = function () {
+            // follow https://www.w3.org/TR/CSS21/syndata.html#tokenization and https://www.w3.org/TR/css-syntax-3/#urange-syntax
+            // assume u has already been parsed
+            if (this.stream.advanceIfChar(_PLS)) {
+                var isHexDigit = function (ch) { return (ch >= _0 && ch <= _9 || ch >= _a && ch <= _f || ch >= _A && ch <= _F); };
+                var codePoints = this.stream.advanceWhileChar(isHexDigit) + this.stream.advanceWhileChar(function (ch) { return ch === _QSM; });
+                if (codePoints >= 1 && codePoints <= 6) {
+                    if (this.stream.advanceIfChar(_MIN)) {
+                        var digits = this.stream.advanceWhileChar(isHexDigit);
+                        if (digits >= 1 && digits <= 6) {
+                            return true;
+                        }
+                    }
+                    else {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        };
         return Scanner;
     }());
     exports.Scanner = Scanner;

package/lib/umd/services/cssFormatter.js

@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "../cssLanguageTypes", "../beautify/beautify-css", "../utils/strings"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.format = void 0;
+    var cssLanguageTypes_1 = require("../cssLanguageTypes");
+    var beautify_css_1 = require("../beautify/beautify-css");
+    var strings_1 = require("../utils/strings");
+    function format(document, range, options) {
+        var value = document.getText();
+        var includesEnd = true;
+        var initialIndentLevel = 0;
+        var inRule = false;
+        var tabSize = options.tabSize || 4;
+        if (range) {
+            var startOffset = document.offsetAt(range.start);
+            // include all leading whitespace iff at the beginning of the line
+            var extendedStart = startOffset;
+            while (extendedStart > 0 && isWhitespace(value, extendedStart - 1)) {
+                extendedStart--;
+            }
+            if (extendedStart === 0 || isEOL(value, extendedStart - 1)) {
+                startOffset = extendedStart;
+            }
+            else {
+                // else keep at least one whitespace
+                if (extendedStart < startOffset) {
+                    startOffset = extendedStart + 1;
+                }
+            }
+            // include all following whitespace until the end of the line
+            var endOffset = document.offsetAt(range.end);
+            var extendedEnd = endOffset;
+            while (extendedEnd < value.length && isWhitespace(value, extendedEnd)) {
+                extendedEnd++;
+            }
+            if (extendedEnd === value.length || isEOL(value, extendedEnd)) {
+                endOffset = extendedEnd;
+            }
+            range = cssLanguageTypes_1.Range.create(document.positionAt(startOffset), document.positionAt(endOffset));
+            // Test if inside a rule
+            inRule = isInRule(value, startOffset);
+            includesEnd = endOffset === value.length;
+            value = value.substring(startOffset, endOffset);
+            if (startOffset !== 0) {
+                var startOfLineOffset = document.offsetAt(cssLanguageTypes_1.Position.create(range.start.line, 0));
+                initialIndentLevel = computeIndentLevel(document.getText(), startOfLineOffset, options);
+            }
+            if (inRule) {
+                value = "{\n".concat(trimLeft(value));
+            }
+        }
+        else {
+            range = cssLanguageTypes_1.Range.create(cssLanguageTypes_1.Position.create(0, 0), document.positionAt(value.length));
+        }
+        var cssOptions = {
+            indent_size: tabSize,
+            indent_char: options.insertSpaces ? ' ' : '\t',
+            end_with_newline: includesEnd && getFormatOption(options, 'insertFinalNewline', false),
+            selector_separator_newline: getFormatOption(options, 'newlineBetweenSelectors', true),
+            newline_between_rules: getFormatOption(options, 'newlineBetweenRules', true),
+            space_around_selector_separator: getFormatOption(options, 'spaceAroundSelectorSeparator', false),
+            brace_style: getFormatOption(options, 'braceStyle', 'collapse'),
+            indent_empty_lines: getFormatOption(options, 'indentEmptyLines', false),
+            max_preserve_newlines: getFormatOption(options, 'maxPreserveNewLines', undefined),
+            preserve_newlines: getFormatOption(options, 'preserveNewLines', true),
+            wrap_line_length: getFormatOption(options, 'wrapLineLength', undefined),
+            eol: '\n'
+        };
+        var result = (0, beautify_css_1.css_beautify)(value, cssOptions);
+        if (inRule) {
+            result = trimLeft(result.substring(2));
+        }
+        if (initialIndentLevel > 0) {
+            var indent = options.insertSpaces ? (0, strings_1.repeat)(' ', tabSize * initialIndentLevel) : (0, strings_1.repeat)('\t', initialIndentLevel);
+            result = result.split('\n').join('\n' + indent);
+            if (range.start.character === 0) {
+                result = indent + result; // keep the indent
+            }
+        }
+        return [{
+                range: range,
+                newText: result
+            }];
+    }
+    exports.format = format;
+    function trimLeft(str) {
+        return str.replace(/^\s+/, '');
+    }
+    var _CUL = '{'.charCodeAt(0);
+    var _CUR = '}'.charCodeAt(0);
+    function isInRule(str, offset) {
+        while (offset >= 0) {
+            var ch = str.charCodeAt(offset);
+            if (ch === _CUL) {
+                return true;
+            }
+            else if (ch === _CUR) {
+                return false;
+            }
+            offset--;
+        }
+        return false;
+    }
+    function getFormatOption(options, key, dflt) {
+        if (options && options.hasOwnProperty(key)) {
+            var value = options[key];
+            if (value !== null) {
+                return value;
+            }
+        }
+        return dflt;
+    }
+    function computeIndentLevel(content, offset, options) {
+        var i = offset;
+        var nChars = 0;
+        var tabSize = options.tabSize || 4;
+        while (i < content.length) {
+            var ch = content.charAt(i);
+            if (ch === ' ') {
+                nChars++;
+            }
+            else if (ch === '\t') {
+                nChars += tabSize;
+            }
+            else {
+                break;
+            }
+            i++;
+        }
+        return Math.floor(nChars / tabSize);
+    }
+    function isEOL(text, offset) {
+        return '\r\n'.indexOf(text.charAt(offset)) !== -1;
+    }
+    function isWhitespace(text, offset) {
+        return ' \t'.indexOf(text.charAt(offset)) !== -1;
+    }
+});

package/lib/umd/utils/strings.js

@@ -13,7 +13,7 @@
      *--------------------------------------------------------------------------------------------*/
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.trim = exports.getLimitedString = exports.difference = exports.endsWith = exports.startsWith = void 0;
+    exports.repeat = exports.trim = exports.getLimitedString = exports.difference = exports.endsWith = exports.startsWith = void 0;
     function startsWith(haystack, needle) {
         if (haystack.length < needle.length) {
             return false;
@@ -107,4 +107,16 @@
         return str;
     }
     exports.trim = trim;
+    function repeat(value, count) {
+        var s = '';
+        while (count > 0) {
+            if ((count & 1) === 1) {
+                s += value;
+            }
+            value += value;
+            count = count >>> 1;
+        }
+        return s;
+    }
+    exports.repeat = repeat;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-css-languageservice",
-  "version": "5.1.13",
+  "version": "5.4.1",
   "description": "Language service for CSS, LESS and SCSS",
   "main": "./lib/umd/cssLanguageService.js",
   "typings": "./lib/umd/cssLanguageService",
@@ -17,34 +17,38 @@
   "devDependencies": {
     "@types/mocha": "^9.1.0",
     "@types/node": "^10.12.21",
-    "@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",
+    "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/parser": "^5.17.0",
+    "@vscode/web-custom-data": "^0.3.9",
+    "eslint": "^8.11.0",
+    "js-beautify": "^1.14.2",
+    "mocha": "^9.2.2",
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "vscode-languageserver-textdocument": "^1.0.1",
+    "vscode-languageserver-textdocument": "^1.0.4",
     "vscode-languageserver-types": "^3.16.0",
     "vscode-nls": "^5.0.0",
-    "vscode-uri": "^3.0.2"
+    "vscode-uri": "^3.0.3"
   },
   "scripts": {
     "prepublishOnly": "npm run clean && npm run compile-esm && npm run test && npm run remove-sourcemap-refs",
     "postpublish": "node ./build/post-publish.js",
-    "compile": "tsc -p ./src && npm run lint",
+    "compile": "tsc -p ./src && npm run copy-jsbeautify && npm run lint ",
     "compile-esm": "tsc -p ./src/tsconfig.esm.json",
     "clean": "rimraf lib",
     "remove-sourcemap-refs": "node ./build/remove-sourcemap-refs.js",
-    "watch": "tsc -w -p ./src",
+    "watch": "npm run copy-jsbeautify && tsc -w -p ./src",
     "test": "npm run compile && mocha",
     "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 -D && node ./build/generateData.js",
     "install-types-next": "yarn add vscode-languageserver-types@next -f -S && yarn add vscode-languageserver-textdocument@next -f -S",
+    "copy-jsbeautify": "node ./build/copy-jsbeautify.js",
+    "update-jsbeautify": "yarn add js-beautify && node ./build/update-jsbeautify.js",
+    "update-jsbeautify-next": "yarn add js-beautify@next && node ./build/update-jsbeautify.js",
     "preversion": "npm test",
     "postversion": "git push && git push --tags"
   }

package/thirdpartynotices.txt

@@ -0,0 +1,29 @@
+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+
+vscode-css-languageservice incorporates third party material from the projects listed below. The original copyright
+notice and the license under which Microsoft received such third party material are set forth below. Microsoft
+reserves all other rights not expressly granted, whether by implication, estoppel or otherwise. 
+ 
+1. JS Beautifier (https://github.com/beautify-web/js-beautify)
+
+The MIT License (MIT)
+
+Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.