vscode-css-languageservice 5.4.2 → 6.1.0

package/lib/umd/services/cssFolding.js

@@ -14,11 +14,11 @@
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getFoldingRanges = void 0;
-    var cssScanner_1 = require("../parser/cssScanner");
-    var scssScanner_1 = require("../parser/scssScanner");
-    var lessScanner_1 = require("../parser/lessScanner");
+    const cssScanner_1 = require("../parser/cssScanner");
+    const scssScanner_1 = require("../parser/scssScanner");
+    const lessScanner_1 = require("../parser/lessScanner");
     function getFoldingRanges(document, context) {
-        var ranges = computeFoldingRanges(document);
+        const ranges = computeFoldingRanges(document);
         return limitFoldingRanges(ranges, context);
     }
     exports.getFoldingRanges = getFoldingRanges;
@@ -40,27 +40,27 @@
             }
         }
         function tokenToRange(t, kind) {
-            var startLine = getStartLine(t);
-            var endLine = getEndLine(t);
+            const startLine = getStartLine(t);
+            const endLine = getEndLine(t);
             if (startLine !== endLine) {
                 return {
-                    startLine: startLine,
-                    endLine: endLine,
-                    kind: kind
+                    startLine,
+                    endLine,
+                    kind
                 };
             }
             else {
                 return null;
             }
         }
-        var ranges = [];
-        var delimiterStack = [];
-        var scanner = getScanner();
+        const ranges = [];
+        const delimiterStack = [];
+        const scanner = getScanner();
         scanner.ignoreComment = false;
         scanner.setSource(document.getText());
-        var token = scanner.scan();
-        var prevToken = null;
-        var _loop_1 = function () {
+        let token = scanner.scan();
+        let prevToken = null;
+        while (token.type !== cssScanner_1.TokenType.EOF) {
             switch (token.type) {
                 case cssScanner_1.TokenType.CurlyL:
                 case scssScanner_1.InterpolationFunction:
@@ -70,11 +70,11 @@
                     }
                 case cssScanner_1.TokenType.CurlyR: {
                     if (delimiterStack.length !== 0) {
-                        var prevDelimiter = popPrevStartDelimiterOfType(delimiterStack, 'brace');
+                        const prevDelimiter = popPrevStartDelimiterOfType(delimiterStack, 'brace');
                         if (!prevDelimiter) {
                             break;
                         }
-                        var endLine = getEndLine(token);
+                        let endLine = getEndLine(token);
                         if (prevDelimiter.type === 'brace') {
                             /**
                              * Other than the case when curly brace is not on a new line by itself, for example
@@ -88,7 +88,7 @@
                             if (prevDelimiter.line !== endLine) {
                                 ranges.push({
                                     startLine: prevDelimiter.line,
-                                    endLine: endLine,
+                                    endLine,
                                     kind: undefined
                                 });
                             }
@@ -101,7 +101,7 @@
                  * All comments are marked as `Comment`
                  */
                 case cssScanner_1.TokenType.Comment: {
-                    var commentRegionMarkerToDelimiter_1 = function (marker) {
+                    const commentRegionMarkerToDelimiter = (marker) => {
                         if (marker === '#region') {
                             return { line: getStartLine(token), type: 'comment', isStart: true };
                         }
@@ -109,20 +109,20 @@
                             return { line: getEndLine(token), type: 'comment', isStart: false };
                         }
                     };
-                    var getCurrDelimiter = function (token) {
-                        var matches = token.text.match(/^\s*\/\*\s*(#region|#endregion)\b\s*(.*?)\s*\*\//);
+                    const getCurrDelimiter = (token) => {
+                        const matches = token.text.match(/^\s*\/\*\s*(#region|#endregion)\b\s*(.*?)\s*\*\//);
                         if (matches) {
-                            return commentRegionMarkerToDelimiter_1(matches[1]);
+                            return commentRegionMarkerToDelimiter(matches[1]);
                         }
                         else if (document.languageId === 'scss' || document.languageId === 'less') {
-                            var matches_1 = token.text.match(/^\s*\/\/\s*(#region|#endregion)\b\s*(.*?)\s*/);
-                            if (matches_1) {
-                                return commentRegionMarkerToDelimiter_1(matches_1[1]);
+                            const matches = token.text.match(/^\s*\/\/\s*(#region|#endregion)\b\s*(.*?)\s*/);
+                            if (matches) {
+                                return commentRegionMarkerToDelimiter(matches[1]);
                             }
                         }
                         return null;
                     };
-                    var currDelimiter = getCurrDelimiter(token);
+                    const currDelimiter = getCurrDelimiter(token);
                     // /* */ comment region folding
                     // All #region and #endregion cases
                     if (currDelimiter) {
@@ -130,7 +130,7 @@
                             delimiterStack.push(currDelimiter);
                         }
                         else {
-                            var prevDelimiter = popPrevStartDelimiterOfType(delimiterStack, 'comment');
+                            const prevDelimiter = popPrevStartDelimiterOfType(delimiterStack, 'comment');
                             if (!prevDelimiter) {
                                 break;
                             }
@@ -147,7 +147,7 @@
                     }
                     // Multiline comment case
                     else {
-                        var range = tokenToRange(token, 'comment');
+                        const range = tokenToRange(token, 'comment');
                         if (range) {
                             ranges.push(range);
                         }
@@ -157,9 +157,6 @@
             }
             prevToken = token;
             token = scanner.scan();
-        };
-        while (token.type !== cssScanner_1.TokenType.EOF) {
-            _loop_1();
         }
         return ranges;
     }
@@ -167,7 +164,7 @@
         if (stack.length === 0) {
             return null;
         }
-        for (var i = stack.length - 1; i >= 0; i--) {
+        for (let i = stack.length - 1; i >= 0; i--) {
             if (stack[i].type === type && stack[i].isStart) {
                 return stack.splice(i, 1)[0];
             }
@@ -180,17 +177,17 @@
      * - If limit exceeds, only return `rangeLimit` amount of ranges
      */
     function limitFoldingRanges(ranges, context) {
-        var maxRanges = context && context.rangeLimit || Number.MAX_VALUE;
-        var sortedRanges = ranges.sort(function (r1, r2) {
-            var diff = r1.startLine - r2.startLine;
+        const maxRanges = context && context.rangeLimit || Number.MAX_VALUE;
+        const sortedRanges = ranges.sort((r1, r2) => {
+            let diff = r1.startLine - r2.startLine;
             if (diff === 0) {
                 diff = r1.endLine - r2.endLine;
             }
             return diff;
         });
-        var validRanges = [];
-        var prevEndLine = -1;
-        sortedRanges.forEach(function (r) {
+        const validRanges = [];
+        let prevEndLine = -1;
+        sortedRanges.forEach(r => {
             if (!(r.startLine < prevEndLine && prevEndLine < r.endLine)) {
                 validRanges.push(r);
                 prevEndLine = r.endLine;

package/lib/umd/services/cssFormatter.js

@@ -14,19 +14,19 @@
     "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");
+    const cssLanguageTypes_1 = require("../cssLanguageTypes");
+    const beautify_css_1 = require("../beautify/beautify-css");
+    const 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;
+        let value = document.getText();
+        let includesEnd = true;
+        let initialIndentLevel = 0;
+        let inRule = false;
+        const tabSize = options.tabSize || 4;
         if (range) {
-            var startOffset = document.offsetAt(range.start);
+            let startOffset = document.offsetAt(range.start);
             // include all leading whitespace iff at the beginning of the line
-            var extendedStart = startOffset;
+            let extendedStart = startOffset;
             while (extendedStart > 0 && isWhitespace(value, extendedStart - 1)) {
                 extendedStart--;
             }
@@ -40,8 +40,8 @@
                 }
             }
             // include all following whitespace until the end of the line
-            var endOffset = document.offsetAt(range.end);
-            var extendedEnd = endOffset;
+            let endOffset = document.offsetAt(range.end);
+            let extendedEnd = endOffset;
             while (extendedEnd < value.length && isWhitespace(value, extendedEnd)) {
                 extendedEnd++;
             }
@@ -54,17 +54,17 @@
             includesEnd = endOffset === value.length;
             value = value.substring(startOffset, endOffset);
             if (startOffset !== 0) {
-                var startOfLineOffset = document.offsetAt(cssLanguageTypes_1.Position.create(range.start.line, 0));
+                const startOfLineOffset = document.offsetAt(cssLanguageTypes_1.Position.create(range.start.line, 0));
                 initialIndentLevel = computeIndentLevel(document.getText(), startOfLineOffset, options);
             }
             if (inRule) {
-                value = "{\n".concat(trimLeft(value));
+                value = `{\n${trimLeft(value)}`;
             }
         }
         else {
             range = cssLanguageTypes_1.Range.create(cssLanguageTypes_1.Position.create(0, 0), document.positionAt(value.length));
         }
-        var cssOptions = {
+        const cssOptions = {
             indent_size: tabSize,
             indent_char: options.insertSpaces ? ' ' : '\t',
             end_with_newline: includesEnd && getFormatOption(options, 'insertFinalNewline', false),
@@ -78,12 +78,12 @@
             wrap_line_length: getFormatOption(options, 'wrapLineLength', undefined),
             eol: '\n'
         };
-        var result = (0, beautify_css_1.css_beautify)(value, cssOptions);
+        let 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);
+            const 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
@@ -98,11 +98,11 @@
     function trimLeft(str) {
         return str.replace(/^\s+/, '');
     }
-    var _CUL = '{'.charCodeAt(0);
-    var _CUR = '}'.charCodeAt(0);
+    const _CUL = '{'.charCodeAt(0);
+    const _CUR = '}'.charCodeAt(0);
     function isInRule(str, offset) {
         while (offset >= 0) {
-            var ch = str.charCodeAt(offset);
+            const ch = str.charCodeAt(offset);
             if (ch === _CUL) {
                 return true;
             }
@@ -115,7 +115,7 @@
     }
     function getFormatOption(options, key, dflt) {
         if (options && options.hasOwnProperty(key)) {
-            var value = options[key];
+            const value = options[key];
             if (value !== null) {
                 return value;
             }
@@ -123,11 +123,11 @@
         return dflt;
     }
     function computeIndentLevel(content, offset, options) {
-        var i = offset;
-        var nChars = 0;
-        var tabSize = options.tabSize || 4;
+        let i = offset;
+        let nChars = 0;
+        const tabSize = options.tabSize || 4;
         while (i < content.length) {
-            var ch = content.charAt(i);
+            const ch = content.charAt(i);
             if (ch === ' ') {
                 nChars++;
             }

package/lib/umd/services/cssHover.js

@@ -14,35 +14,34 @@
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.CSSHover = void 0;
-    var nodes = require("../parser/cssNodes");
-    var languageFacts = require("../languageFacts/facts");
-    var selectorPrinting_1 = require("./selectorPrinting");
-    var strings_1 = require("../utils/strings");
-    var cssLanguageTypes_1 = require("../cssLanguageTypes");
-    var objects_1 = require("../utils/objects");
-    var CSSHover = /** @class */ (function () {
-        function CSSHover(clientCapabilities, cssDataManager) {
+    const nodes = require("../parser/cssNodes");
+    const languageFacts = require("../languageFacts/facts");
+    const selectorPrinting_1 = require("./selectorPrinting");
+    const strings_1 = require("../utils/strings");
+    const cssLanguageTypes_1 = require("../cssLanguageTypes");
+    const objects_1 = require("../utils/objects");
+    class CSSHover {
+        constructor(clientCapabilities, cssDataManager) {
             this.clientCapabilities = clientCapabilities;
             this.cssDataManager = cssDataManager;
             this.selectorPrinting = new selectorPrinting_1.SelectorPrinting(cssDataManager);
         }
-        CSSHover.prototype.configure = function (settings) {
+        configure(settings) {
             this.defaultSettings = settings;
-        };
-        CSSHover.prototype.doHover = function (document, position, stylesheet, settings) {
-            if (settings === void 0) { settings = this.defaultSettings; }
+        }
+        doHover(document, position, stylesheet, settings = this.defaultSettings) {
             function getRange(node) {
                 return cssLanguageTypes_1.Range.create(document.positionAt(node.offset), document.positionAt(node.end));
             }
-            var offset = document.offsetAt(position);
-            var nodepath = nodes.getNodePath(stylesheet, offset);
+            const offset = document.offsetAt(position);
+            const nodepath = nodes.getNodePath(stylesheet, offset);
             /**
              * nodepath is top-down
              * Build up the hover by appending inner node's information
              */
-            var hover = null;
-            for (var i = 0; i < nodepath.length; i++) {
-                var node = nodepath[i];
+            let hover = null;
+            for (let i = 0; i < nodepath.length; i++) {
+                const node = nodepath[i];
                 if (node instanceof nodes.Selector) {
                     hover = {
                         contents: this.selectorPrinting.selectorToMarkedString(node),
@@ -63,13 +62,13 @@
                     break;
                 }
                 if (node instanceof nodes.Declaration) {
-                    var propertyName = node.getFullPropertyName();
-                    var entry = this.cssDataManager.getProperty(propertyName);
+                    const propertyName = node.getFullPropertyName();
+                    const entry = this.cssDataManager.getProperty(propertyName);
                     if (entry) {
-                        var contents = languageFacts.getEntryDescription(entry, this.doesSupportMarkdown(), settings);
+                        const contents = languageFacts.getEntryDescription(entry, this.doesSupportMarkdown(), settings);
                         if (contents) {
                             hover = {
-                                contents: contents,
+                                contents,
                                 range: getRange(node)
                             };
                         }
@@ -80,13 +79,13 @@
                     continue;
                 }
                 if (node instanceof nodes.UnknownAtRule) {
-                    var atRuleName = node.getText();
-                    var entry = this.cssDataManager.getAtDirective(atRuleName);
+                    const atRuleName = node.getText();
+                    const entry = this.cssDataManager.getAtDirective(atRuleName);
                     if (entry) {
-                        var contents = languageFacts.getEntryDescription(entry, this.doesSupportMarkdown(), settings);
+                        const contents = languageFacts.getEntryDescription(entry, this.doesSupportMarkdown(), settings);
                         if (contents) {
                             hover = {
-                                contents: contents,
+                                contents,
                                 range: getRange(node)
                             };
                         }
@@ -97,15 +96,15 @@
                     continue;
                 }
                 if (node instanceof nodes.Node && node.type === nodes.NodeType.PseudoSelector) {
-                    var selectorName = node.getText();
-                    var entry = selectorName.slice(0, 2) === '::'
+                    const selectorName = node.getText();
+                    const entry = selectorName.slice(0, 2) === '::'
                         ? this.cssDataManager.getPseudoElement(selectorName)
                         : this.cssDataManager.getPseudoClass(selectorName);
                     if (entry) {
-                        var contents = languageFacts.getEntryDescription(entry, this.doesSupportMarkdown(), settings);
+                        const contents = languageFacts.getEntryDescription(entry, this.doesSupportMarkdown(), settings);
                         if (contents) {
                             hover = {
-                                contents: contents,
+                                contents,
                                 range: getRange(node)
                             };
                         }
@@ -120,8 +119,8 @@
                 hover.contents = this.convertContents(hover.contents);
             }
             return hover;
-        };
-        CSSHover.prototype.convertContents = function (contents) {
+        }
+        convertContents(contents) {
             if (!this.doesSupportMarkdown()) {
                 if (typeof contents === 'string') {
                     return contents;
@@ -135,7 +134,7 @@
                 }
                 // MarkedString[]
                 else if (Array.isArray(contents)) {
-                    return contents.map(function (c) {
+                    return contents.map(c => {
                         return typeof c === 'string' ? c : c.value;
                     });
                 }
@@ -145,19 +144,18 @@
                 }
             }
             return contents;
-        };
-        CSSHover.prototype.doesSupportMarkdown = function () {
+        }
+        doesSupportMarkdown() {
             if (!(0, objects_1.isDefined)(this.supportsMarkdown)) {
                 if (!(0, objects_1.isDefined)(this.clientCapabilities)) {
                     this.supportsMarkdown = true;
                     return this.supportsMarkdown;
                 }
-                var hover = this.clientCapabilities.textDocument && this.clientCapabilities.textDocument.hover;
+                const hover = this.clientCapabilities.textDocument && this.clientCapabilities.textDocument.hover;
                 this.supportsMarkdown = hover && hover.contentFormat && Array.isArray(hover.contentFormat) && hover.contentFormat.indexOf(cssLanguageTypes_1.MarkupKind.Markdown) !== -1;
             }
             return this.supportsMarkdown;
-        };
-        return CSSHover;
-    }());
+        }
+    }
     exports.CSSHover = CSSHover;
 });