vscode-css-languageservice 6.0.1 → 6.1.0

package/CHANGELOG.md

@@ -1,4 +1,6 @@
-
+6.1.0 / 2022-09-02
+================
+ * new API `LanguageService.findDocumentSymbols2`, returning `DocumentSymbol[]`
 
 6.0.0 / 2022-05-18
 ================

package/SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

package/lib/esm/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. */
 /*
 
@@ -1090,6 +1090,7 @@ function Beautifier(source_text, options) {
     "@document": true
   };
   this.NON_SEMICOLON_NEWLINE_PROPERTY = [
+    "grid-template-areas",
     "grid-template"
   ];
 
@@ -1421,7 +1422,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 === ';') {
@@ -1465,7 +1467,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
@@ -1523,7 +1530,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/esm/cssLanguageService.d.ts

@@ -1,37 +1,38 @@
-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, DocumentSymbol } 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[];
+    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[];
+    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,72 +1,73 @@
-/*---------------------------------------------------------------------------------------------
- *  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);
-}
+/*---------------------------------------------------------------------------------------------
+ *  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.findSymbolInformations.bind(navigation),
+        findDocumentSymbols2: 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);
+}