vscode-css-languageservice 5.3.0 → 6.0.0

package/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+
+6.0.0 / 2022-05-18
+================
+ * Update to `vscode-languageserver-types@3.17`
+
+5.4.0 / 2022-04-01
+==================
+  * new formatter settings: `braceStyle`, `preserveNewLines`, `maxPreserveNewLines`, `wrapLineLength`, `indentEmptyLines`
+
 5.3.0 / 2022-03-23
 ==================
   * renamed `CSSFormatConfiguration.selectorSeparatorNewline` to `CSSFormatConfiguration.newlineBetweenSelectors`

package/README.md

@@ -52,6 +52,7 @@ How can I run and debug the service?
 How can I run and debug the service inside an instance of VSCode?
 
 - run VSCode out of sources setup as described here: https://github.com/Microsoft/vscode/wiki/How-to-Contribute
+- run `yarn link` in the folder of `vscode-css-languageservice`
 - use `yarn link vscode-css-languageservice` in `vscode/extensions/css-language-features/server` to run VSCode with the latest changes from `vscode-css-languageservice`
 - run VSCode out of source (`vscode/scripts/code.sh|bat`) and open a `.css` file
 - in VSCode window that is open on the `vscode-css-languageservice` sources, run command `Debug: Attach to Node process` and pick the `code-oss` process with the `css-language-features` path

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

@@ -1,5 +1,5 @@
 // copied from js-beautify/js/lib/beautify-css.js
-// version: 1.14.0
+// version: 1.14.3
 /* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
@@ -1002,8 +1002,8 @@ module.exports.Directives = Directives;
 
 
 
-var Beautifier = __webpack_require__(16).Beautifier,
-  Options = __webpack_require__(17).Options;
+var Beautifier = (__webpack_require__(16).Beautifier),
+  Options = (__webpack_require__(17).Options);
 
 function css_beautify(source_text, options) {
   var beautifier = new Beautifier(source_text, options);
@@ -1050,10 +1050,10 @@ module.exports.defaultOptions = function() {
 
 
 
-var Options = __webpack_require__(17).Options;
-var Output = __webpack_require__(2).Output;
-var InputScanner = __webpack_require__(8).InputScanner;
-var Directives = __webpack_require__(13).Directives;
+var Options = (__webpack_require__(17).Options);
+var Output = (__webpack_require__(2).Output);
+var InputScanner = (__webpack_require__(8).InputScanner);
+var Directives = (__webpack_require__(13).Directives);
 
 var directives_core = new Directives(/\/\*/, /\*\//);
 
@@ -1089,6 +1089,9 @@ function Beautifier(source_text, options) {
     "@supports": true,
     "@document": true
   };
+  this.NON_SEMICOLON_NEWLINE_PROPERTY = [
+    "grid-template"
+  ];
 
 }
 
@@ -1213,7 +1216,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;
@@ -1265,7 +1270,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 @{...}
@@ -1336,7 +1341,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);
       }
 
@@ -1368,7 +1378,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
@@ -1401,6 +1425,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();
@@ -1442,20 +1467,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;
@@ -1489,8 +1526,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();
+      }
     }
   }
 
@@ -1536,7 +1578,7 @@ module.exports.Beautifier = Beautifier;
 
 
 
-var BaseOptions = __webpack_require__(6).Options;
+var BaseOptions = (__webpack_require__(6).Options);
 
 function Options(options) {
   BaseOptions.call(this, options, 'css');

package/lib/esm/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;

package/lib/esm/cssLanguageService.js

@@ -1,75 +1,72 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-import { Parser } from './parser/cssParser';
-import { CSSCompletion } from './services/cssCompletion';
-import { CSSHover } from './services/cssHover';
-import { CSSNavigation } from './services/cssNavigation';
-import { CSSCodeActions } from './services/cssCodeActions';
-import { CSSValidation } from './services/cssValidation';
-import { SCSSParser } from './parser/scssParser';
-import { SCSSCompletion } from './services/scssCompletion';
-import { LESSParser } from './parser/lessParser';
-import { LESSCompletion } from './services/lessCompletion';
-import { getFoldingRanges } from './services/cssFolding';
-import { format } from './services/cssFormatter';
-import { CSSDataManager } from './languageFacts/dataManager';
-import { CSSDataProvider } from './languageFacts/dataProvider';
-import { getSelectionRanges } from './services/cssSelectionRange';
-import { SCSSNavigation } from './services/scssNavigation';
-import { cssData } from './data/webCustomData';
-export * from './cssLanguageTypes';
-export function getDefaultCSSDataProvider() {
-    return newCSSDataProvider(cssData);
-}
-export function newCSSDataProvider(data) {
-    return new CSSDataProvider(data);
-}
-function createFacade(parser, completion, hover, navigation, codeActions, validation, cssDataManager) {
-    return {
-        configure: function (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);
-        },
-        setDataProviders: cssDataManager.setDataProviders.bind(cssDataManager),
-        doValidation: validation.doValidation.bind(validation),
-        parseStylesheet: parser.parseStylesheet.bind(parser),
-        doComplete: completion.doComplete.bind(completion),
-        doComplete2: completion.doComplete2.bind(completion),
-        setCompletionParticipants: completion.setCompletionParticipants.bind(completion),
-        doHover: hover.doHover.bind(hover),
-        format: format,
-        findDefinition: navigation.findDefinition.bind(navigation),
-        findReferences: navigation.findReferences.bind(navigation),
-        findDocumentHighlights: navigation.findDocumentHighlights.bind(navigation),
-        findDocumentLinks: navigation.findDocumentLinks.bind(navigation),
-        findDocumentLinks2: navigation.findDocumentLinks2.bind(navigation),
-        findDocumentSymbols: navigation.findDocumentSymbols.bind(navigation),
-        doCodeActions: codeActions.doCodeActions.bind(codeActions),
-        doCodeActions2: codeActions.doCodeActions2.bind(codeActions),
-        findDocumentColors: navigation.findDocumentColors.bind(navigation),
-        getColorPresentations: navigation.getColorPresentations.bind(navigation),
-        doRename: navigation.doRename.bind(navigation),
-        getFoldingRanges: getFoldingRanges,
-        getSelectionRanges: getSelectionRanges
-    };
-}
-var defaultLanguageServiceOptions = {};
-export function getCSSLanguageService(options) {
-    if (options === void 0) { options = defaultLanguageServiceOptions; }
-    var cssDataManager = new CSSDataManager(options);
-    return createFacade(new Parser(), new CSSCompletion(null, options, cssDataManager), new CSSHover(options && options.clientCapabilities, cssDataManager), new CSSNavigation(options && options.fileSystemProvider, false), new CSSCodeActions(cssDataManager), new CSSValidation(cssDataManager), cssDataManager);
-}
-export function getSCSSLanguageService(options) {
-    if (options === void 0) { options = defaultLanguageServiceOptions; }
-    var cssDataManager = new CSSDataManager(options);
-    return createFacade(new SCSSParser(), new SCSSCompletion(options, cssDataManager), new CSSHover(options && options.clientCapabilities, cssDataManager), new SCSSNavigation(options && options.fileSystemProvider), new CSSCodeActions(cssDataManager), new CSSValidation(cssDataManager), cssDataManager);
-}
-export function getLESSLanguageService(options) {
-    if (options === void 0) { options = defaultLanguageServiceOptions; }
-    var cssDataManager = new CSSDataManager(options);
-    return createFacade(new LESSParser(), new LESSCompletion(options, cssDataManager), new CSSHover(options && options.clientCapabilities, cssDataManager), new CSSNavigation(options && options.fileSystemProvider, true), new CSSCodeActions(cssDataManager), new CSSValidation(cssDataManager), cssDataManager);
-}
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+import { Parser } from './parser/cssParser';
+import { CSSCompletion } from './services/cssCompletion';
+import { CSSHover } from './services/cssHover';
+import { CSSNavigation } from './services/cssNavigation';
+import { CSSCodeActions } from './services/cssCodeActions';
+import { CSSValidation } from './services/cssValidation';
+import { SCSSParser } from './parser/scssParser';
+import { SCSSCompletion } from './services/scssCompletion';
+import { LESSParser } from './parser/lessParser';
+import { LESSCompletion } from './services/lessCompletion';
+import { getFoldingRanges } from './services/cssFolding';
+import { format } from './services/cssFormatter';
+import { CSSDataManager } from './languageFacts/dataManager';
+import { CSSDataProvider } from './languageFacts/dataProvider';
+import { getSelectionRanges } from './services/cssSelectionRange';
+import { SCSSNavigation } from './services/scssNavigation';
+import { cssData } from './data/webCustomData';
+export * from './cssLanguageTypes';
+export function getDefaultCSSDataProvider() {
+    return newCSSDataProvider(cssData);
+}
+export function newCSSDataProvider(data) {
+    return new CSSDataProvider(data);
+}
+function createFacade(parser, completion, hover, navigation, codeActions, validation, cssDataManager) {
+    return {
+        configure: (settings) => {
+            validation.configure(settings);
+            completion.configure(settings?.completion);
+            hover.configure(settings?.hover);
+        },
+        setDataProviders: cssDataManager.setDataProviders.bind(cssDataManager),
+        doValidation: validation.doValidation.bind(validation),
+        parseStylesheet: parser.parseStylesheet.bind(parser),
+        doComplete: completion.doComplete.bind(completion),
+        doComplete2: completion.doComplete2.bind(completion),
+        setCompletionParticipants: completion.setCompletionParticipants.bind(completion),
+        doHover: hover.doHover.bind(hover),
+        format,
+        findDefinition: navigation.findDefinition.bind(navigation),
+        findReferences: navigation.findReferences.bind(navigation),
+        findDocumentHighlights: navigation.findDocumentHighlights.bind(navigation),
+        findDocumentLinks: navigation.findDocumentLinks.bind(navigation),
+        findDocumentLinks2: navigation.findDocumentLinks2.bind(navigation),
+        findDocumentSymbols: navigation.findDocumentSymbols.bind(navigation),
+        doCodeActions: codeActions.doCodeActions.bind(codeActions),
+        doCodeActions2: codeActions.doCodeActions2.bind(codeActions),
+        findDocumentColors: navigation.findDocumentColors.bind(navigation),
+        getColorPresentations: navigation.getColorPresentations.bind(navigation),
+        doRename: navigation.doRename.bind(navigation),
+        getFoldingRanges,
+        getSelectionRanges
+    };
+}
+const defaultLanguageServiceOptions = {};
+export function getCSSLanguageService(options = defaultLanguageServiceOptions) {
+    const cssDataManager = new CSSDataManager(options);
+    return createFacade(new Parser(), new CSSCompletion(null, options, cssDataManager), new CSSHover(options && options.clientCapabilities, cssDataManager), new CSSNavigation(options && options.fileSystemProvider, false), new CSSCodeActions(cssDataManager), new CSSValidation(cssDataManager), cssDataManager);
+}
+export function getSCSSLanguageService(options = defaultLanguageServiceOptions) {
+    const cssDataManager = new CSSDataManager(options);
+    return createFacade(new SCSSParser(), new SCSSCompletion(options, cssDataManager), new CSSHover(options && options.clientCapabilities, cssDataManager), new SCSSNavigation(options && options.fileSystemProvider), new CSSCodeActions(cssDataManager), new CSSValidation(cssDataManager), cssDataManager);
+}
+export function getLESSLanguageService(options = defaultLanguageServiceOptions) {
+    const cssDataManager = new CSSDataManager(options);
+    return createFacade(new LESSParser(), new LESSCompletion(options, cssDataManager), new CSSHover(options && options.clientCapabilities, cssDataManager), new CSSNavigation(options && options.fileSystemProvider, true), new CSSCodeActions(cssDataManager), new CSSValidation(cssDataManager), cssDataManager);
+}