vscode-css-languageservice 5.4.1 → 6.0.1

package/lib/esm/utils/arrays.js

@@ -1,46 +1,40 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-/**
- * Takes a sorted array and a function p. The array is sorted in such a way that all elements where p(x) is false
- * are located before all elements where p(x) is true.
- * @returns the least x for which p(x) is true or array.length if no element fullfills the given function.
- */
-export function findFirst(array, p) {
-    var low = 0, high = array.length;
-    if (high === 0) {
-        return 0; // no children
-    }
-    while (low < high) {
-        var mid = Math.floor((low + high) / 2);
-        if (p(array[mid])) {
-            high = mid;
-        }
-        else {
-            low = mid + 1;
-        }
-    }
-    return low;
-}
-export function includes(array, item) {
-    return array.indexOf(item) !== -1;
-}
-export function union() {
-    var arrays = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        arrays[_i] = arguments[_i];
-    }
-    var result = [];
-    for (var _a = 0, arrays_1 = arrays; _a < arrays_1.length; _a++) {
-        var array = arrays_1[_a];
-        for (var _b = 0, array_1 = array; _b < array_1.length; _b++) {
-            var item = array_1[_b];
-            if (!includes(result, item)) {
-                result.push(item);
-            }
-        }
-    }
-    return result;
-}
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+/**
+ * Takes a sorted array and a function p. The array is sorted in such a way that all elements where p(x) is false
+ * are located before all elements where p(x) is true.
+ * @returns the least x for which p(x) is true or array.length if no element fullfills the given function.
+ */
+export function findFirst(array, p) {
+    let low = 0, high = array.length;
+    if (high === 0) {
+        return 0; // no children
+    }
+    while (low < high) {
+        let mid = Math.floor((low + high) / 2);
+        if (p(array[mid])) {
+            high = mid;
+        }
+        else {
+            low = mid + 1;
+        }
+    }
+    return low;
+}
+export function includes(array, item) {
+    return array.indexOf(item) !== -1;
+}
+export function union(...arrays) {
+    const result = [];
+    for (const array of arrays) {
+        for (const item of array) {
+            if (!includes(result, item)) {
+                result.push(item);
+            }
+        }
+    }
+    return result;
+}

package/lib/esm/utils/objects.js

@@ -1,11 +1,11 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-export function values(obj) {
-    return Object.keys(obj).map(function (key) { return obj[key]; });
-}
-export function isDefined(obj) {
-    return typeof obj !== 'undefined';
-}
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+export function values(obj) {
+    return Object.keys(obj).map(key => obj[key]);
+}
+export function isDefined(obj) {
+    return typeof obj !== 'undefined';
+}

package/lib/esm/utils/resources.js

@@ -1,24 +1,11 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-import { URI, Utils } from 'vscode-uri';
-export function dirname(uriString) {
-    return Utils.dirname(URI.parse(uriString)).toString();
-}
-export function joinPath(uriString) {
-    var paths = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        paths[_i - 1] = arguments[_i];
-    }
-    return Utils.joinPath.apply(Utils, __spreadArray([URI.parse(uriString)], paths, false)).toString();
-}
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { URI, Utils } from 'vscode-uri';
+export function dirname(uriString) {
+    return Utils.dirname(URI.parse(uriString)).toString();
+}
+export function joinPath(uriString, ...paths) {
+    return Utils.joinPath(URI.parse(uriString), ...paths).toString();
+}

package/lib/esm/utils/strings.js

@@ -1,104 +1,102 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-export function startsWith(haystack, needle) {
-    if (haystack.length < needle.length) {
-        return false;
-    }
-    for (var i = 0; i < needle.length; i++) {
-        if (haystack[i] !== needle[i]) {
-            return false;
-        }
-    }
-    return true;
-}
-/**
- * Determines if haystack ends with needle.
- */
-export function endsWith(haystack, needle) {
-    var diff = haystack.length - needle.length;
-    if (diff > 0) {
-        return haystack.lastIndexOf(needle) === diff;
-    }
-    else if (diff === 0) {
-        return haystack === needle;
-    }
-    else {
-        return false;
-    }
-}
-/**
- * Computes the difference score for two strings. More similar strings have a higher score.
- * We use largest common subsequence dynamic programming approach but penalize in the end for length differences.
- * Strings that have a large length difference will get a bad default score 0.
- * Complexity - both time and space O(first.length * second.length)
- * Dynamic programming LCS computation http://en.wikipedia.org/wiki/Longest_common_subsequence_problem
- *
- * @param first a string
- * @param second a string
- */
-export function difference(first, second, maxLenDelta) {
-    if (maxLenDelta === void 0) { maxLenDelta = 4; }
-    var lengthDifference = Math.abs(first.length - second.length);
-    // We only compute score if length of the currentWord and length of entry.name are similar.
-    if (lengthDifference > maxLenDelta) {
-        return 0;
-    }
-    // Initialize LCS (largest common subsequence) matrix.
-    var LCS = [];
-    var zeroArray = [];
-    var i, j;
-    for (i = 0; i < second.length + 1; ++i) {
-        zeroArray.push(0);
-    }
-    for (i = 0; i < first.length + 1; ++i) {
-        LCS.push(zeroArray);
-    }
-    for (i = 1; i < first.length + 1; ++i) {
-        for (j = 1; j < second.length + 1; ++j) {
-            if (first[i - 1] === second[j - 1]) {
-                LCS[i][j] = LCS[i - 1][j - 1] + 1;
-            }
-            else {
-                LCS[i][j] = Math.max(LCS[i - 1][j], LCS[i][j - 1]);
-            }
-        }
-    }
-    return LCS[first.length][second.length] - Math.sqrt(lengthDifference);
-}
-/**
- * Limit of string length.
- */
-export function getLimitedString(str, ellipsis) {
-    if (ellipsis === void 0) { ellipsis = true; }
-    if (!str) {
-        return '';
-    }
-    if (str.length < 140) {
-        return str;
-    }
-    return str.slice(0, 140) + (ellipsis ? '\u2026' : '');
-}
-/**
- * Limit of string length.
- */
-export function trim(str, regexp) {
-    var m = regexp.exec(str);
-    if (m && m[0].length) {
-        return str.substr(0, str.length - m[0].length);
-    }
-    return str;
-}
-export function repeat(value, count) {
-    var s = '';
-    while (count > 0) {
-        if ((count & 1) === 1) {
-            s += value;
-        }
-        value += value;
-        count = count >>> 1;
-    }
-    return s;
-}
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+export function startsWith(haystack, needle) {
+    if (haystack.length < needle.length) {
+        return false;
+    }
+    for (let i = 0; i < needle.length; i++) {
+        if (haystack[i] !== needle[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Determines if haystack ends with needle.
+ */
+export function endsWith(haystack, needle) {
+    let diff = haystack.length - needle.length;
+    if (diff > 0) {
+        return haystack.lastIndexOf(needle) === diff;
+    }
+    else if (diff === 0) {
+        return haystack === needle;
+    }
+    else {
+        return false;
+    }
+}
+/**
+ * Computes the difference score for two strings. More similar strings have a higher score.
+ * We use largest common subsequence dynamic programming approach but penalize in the end for length differences.
+ * Strings that have a large length difference will get a bad default score 0.
+ * Complexity - both time and space O(first.length * second.length)
+ * Dynamic programming LCS computation http://en.wikipedia.org/wiki/Longest_common_subsequence_problem
+ *
+ * @param first a string
+ * @param second a string
+ */
+export function difference(first, second, maxLenDelta = 4) {
+    let lengthDifference = Math.abs(first.length - second.length);
+    // We only compute score if length of the currentWord and length of entry.name are similar.
+    if (lengthDifference > maxLenDelta) {
+        return 0;
+    }
+    // Initialize LCS (largest common subsequence) matrix.
+    let LCS = [];
+    let zeroArray = [];
+    let i, j;
+    for (i = 0; i < second.length + 1; ++i) {
+        zeroArray.push(0);
+    }
+    for (i = 0; i < first.length + 1; ++i) {
+        LCS.push(zeroArray);
+    }
+    for (i = 1; i < first.length + 1; ++i) {
+        for (j = 1; j < second.length + 1; ++j) {
+            if (first[i - 1] === second[j - 1]) {
+                LCS[i][j] = LCS[i - 1][j - 1] + 1;
+            }
+            else {
+                LCS[i][j] = Math.max(LCS[i - 1][j], LCS[i][j - 1]);
+            }
+        }
+    }
+    return LCS[first.length][second.length] - Math.sqrt(lengthDifference);
+}
+/**
+ * Limit of string length.
+ */
+export function getLimitedString(str, ellipsis = true) {
+    if (!str) {
+        return '';
+    }
+    if (str.length < 140) {
+        return str;
+    }
+    return str.slice(0, 140) + (ellipsis ? '\u2026' : '');
+}
+/**
+ * Limit of string length.
+ */
+export function trim(str, regexp) {
+    const m = regexp.exec(str);
+    if (m && m[0].length) {
+        return str.substr(0, str.length - m[0].length);
+    }
+    return str;
+}
+export function repeat(value, count) {
+    let s = '';
+    while (count > 0) {
+        if ((count & 1) === 1) {
+            s += value;
+        }
+        value += value;
+        count = count >>> 1;
+    }
+    return s;
+}

package/lib/umd/beautify/beautify-css.js

@@ -1,5 +1,5 @@
 // copied from js-beautify/js/lib/beautify-css.js
-// version: 1.14.2
+// version: 1.14.3
 /* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
@@ -1092,6 +1092,9 @@ function Beautifier(source_text, options) {
     "@supports": true,
     "@document": true
   };
+  this.NON_SEMICOLON_NEWLINE_PROPERTY = [
+    "grid-template"
+  ];
 
 }
 
@@ -1216,7 +1219,9 @@ Beautifier.prototype.beautify = function() {
   var enteringConditionalGroup = false;
   var insideAtExtend = false;
   var insideAtImport = false;
+  var insideScssMap = false;
   var topCharacter = this._ch;
+  var insideNonSemiColonValues = false;
   var whitespace;
   var isAfterSpace;
   var previous_ch;
@@ -1268,7 +1273,7 @@ Beautifier.prototype.beautify = function() {
 
       // Ensures any new lines following the comment are preserved
       this.eatWhitespace(true);
-    } else if (this._ch === '@') {
+    } else if (this._ch === '@' || this._ch === '$') {
       this.preserveSingleSpace(isAfterSpace);
 
       // deal with less propery mixins @{...}
@@ -1339,7 +1344,12 @@ Beautifier.prototype.beautify = function() {
         this.indent();
         this._output.set_indent(this._indentLevel);
       } else {
-        this.indent();
+        // inside mixin and first param is object
+        if (previous_ch === '(') {
+          this._output.space_before_token = false;
+        } else if (previous_ch !== ',') {
+          this.indent();
+        }
         this.print_string(this._ch);
       }
 
@@ -1371,7 +1381,21 @@ Beautifier.prototype.beautify = function() {
           this._output.add_new_line(true);
         }
       }
+      if (this._input.peek() === ')') {
+        this._output.trim(true);
+        if (this._options.brace_style === "expand") {
+          this._output.add_new_line(true);
+        }
+      }
     } else if (this._ch === ":") {
+
+      for (var i = 0; i < this.NON_SEMICOLON_NEWLINE_PROPERTY.length; i++) {
+        if (this._input.lookBack(this.NON_SEMICOLON_NEWLINE_PROPERTY[i])) {
+          insideNonSemiColonValues = true;
+          break;
+        }
+      }
+
       if ((insideRule || enteringConditionalGroup) && !(this._input.lookBack("&") || this.foundNestedPseudoClass()) && !this._input.lookBack("(") && !insideAtExtend && parenLevel === 0) {
         // 'property: value' delimiter
         // which could be in a conditional group query
@@ -1404,6 +1428,7 @@ Beautifier.prototype.beautify = function() {
       this.print_string(this._ch + this.eatString(this._ch));
       this.eatWhitespace(true);
     } else if (this._ch === ';') {
+      insideNonSemiColonValues = false;
       if (parenLevel === 0) {
         if (insidePropertyValue) {
           this.outdent();
@@ -1445,20 +1470,32 @@ Beautifier.prototype.beautify = function() {
       } else {
         this.preserveSingleSpace(isAfterSpace);
         this.print_string(this._ch);
-        this.eatWhitespace();
-        parenLevel++;
-        this.indent();
+
+        // handle scss/sass map
+        if (insidePropertyValue && previous_ch === "$" && this._options.selector_separator_newline) {
+          this._output.add_new_line();
+          insideScssMap = true;
+        } else {
+          this.eatWhitespace();
+          parenLevel++;
+          this.indent();
+        }
       }
     } else if (this._ch === ')') {
       if (parenLevel) {
         parenLevel--;
         this.outdent();
       }
+      if (insideScssMap && this._input.peek() === ";" && this._options.selector_separator_newline) {
+        insideScssMap = false;
+        this.outdent();
+        this._output.add_new_line();
+      }
       this.print_string(this._ch);
     } else if (this._ch === ',') {
       this.print_string(this._ch);
       this.eatWhitespace(true);
-      if (this._options.selector_separator_newline && !insidePropertyValue && parenLevel === 0 && !insideAtImport && !insideAtExtend) {
+      if (this._options.selector_separator_newline && (!insidePropertyValue || insideScssMap) && parenLevel === 0 && !insideAtImport && !insideAtExtend) {
         this._output.add_new_line();
       } else {
         this._output.space_before_token = true;
@@ -1492,8 +1529,13 @@ Beautifier.prototype.beautify = function() {
       this.print_string(' ');
       this.print_string(this._ch);
     } else {
-      this.preserveSingleSpace(isAfterSpace);
+      var preserveAfterSpace = previous_ch === '"' || previous_ch === '\'';
+      this.preserveSingleSpace(preserveAfterSpace || isAfterSpace);
       this.print_string(this._ch);
+
+      if (!this._output.just_added_newline() && this._input.peek() === '\n' && insideNonSemiColonValues) {
+        this._output.add_new_line();
+      }
     }
   }
 

package/lib/umd/cssLanguageService.d.ts

@@ -1,37 +1,37 @@
-import { LanguageSettings, ICompletionParticipant, DocumentContext, LanguageServiceOptions, Diagnostic, Position, CompletionList, Hover, Location, DocumentHighlight, DocumentLink, SymbolInformation, Range, CodeActionContext, Command, CodeAction, ColorInformation, Color, ColorPresentation, WorkspaceEdit, FoldingRange, SelectionRange, TextDocument, ICSSDataProvider, CSSDataV1, HoverSettings, CompletionSettings, TextEdit, CSSFormatConfiguration } from './cssLanguageTypes';
-export declare type Stylesheet = {};
-export * from './cssLanguageTypes';
-export interface LanguageService {
-    configure(raw?: LanguageSettings): void;
-    setDataProviders(useDefaultDataProvider: boolean, customDataProviders: ICSSDataProvider[]): void;
-    doValidation(document: TextDocument, stylesheet: Stylesheet, documentSettings?: LanguageSettings): Diagnostic[];
-    parseStylesheet(document: TextDocument): Stylesheet;
-    doComplete(document: TextDocument, position: Position, stylesheet: Stylesheet, settings?: CompletionSettings): CompletionList;
-    doComplete2(document: TextDocument, position: Position, stylesheet: Stylesheet, documentContext: DocumentContext, settings?: CompletionSettings): Promise<CompletionList>;
-    setCompletionParticipants(registeredCompletionParticipants: ICompletionParticipant[]): void;
-    doHover(document: TextDocument, position: Position, stylesheet: Stylesheet, settings?: HoverSettings): Hover | null;
-    findDefinition(document: TextDocument, position: Position, stylesheet: Stylesheet): Location | null;
-    findReferences(document: TextDocument, position: Position, stylesheet: Stylesheet): Location[];
-    findDocumentHighlights(document: TextDocument, position: Position, stylesheet: Stylesheet): DocumentHighlight[];
-    findDocumentLinks(document: TextDocument, stylesheet: Stylesheet, documentContext: DocumentContext): DocumentLink[];
-    /**
-     * Return statically resolved links, and dynamically resolved links if `fsProvider` is proved.
-     */
-    findDocumentLinks2(document: TextDocument, stylesheet: Stylesheet, documentContext: DocumentContext): Promise<DocumentLink[]>;
-    findDocumentSymbols(document: TextDocument, stylesheet: Stylesheet): SymbolInformation[];
-    doCodeActions(document: TextDocument, range: Range, context: CodeActionContext, stylesheet: Stylesheet): Command[];
-    doCodeActions2(document: TextDocument, range: Range, context: CodeActionContext, stylesheet: Stylesheet): CodeAction[];
-    findDocumentColors(document: TextDocument, stylesheet: Stylesheet): ColorInformation[];
-    getColorPresentations(document: TextDocument, stylesheet: Stylesheet, color: Color, range: Range): ColorPresentation[];
-    doRename(document: TextDocument, position: Position, newName: string, stylesheet: Stylesheet): WorkspaceEdit;
-    getFoldingRanges(document: TextDocument, context?: {
-        rangeLimit?: number;
-    }): FoldingRange[];
-    getSelectionRanges(document: TextDocument, positions: Position[], stylesheet: Stylesheet): SelectionRange[];
-    format(document: TextDocument, range: Range | undefined, options: CSSFormatConfiguration): TextEdit[];
-}
-export declare function getDefaultCSSDataProvider(): ICSSDataProvider;
-export declare function newCSSDataProvider(data: CSSDataV1): ICSSDataProvider;
-export declare function getCSSLanguageService(options?: LanguageServiceOptions): LanguageService;
-export declare function getSCSSLanguageService(options?: LanguageServiceOptions): LanguageService;
-export declare function getLESSLanguageService(options?: LanguageServiceOptions): LanguageService;
+import { LanguageSettings, ICompletionParticipant, DocumentContext, LanguageServiceOptions, Diagnostic, Position, CompletionList, Hover, Location, DocumentHighlight, DocumentLink, SymbolInformation, Range, CodeActionContext, Command, CodeAction, ColorInformation, Color, ColorPresentation, WorkspaceEdit, FoldingRange, SelectionRange, TextDocument, ICSSDataProvider, CSSDataV1, HoverSettings, CompletionSettings, TextEdit, CSSFormatConfiguration } from './cssLanguageTypes';
+export declare type Stylesheet = {};
+export * from './cssLanguageTypes';
+export interface LanguageService {
+    configure(raw?: LanguageSettings): void;
+    setDataProviders(useDefaultDataProvider: boolean, customDataProviders: ICSSDataProvider[]): void;
+    doValidation(document: TextDocument, stylesheet: Stylesheet, documentSettings?: LanguageSettings): Diagnostic[];
+    parseStylesheet(document: TextDocument): Stylesheet;
+    doComplete(document: TextDocument, position: Position, stylesheet: Stylesheet, settings?: CompletionSettings): CompletionList;
+    doComplete2(document: TextDocument, position: Position, stylesheet: Stylesheet, documentContext: DocumentContext, settings?: CompletionSettings): Promise<CompletionList>;
+    setCompletionParticipants(registeredCompletionParticipants: ICompletionParticipant[]): void;
+    doHover(document: TextDocument, position: Position, stylesheet: Stylesheet, settings?: HoverSettings): Hover | null;
+    findDefinition(document: TextDocument, position: Position, stylesheet: Stylesheet): Location | null;
+    findReferences(document: TextDocument, position: Position, stylesheet: Stylesheet): Location[];
+    findDocumentHighlights(document: TextDocument, position: Position, stylesheet: Stylesheet): DocumentHighlight[];
+    findDocumentLinks(document: TextDocument, stylesheet: Stylesheet, documentContext: DocumentContext): DocumentLink[];
+    /**
+     * Return statically resolved links, and dynamically resolved links if `fsProvider` is proved.
+     */
+    findDocumentLinks2(document: TextDocument, stylesheet: Stylesheet, documentContext: DocumentContext): Promise<DocumentLink[]>;
+    findDocumentSymbols(document: TextDocument, stylesheet: Stylesheet): SymbolInformation[];
+    doCodeActions(document: TextDocument, range: Range, context: CodeActionContext, stylesheet: Stylesheet): Command[];
+    doCodeActions2(document: TextDocument, range: Range, context: CodeActionContext, stylesheet: Stylesheet): CodeAction[];
+    findDocumentColors(document: TextDocument, stylesheet: Stylesheet): ColorInformation[];
+    getColorPresentations(document: TextDocument, stylesheet: Stylesheet, color: Color, range: Range): ColorPresentation[];
+    doRename(document: TextDocument, position: Position, newName: string, stylesheet: Stylesheet): WorkspaceEdit;
+    getFoldingRanges(document: TextDocument, context?: {
+        rangeLimit?: number;
+    }): FoldingRange[];
+    getSelectionRanges(document: TextDocument, positions: Position[], stylesheet: Stylesheet): SelectionRange[];
+    format(document: TextDocument, range: Range | undefined, options: CSSFormatConfiguration): TextEdit[];
+}
+export declare function getDefaultCSSDataProvider(): ICSSDataProvider;
+export declare function newCSSDataProvider(data: CSSDataV1): ICSSDataProvider;
+export declare function getCSSLanguageService(options?: LanguageServiceOptions): LanguageService;
+export declare function getSCSSLanguageService(options?: LanguageServiceOptions): LanguageService;
+export declare function getLESSLanguageService(options?: LanguageServiceOptions): LanguageService;