vscode-css-languageservice 5.4.2 → 6.1.0

package/lib/esm/utils/strings.js

@@ -7,7 +7,7 @@ export function startsWith(haystack, needle) {
     if (haystack.length < needle.length) {
         return false;
     }
-    for (var i = 0; i < needle.length; i++) {
+    for (let i = 0; i < needle.length; i++) {
         if (haystack[i] !== needle[i]) {
             return false;
         }
@@ -18,7 +18,7 @@ export function startsWith(haystack, needle) {
  * Determines if haystack ends with needle.
  */
 export function endsWith(haystack, needle) {
-    var diff = haystack.length - needle.length;
+    let diff = haystack.length - needle.length;
     if (diff > 0) {
         return haystack.lastIndexOf(needle) === diff;
     }
@@ -39,17 +39,16 @@ export function endsWith(haystack, needle) {
  * @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);
+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.
-    var LCS = [];
-    var zeroArray = [];
-    var i, j;
+    let LCS = [];
+    let zeroArray = [];
+    let i, j;
     for (i = 0; i < second.length + 1; ++i) {
         zeroArray.push(0);
     }
@@ -71,8 +70,7 @@ export function difference(first, second, maxLenDelta) {
 /**
  * Limit of string length.
  */
-export function getLimitedString(str, ellipsis) {
-    if (ellipsis === void 0) { ellipsis = true; }
+export function getLimitedString(str, ellipsis = true) {
     if (!str) {
         return '';
     }
@@ -85,14 +83,14 @@ export function getLimitedString(str, ellipsis) {
  * Limit of string length.
  */
 export function trim(str, regexp) {
-    var m = regexp.exec(str);
+    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) {
-    var s = '';
+    let s = '';
     while (count > 0) {
         if ((count & 1) === 1) {
             s += value;

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

@@ -1,5 +1,5 @@
 // copied from js-beautify/js/lib/beautify-css.js
-// version: 1.14.3
+// version: 1.14.6
 /* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
@@ -1093,6 +1093,7 @@ function Beautifier(source_text, options) {
     "@document": true
   };
   this.NON_SEMICOLON_NEWLINE_PROPERTY = [
+    "grid-template-areas",
     "grid-template"
   ];
 
@@ -1424,7 +1425,8 @@ Beautifier.prototype.beautify = function() {
         }
       }
     } else if (this._ch === '"' || this._ch === '\'') {
-      this.preserveSingleSpace(isAfterSpace);
+      var preserveQuoteSpace = previous_ch === '"' || previous_ch === '\'';
+      this.preserveSingleSpace(preserveQuoteSpace || isAfterSpace);
       this.print_string(this._ch + this.eatString(this._ch));
       this.eatWhitespace(true);
     } else if (this._ch === ';') {
@@ -1468,7 +1470,12 @@ Beautifier.prototype.beautify = function() {
           }
         }
       } else {
-        this.preserveSingleSpace(isAfterSpace);
+        var space_needed = false;
+        if (this._input.lookBack("with")) {
+          // look back is not an accurate solution, we need tokens to confirm without whitespaces
+          space_needed = true;
+        }
+        this.preserveSingleSpace(isAfterSpace || space_needed);
         this.print_string(this._ch);
 
         // handle scss/sass map
@@ -1526,7 +1533,7 @@ Beautifier.prototype.beautify = function() {
         this._ch = '';
       }
     } else if (this._ch === '!' && !this._input.lookBack("\\")) { // !important
-      this.print_string(' ');
+      this._output.space_before_token = true;
       this.print_string(this._ch);
     } else {
       var preserveAfterSpace = previous_ch === '"' || previous_ch === '\'';

package/lib/umd/cssLanguageService.d.ts

@@ -1,4 +1,4 @@
-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';
+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, DocumentSymbol } from './cssLanguageTypes';
 export declare type Stylesheet = {};
 export * from './cssLanguageTypes';
 export interface LanguageService {
@@ -19,6 +19,7 @@ export interface LanguageService {
      */
     findDocumentLinks2(document: TextDocument, stylesheet: Stylesheet, documentContext: DocumentContext): Promise<DocumentLink[]>;
     findDocumentSymbols(document: TextDocument, stylesheet: Stylesheet): SymbolInformation[];
+    findDocumentSymbols2(document: TextDocument, stylesheet: Stylesheet): DocumentSymbol[];
     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[];

package/lib/umd/cssLanguageService.js

@@ -1,6 +1,10 @@
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -24,23 +28,23 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getLESSLanguageService = exports.getSCSSLanguageService = exports.getCSSLanguageService = exports.newCSSDataProvider = exports.getDefaultCSSDataProvider = void 0;
-    var cssParser_1 = require("./parser/cssParser");
-    var cssCompletion_1 = require("./services/cssCompletion");
-    var cssHover_1 = require("./services/cssHover");
-    var cssNavigation_1 = require("./services/cssNavigation");
-    var cssCodeActions_1 = require("./services/cssCodeActions");
-    var cssValidation_1 = require("./services/cssValidation");
-    var scssParser_1 = require("./parser/scssParser");
-    var scssCompletion_1 = require("./services/scssCompletion");
-    var lessParser_1 = require("./parser/lessParser");
-    var lessCompletion_1 = require("./services/lessCompletion");
-    var cssFolding_1 = require("./services/cssFolding");
-    var cssFormatter_1 = require("./services/cssFormatter");
-    var dataManager_1 = require("./languageFacts/dataManager");
-    var dataProvider_1 = require("./languageFacts/dataProvider");
-    var cssSelectionRange_1 = require("./services/cssSelectionRange");
-    var scssNavigation_1 = require("./services/scssNavigation");
-    var webCustomData_1 = require("./data/webCustomData");
+    const cssParser_1 = require("./parser/cssParser");
+    const cssCompletion_1 = require("./services/cssCompletion");
+    const cssHover_1 = require("./services/cssHover");
+    const cssNavigation_1 = require("./services/cssNavigation");
+    const cssCodeActions_1 = require("./services/cssCodeActions");
+    const cssValidation_1 = require("./services/cssValidation");
+    const scssParser_1 = require("./parser/scssParser");
+    const scssCompletion_1 = require("./services/scssCompletion");
+    const lessParser_1 = require("./parser/lessParser");
+    const lessCompletion_1 = require("./services/lessCompletion");
+    const cssFolding_1 = require("./services/cssFolding");
+    const cssFormatter_1 = require("./services/cssFormatter");
+    const dataManager_1 = require("./languageFacts/dataManager");
+    const dataProvider_1 = require("./languageFacts/dataProvider");
+    const cssSelectionRange_1 = require("./services/cssSelectionRange");
+    const scssNavigation_1 = require("./services/scssNavigation");
+    const webCustomData_1 = require("./data/webCustomData");
     __exportStar(require("./cssLanguageTypes"), exports);
     function getDefaultCSSDataProvider() {
         return newCSSDataProvider(webCustomData_1.cssData);
@@ -52,10 +56,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     exports.newCSSDataProvider = newCSSDataProvider;
     function createFacade(parser, completion, hover, navigation, codeActions, validation, cssDataManager) {
         return {
-            configure: function (settings) {
+            configure: (settings) => {
                 validation.configure(settings);
-                completion.configure(settings === null || settings === void 0 ? void 0 : settings.completion);
-                hover.configure(settings === null || settings === void 0 ? void 0 : settings.hover);
+                completion.configure(settings?.completion);
+                hover.configure(settings?.hover);
             },
             setDataProviders: cssDataManager.setDataProviders.bind(cssDataManager),
             doValidation: validation.doValidation.bind(validation),
@@ -70,7 +74,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
             findDocumentHighlights: navigation.findDocumentHighlights.bind(navigation),
             findDocumentLinks: navigation.findDocumentLinks.bind(navigation),
             findDocumentLinks2: navigation.findDocumentLinks2.bind(navigation),
-            findDocumentSymbols: navigation.findDocumentSymbols.bind(navigation),
+            findDocumentSymbols: navigation.findSymbolInformations.bind(navigation),
+            findDocumentSymbols2: navigation.findDocumentSymbols.bind(navigation),
             doCodeActions: codeActions.doCodeActions.bind(codeActions),
             doCodeActions2: codeActions.doCodeActions2.bind(codeActions),
             findDocumentColors: navigation.findDocumentColors.bind(navigation),
@@ -80,22 +85,19 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
             getSelectionRanges: cssSelectionRange_1.getSelectionRanges
         };
     }
-    var defaultLanguageServiceOptions = {};
-    function getCSSLanguageService(options) {
-        if (options === void 0) { options = defaultLanguageServiceOptions; }
-        var cssDataManager = new dataManager_1.CSSDataManager(options);
+    const defaultLanguageServiceOptions = {};
+    function getCSSLanguageService(options = defaultLanguageServiceOptions) {
+        const cssDataManager = new dataManager_1.CSSDataManager(options);
         return createFacade(new cssParser_1.Parser(), new cssCompletion_1.CSSCompletion(null, options, cssDataManager), new cssHover_1.CSSHover(options && options.clientCapabilities, cssDataManager), new cssNavigation_1.CSSNavigation(options && options.fileSystemProvider, false), new cssCodeActions_1.CSSCodeActions(cssDataManager), new cssValidation_1.CSSValidation(cssDataManager), cssDataManager);
     }
     exports.getCSSLanguageService = getCSSLanguageService;
-    function getSCSSLanguageService(options) {
-        if (options === void 0) { options = defaultLanguageServiceOptions; }
-        var cssDataManager = new dataManager_1.CSSDataManager(options);
+    function getSCSSLanguageService(options = defaultLanguageServiceOptions) {
+        const cssDataManager = new dataManager_1.CSSDataManager(options);
         return createFacade(new scssParser_1.SCSSParser(), new scssCompletion_1.SCSSCompletion(options, cssDataManager), new cssHover_1.CSSHover(options && options.clientCapabilities, cssDataManager), new scssNavigation_1.SCSSNavigation(options && options.fileSystemProvider), new cssCodeActions_1.CSSCodeActions(cssDataManager), new cssValidation_1.CSSValidation(cssDataManager), cssDataManager);
     }
     exports.getSCSSLanguageService = getSCSSLanguageService;
-    function getLESSLanguageService(options) {
-        if (options === void 0) { options = defaultLanguageServiceOptions; }
-        var cssDataManager = new dataManager_1.CSSDataManager(options);
+    function getLESSLanguageService(options = defaultLanguageServiceOptions) {
+        const cssDataManager = new dataManager_1.CSSDataManager(options);
         return createFacade(new lessParser_1.LESSParser(), new lessCompletion_1.LESSCompletion(options, cssDataManager), new cssHover_1.CSSHover(options && options.clientCapabilities, cssDataManager), new cssNavigation_1.CSSNavigation(options && options.fileSystemProvider, true), new cssCodeActions_1.CSSCodeActions(cssDataManager), new cssValidation_1.CSSValidation(cssDataManager), cssDataManager);
     }
     exports.getLESSLanguageService = getLESSLanguageService;

package/lib/umd/cssLanguageTypes.js

@@ -13,10 +13,11 @@
      *--------------------------------------------------------------------------------------------*/
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.FileType = exports.ClientCapabilities = exports.DocumentHighlightKind = exports.VersionedTextDocumentIdentifier = exports.TextDocumentEdit = exports.CodeActionKind = exports.TextEdit = exports.WorkspaceEdit = exports.DocumentLink = exports.DocumentHighlight = exports.CodeAction = exports.Command = exports.CodeActionContext = exports.MarkedString = exports.Hover = exports.Location = exports.DocumentSymbol = exports.SymbolKind = exports.SymbolInformation = exports.InsertTextFormat = exports.CompletionItemTag = exports.CompletionList = exports.CompletionItemKind = exports.CompletionItem = exports.DiagnosticSeverity = exports.Diagnostic = exports.SelectionRange = exports.FoldingRangeKind = exports.FoldingRange = exports.ColorPresentation = exports.ColorInformation = exports.Color = exports.MarkupKind = exports.MarkupContent = exports.Position = exports.Range = exports.TextDocument = void 0;
-    var vscode_languageserver_types_1 = require("vscode-languageserver-types");
+    exports.FileType = exports.ClientCapabilities = exports.DocumentHighlightKind = exports.VersionedTextDocumentIdentifier = exports.TextDocumentEdit = exports.CodeActionKind = exports.TextEdit = exports.WorkspaceEdit = exports.DocumentLink = exports.DocumentHighlight = exports.CodeAction = exports.Command = exports.CodeActionContext = exports.MarkedString = exports.Hover = exports.Location = exports.DocumentSymbol = exports.SymbolKind = exports.SymbolInformation = exports.InsertTextFormat = exports.CompletionItemTag = exports.CompletionList = exports.CompletionItemKind = exports.CompletionItem = exports.DiagnosticSeverity = exports.Diagnostic = exports.SelectionRange = exports.FoldingRangeKind = exports.FoldingRange = exports.ColorPresentation = exports.ColorInformation = exports.Color = exports.MarkupKind = exports.MarkupContent = exports.DocumentUri = exports.Position = exports.Range = exports.TextDocument = void 0;
+    const vscode_languageserver_types_1 = require("vscode-languageserver-types");
     Object.defineProperty(exports, "Range", { enumerable: true, get: function () { return vscode_languageserver_types_1.Range; } });
     Object.defineProperty(exports, "Position", { enumerable: true, get: function () { return vscode_languageserver_types_1.Position; } });
+    Object.defineProperty(exports, "DocumentUri", { enumerable: true, get: function () { return vscode_languageserver_types_1.DocumentUri; } });
     Object.defineProperty(exports, "MarkupContent", { enumerable: true, get: function () { return vscode_languageserver_types_1.MarkupContent; } });
     Object.defineProperty(exports, "MarkupKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.MarkupKind; } });
     Object.defineProperty(exports, "Color", { enumerable: true, get: function () { return vscode_languageserver_types_1.Color; } });
@@ -49,7 +50,7 @@
     Object.defineProperty(exports, "TextDocumentEdit", { enumerable: true, get: function () { return vscode_languageserver_types_1.TextDocumentEdit; } });
     Object.defineProperty(exports, "VersionedTextDocumentIdentifier", { enumerable: true, get: function () { return vscode_languageserver_types_1.VersionedTextDocumentIdentifier; } });
     Object.defineProperty(exports, "DocumentHighlightKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.DocumentHighlightKind; } });
-    var vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+    const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
     Object.defineProperty(exports, "TextDocument", { enumerable: true, get: function () { return vscode_languageserver_textdocument_1.TextDocument; } });
     var ClientCapabilities;
     (function (ClientCapabilities) {