vscode-css-languageservice 5.4.2 → 6.1.0

package/lib/esm/services/cssFolding.js

@@ -7,7 +7,7 @@ import { TokenType, Scanner } from '../parser/cssScanner';
 import { SCSSScanner, InterpolationFunction } from '../parser/scssScanner';
 import { LESSScanner } from '../parser/lessScanner';
 export function getFoldingRanges(document, context) {
-    var ranges = computeFoldingRanges(document);
+    const ranges = computeFoldingRanges(document);
     return limitFoldingRanges(ranges, context);
 }
 function computeFoldingRanges(document) {
@@ -28,27 +28,27 @@ function computeFoldingRanges(document) {
         }
     }
     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 !== TokenType.EOF) {
         switch (token.type) {
             case TokenType.CurlyL:
             case InterpolationFunction:
@@ -58,11 +58,11 @@ function computeFoldingRanges(document) {
                 }
             case 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
@@ -76,7 +76,7 @@ function computeFoldingRanges(document) {
                         if (prevDelimiter.line !== endLine) {
                             ranges.push({
                                 startLine: prevDelimiter.line,
-                                endLine: endLine,
+                                endLine,
                                 kind: undefined
                             });
                         }
@@ -89,7 +89,7 @@ function computeFoldingRanges(document) {
              * All comments are marked as `Comment`
              */
             case TokenType.Comment: {
-                var commentRegionMarkerToDelimiter_1 = function (marker) {
+                const commentRegionMarkerToDelimiter = (marker) => {
                     if (marker === '#region') {
                         return { line: getStartLine(token), type: 'comment', isStart: true };
                     }
@@ -97,20 +97,20 @@ function computeFoldingRanges(document) {
                         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) {
@@ -118,7 +118,7 @@ function computeFoldingRanges(document) {
                         delimiterStack.push(currDelimiter);
                     }
                     else {
-                        var prevDelimiter = popPrevStartDelimiterOfType(delimiterStack, 'comment');
+                        const prevDelimiter = popPrevStartDelimiterOfType(delimiterStack, 'comment');
                         if (!prevDelimiter) {
                             break;
                         }
@@ -135,7 +135,7 @@ function computeFoldingRanges(document) {
                 }
                 // Multiline comment case
                 else {
-                    var range = tokenToRange(token, 'comment');
+                    const range = tokenToRange(token, 'comment');
                     if (range) {
                         ranges.push(range);
                     }
@@ -145,9 +145,6 @@ function computeFoldingRanges(document) {
         }
         prevToken = token;
         token = scanner.scan();
-    };
-    while (token.type !== TokenType.EOF) {
-        _loop_1();
     }
     return ranges;
 }
@@ -155,7 +152,7 @@ function popPrevStartDelimiterOfType(stack, type) {
     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];
         }
@@ -168,17 +165,17 @@ function popPrevStartDelimiterOfType(stack, type) {
  * - 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/esm/services/cssFormatter.js

@@ -6,15 +6,15 @@ import { Range, Position } from '../cssLanguageTypes';
 import { css_beautify } from '../beautify/beautify-css';
 import { repeat } from '../utils/strings';
 export 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--;
         }
@@ -28,8 +28,8 @@ export function format(document, range, options) {
             }
         }
         // 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++;
         }
@@ -42,17 +42,17 @@ export function format(document, range, options) {
         includesEnd = endOffset === value.length;
         value = value.substring(startOffset, endOffset);
         if (startOffset !== 0) {
-            var startOfLineOffset = document.offsetAt(Position.create(range.start.line, 0));
+            const startOfLineOffset = document.offsetAt(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 = Range.create(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),
@@ -66,12 +66,12 @@ export function format(document, range, options) {
         wrap_line_length: getFormatOption(options, 'wrapLineLength', undefined),
         eol: '\n'
     };
-    var result = css_beautify(value, cssOptions);
+    let result = css_beautify(value, cssOptions);
     if (inRule) {
         result = trimLeft(result.substring(2));
     }
     if (initialIndentLevel > 0) {
-        var indent = options.insertSpaces ? repeat(' ', tabSize * initialIndentLevel) : repeat('\t', initialIndentLevel);
+        const indent = options.insertSpaces ? repeat(' ', tabSize * initialIndentLevel) : repeat('\t', initialIndentLevel);
         result = result.split('\n').join('\n' + indent);
         if (range.start.character === 0) {
             result = indent + result; // keep the indent
@@ -85,11 +85,11 @@ export function format(document, range, options) {
 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;
         }
@@ -102,7 +102,7 @@ function isInRule(str, offset) {
 }
 function getFormatOption(options, key, dflt) {
     if (options && options.hasOwnProperty(key)) {
-        var value = options[key];
+        const value = options[key];
         if (value !== null) {
             return value;
         }
@@ -110,11 +110,11 @@ function getFormatOption(options, key, dflt) {
     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/esm/services/cssHover.js

@@ -9,29 +9,28 @@ import { SelectorPrinting } from './selectorPrinting';
 import { startsWith } from '../utils/strings';
 import { Range, MarkupKind } from '../cssLanguageTypes';
 import { isDefined } from '../utils/objects';
-var CSSHover = /** @class */ (function () {
-    function CSSHover(clientCapabilities, cssDataManager) {
+export class CSSHover {
+    constructor(clientCapabilities, cssDataManager) {
         this.clientCapabilities = clientCapabilities;
         this.cssDataManager = cssDataManager;
         this.selectorPrinting = new 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 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),
@@ -52,13 +51,13 @@ var CSSHover = /** @class */ (function () {
                 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)
                         };
                     }
@@ -69,13 +68,13 @@ var CSSHover = /** @class */ (function () {
                 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)
                         };
                     }
@@ -86,15 +85,15 @@ var CSSHover = /** @class */ (function () {
                 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)
                         };
                     }
@@ -109,8 +108,8 @@ var CSSHover = /** @class */ (function () {
             hover.contents = this.convertContents(hover.contents);
         }
         return hover;
-    };
-    CSSHover.prototype.convertContents = function (contents) {
+    }
+    convertContents(contents) {
         if (!this.doesSupportMarkdown()) {
             if (typeof contents === 'string') {
                 return contents;
@@ -124,7 +123,7 @@ var CSSHover = /** @class */ (function () {
             }
             // MarkedString[]
             else if (Array.isArray(contents)) {
-                return contents.map(function (c) {
+                return contents.map(c => {
                     return typeof c === 'string' ? c : c.value;
                 });
             }
@@ -134,18 +133,16 @@ var CSSHover = /** @class */ (function () {
             }
         }
         return contents;
-    };
-    CSSHover.prototype.doesSupportMarkdown = function () {
+    }
+    doesSupportMarkdown() {
         if (!isDefined(this.supportsMarkdown)) {
             if (!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(MarkupKind.Markdown) !== -1;
         }
         return this.supportsMarkdown;
-    };
-    return CSSHover;
-}());
-export { CSSHover };
+    }
+}