vscode-css-languageservice 6.0.1 → 6.1.0

package/lib/esm/parser/scssScanner.js

@@ -1,95 +1,95 @@
-/*---------------------------------------------------------------------------------------------
- *  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 { TokenType, Scanner } from './cssScanner';
-const _FSL = '/'.charCodeAt(0);
-const _NWL = '\n'.charCodeAt(0);
-const _CAR = '\r'.charCodeAt(0);
-const _LFD = '\f'.charCodeAt(0);
-const _DLR = '$'.charCodeAt(0);
-const _HSH = '#'.charCodeAt(0);
-const _CUL = '{'.charCodeAt(0);
-const _EQS = '='.charCodeAt(0);
-const _BNG = '!'.charCodeAt(0);
-const _LAN = '<'.charCodeAt(0);
-const _RAN = '>'.charCodeAt(0);
-const _DOT = '.'.charCodeAt(0);
-const _ATS = '@'.charCodeAt(0);
-let customTokenValue = TokenType.CustomToken;
-export const VariableName = customTokenValue++;
-export const InterpolationFunction = customTokenValue++;
-export const Default = customTokenValue++;
-export const EqualsOperator = customTokenValue++;
-export const NotEqualsOperator = customTokenValue++;
-export const GreaterEqualsOperator = customTokenValue++;
-export const SmallerEqualsOperator = customTokenValue++;
-export const Ellipsis = customTokenValue++;
-export const Module = customTokenValue++;
-export class SCSSScanner extends Scanner {
-    scanNext(offset) {
-        // scss variable
-        if (this.stream.advanceIfChar(_DLR)) {
-            const content = ['$'];
-            if (this.ident(content)) {
-                return this.finishToken(offset, VariableName, content.join(''));
-            }
-            else {
-                this.stream.goBackTo(offset);
-            }
-        }
-        // scss: interpolation function #{..})
-        if (this.stream.advanceIfChars([_HSH, _CUL])) {
-            return this.finishToken(offset, InterpolationFunction);
-        }
-        // operator ==
-        if (this.stream.advanceIfChars([_EQS, _EQS])) {
-            return this.finishToken(offset, EqualsOperator);
-        }
-        // operator !=
-        if (this.stream.advanceIfChars([_BNG, _EQS])) {
-            return this.finishToken(offset, NotEqualsOperator);
-        }
-        // operators <, <=
-        if (this.stream.advanceIfChar(_LAN)) {
-            if (this.stream.advanceIfChar(_EQS)) {
-                return this.finishToken(offset, SmallerEqualsOperator);
-            }
-            return this.finishToken(offset, TokenType.Delim);
-        }
-        // ooperators >, >=
-        if (this.stream.advanceIfChar(_RAN)) {
-            if (this.stream.advanceIfChar(_EQS)) {
-                return this.finishToken(offset, GreaterEqualsOperator);
-            }
-            return this.finishToken(offset, TokenType.Delim);
-        }
-        // ellipis
-        if (this.stream.advanceIfChars([_DOT, _DOT, _DOT])) {
-            return this.finishToken(offset, Ellipsis);
-        }
-        return super.scanNext(offset);
-    }
-    comment() {
-        if (super.comment()) {
-            return true;
-        }
-        if (!this.inURL && this.stream.advanceIfChars([_FSL, _FSL])) {
-            this.stream.advanceWhileChar((ch) => {
-                switch (ch) {
-                    case _NWL:
-                    case _CAR:
-                    case _LFD:
-                        return false;
-                    default:
-                        return true;
-                }
-            });
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-}
+/*---------------------------------------------------------------------------------------------
+ *  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 { TokenType, Scanner } from './cssScanner';
+const _FSL = '/'.charCodeAt(0);
+const _NWL = '\n'.charCodeAt(0);
+const _CAR = '\r'.charCodeAt(0);
+const _LFD = '\f'.charCodeAt(0);
+const _DLR = '$'.charCodeAt(0);
+const _HSH = '#'.charCodeAt(0);
+const _CUL = '{'.charCodeAt(0);
+const _EQS = '='.charCodeAt(0);
+const _BNG = '!'.charCodeAt(0);
+const _LAN = '<'.charCodeAt(0);
+const _RAN = '>'.charCodeAt(0);
+const _DOT = '.'.charCodeAt(0);
+const _ATS = '@'.charCodeAt(0);
+let customTokenValue = TokenType.CustomToken;
+export const VariableName = customTokenValue++;
+export const InterpolationFunction = customTokenValue++;
+export const Default = customTokenValue++;
+export const EqualsOperator = customTokenValue++;
+export const NotEqualsOperator = customTokenValue++;
+export const GreaterEqualsOperator = customTokenValue++;
+export const SmallerEqualsOperator = customTokenValue++;
+export const Ellipsis = customTokenValue++;
+export const Module = customTokenValue++;
+export class SCSSScanner extends Scanner {
+    scanNext(offset) {
+        // scss variable
+        if (this.stream.advanceIfChar(_DLR)) {
+            const content = ['$'];
+            if (this.ident(content)) {
+                return this.finishToken(offset, VariableName, content.join(''));
+            }
+            else {
+                this.stream.goBackTo(offset);
+            }
+        }
+        // scss: interpolation function #{..})
+        if (this.stream.advanceIfChars([_HSH, _CUL])) {
+            return this.finishToken(offset, InterpolationFunction);
+        }
+        // operator ==
+        if (this.stream.advanceIfChars([_EQS, _EQS])) {
+            return this.finishToken(offset, EqualsOperator);
+        }
+        // operator !=
+        if (this.stream.advanceIfChars([_BNG, _EQS])) {
+            return this.finishToken(offset, NotEqualsOperator);
+        }
+        // operators <, <=
+        if (this.stream.advanceIfChar(_LAN)) {
+            if (this.stream.advanceIfChar(_EQS)) {
+                return this.finishToken(offset, SmallerEqualsOperator);
+            }
+            return this.finishToken(offset, TokenType.Delim);
+        }
+        // ooperators >, >=
+        if (this.stream.advanceIfChar(_RAN)) {
+            if (this.stream.advanceIfChar(_EQS)) {
+                return this.finishToken(offset, GreaterEqualsOperator);
+            }
+            return this.finishToken(offset, TokenType.Delim);
+        }
+        // ellipis
+        if (this.stream.advanceIfChars([_DOT, _DOT, _DOT])) {
+            return this.finishToken(offset, Ellipsis);
+        }
+        return super.scanNext(offset);
+    }
+    comment() {
+        if (super.comment()) {
+            return true;
+        }
+        if (!this.inURL && this.stream.advanceIfChars([_FSL, _FSL])) {
+            this.stream.advanceWhileChar((ch) => {
+                switch (ch) {
+                    case _NWL:
+                    case _CAR:
+                    case _LFD:
+                        return false;
+                    default:
+                        return true;
+                }
+            });
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+}

package/lib/esm/services/cssCodeActions.js

@@ -1,77 +1,77 @@
-/*---------------------------------------------------------------------------------------------
- *  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 * as nodes from '../parser/cssNodes';
-import { difference } from '../utils/strings';
-import { Rules } from '../services/lintRules';
-import { Command, TextEdit, CodeAction, CodeActionKind, TextDocumentEdit, VersionedTextDocumentIdentifier } from '../cssLanguageTypes';
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
-export class CSSCodeActions {
-    constructor(cssDataManager) {
-        this.cssDataManager = cssDataManager;
-    }
-    doCodeActions(document, range, context, stylesheet) {
-        return this.doCodeActions2(document, range, context, stylesheet).map(ca => {
-            const textDocumentEdit = ca.edit && ca.edit.documentChanges && ca.edit.documentChanges[0];
-            return Command.create(ca.title, '_css.applyCodeAction', document.uri, document.version, textDocumentEdit && textDocumentEdit.edits);
-        });
-    }
-    doCodeActions2(document, range, context, stylesheet) {
-        const result = [];
-        if (context.diagnostics) {
-            for (const diagnostic of context.diagnostics) {
-                this.appendFixesForMarker(document, stylesheet, diagnostic, result);
-            }
-        }
-        return result;
-    }
-    getFixesForUnknownProperty(document, property, marker, result) {
-        const propertyName = property.getName();
-        const candidates = [];
-        this.cssDataManager.getProperties().forEach(p => {
-            const score = difference(propertyName, p.name);
-            if (score >= propertyName.length / 2 /*score_lim*/) {
-                candidates.push({ property: p.name, score });
-            }
-        });
-        // Sort in descending order.
-        candidates.sort((a, b) => {
-            return b.score - a.score || a.property.localeCompare(b.property);
-        });
-        let maxActions = 3;
-        for (const candidate of candidates) {
-            const propertyName = candidate.property;
-            const title = localize('css.codeaction.rename', "Rename to '{0}'", propertyName);
-            const edit = TextEdit.replace(marker.range, propertyName);
-            const documentIdentifier = VersionedTextDocumentIdentifier.create(document.uri, document.version);
-            const workspaceEdit = { documentChanges: [TextDocumentEdit.create(documentIdentifier, [edit])] };
-            const codeAction = CodeAction.create(title, workspaceEdit, CodeActionKind.QuickFix);
-            codeAction.diagnostics = [marker];
-            result.push(codeAction);
-            if (--maxActions <= 0) {
-                return;
-            }
-        }
-    }
-    appendFixesForMarker(document, stylesheet, marker, result) {
-        if (marker.code !== Rules.UnknownProperty.id) {
-            return;
-        }
-        const offset = document.offsetAt(marker.range.start);
-        const end = document.offsetAt(marker.range.end);
-        const nodepath = nodes.getNodePath(stylesheet, offset);
-        for (let i = nodepath.length - 1; i >= 0; i--) {
-            const node = nodepath[i];
-            if (node instanceof nodes.Declaration) {
-                const property = node.getProperty();
-                if (property && property.offset === offset && property.end === end) {
-                    this.getFixesForUnknownProperty(document, property, marker, result);
-                    return;
-                }
-            }
-        }
-    }
-}
+/*---------------------------------------------------------------------------------------------
+ *  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 * as nodes from '../parser/cssNodes';
+import { difference } from '../utils/strings';
+import { Rules } from '../services/lintRules';
+import { Command, TextEdit, CodeAction, CodeActionKind, TextDocumentEdit, VersionedTextDocumentIdentifier } from '../cssLanguageTypes';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+export class CSSCodeActions {
+    constructor(cssDataManager) {
+        this.cssDataManager = cssDataManager;
+    }
+    doCodeActions(document, range, context, stylesheet) {
+        return this.doCodeActions2(document, range, context, stylesheet).map(ca => {
+            const textDocumentEdit = ca.edit && ca.edit.documentChanges && ca.edit.documentChanges[0];
+            return Command.create(ca.title, '_css.applyCodeAction', document.uri, document.version, textDocumentEdit && textDocumentEdit.edits);
+        });
+    }
+    doCodeActions2(document, range, context, stylesheet) {
+        const result = [];
+        if (context.diagnostics) {
+            for (const diagnostic of context.diagnostics) {
+                this.appendFixesForMarker(document, stylesheet, diagnostic, result);
+            }
+        }
+        return result;
+    }
+    getFixesForUnknownProperty(document, property, marker, result) {
+        const propertyName = property.getName();
+        const candidates = [];
+        this.cssDataManager.getProperties().forEach(p => {
+            const score = difference(propertyName, p.name);
+            if (score >= propertyName.length / 2 /*score_lim*/) {
+                candidates.push({ property: p.name, score });
+            }
+        });
+        // Sort in descending order.
+        candidates.sort((a, b) => {
+            return b.score - a.score || a.property.localeCompare(b.property);
+        });
+        let maxActions = 3;
+        for (const candidate of candidates) {
+            const propertyName = candidate.property;
+            const title = localize('css.codeaction.rename', "Rename to '{0}'", propertyName);
+            const edit = TextEdit.replace(marker.range, propertyName);
+            const documentIdentifier = VersionedTextDocumentIdentifier.create(document.uri, document.version);
+            const workspaceEdit = { documentChanges: [TextDocumentEdit.create(documentIdentifier, [edit])] };
+            const codeAction = CodeAction.create(title, workspaceEdit, CodeActionKind.QuickFix);
+            codeAction.diagnostics = [marker];
+            result.push(codeAction);
+            if (--maxActions <= 0) {
+                return;
+            }
+        }
+    }
+    appendFixesForMarker(document, stylesheet, marker, result) {
+        if (marker.code !== Rules.UnknownProperty.id) {
+            return;
+        }
+        const offset = document.offsetAt(marker.range.start);
+        const end = document.offsetAt(marker.range.end);
+        const nodepath = nodes.getNodePath(stylesheet, offset);
+        for (let i = nodepath.length - 1; i >= 0; i--) {
+            const node = nodepath[i];
+            if (node instanceof nodes.Declaration) {
+                const property = node.getProperty();
+                if (property && property.offset === offset && property.end === end) {
+                    this.getFixesForUnknownProperty(document, property, marker, result);
+                    return;
+                }
+            }
+        }
+    }
+}