vscode-css-languageservice 5.2.0 → 5.4.2

package/lib/esm/parser/cssParser.js

@@ -1353,9 +1353,6 @@ var Parser = /** @class */ (function () {
                 }
                 this.consumeToken();
             }
-            else if (!this.hasWhitespace()) {
-                break;
-            }
             if (!node.addChild(this._parseBinaryExpr())) {
                 break;
             }

package/lib/esm/services/cssFormatter.js

@@ -9,6 +9,7 @@ export function format(document, range, options) {
     var value = document.getText();
     var includesEnd = true;
     var initialIndentLevel = 0;
+    var inRule = false;
     var tabSize = options.tabSize || 4;
     if (range) {
         var startOffset = document.offsetAt(range.start);
@@ -36,23 +37,17 @@ export function format(document, range, options) {
             endOffset = extendedEnd;
         }
         range = Range.create(document.positionAt(startOffset), document.positionAt(endOffset));
-        // Do not modify if substring starts in inside an element
-        // Ending inside an element is fine as it doesn't cause formatting errors
-        var firstHalf = value.substring(0, startOffset);
-        if (new RegExp(/.*[<][^>]*$/).test(firstHalf)) {
-            //return without modification
-            value = value.substring(startOffset, endOffset);
-            return [{
-                    range: range,
-                    newText: value
-                }];
-        }
+        // Test if inside a rule
+        inRule = isInRule(value, startOffset);
         includesEnd = endOffset === value.length;
         value = value.substring(startOffset, endOffset);
         if (startOffset !== 0) {
             var startOfLineOffset = document.offsetAt(Position.create(range.start.line, 0));
             initialIndentLevel = computeIndentLevel(document.getText(), startOfLineOffset, options);
         }
+        if (inRule) {
+            value = "{\n".concat(trimLeft(value));
+        }
     }
     else {
         range = Range.create(Position.create(0, 0), document.positionAt(value.length));
@@ -61,11 +56,20 @@ export function format(document, range, options) {
         indent_size: tabSize,
         indent_char: options.insertSpaces ? ' ' : '\t',
         end_with_newline: includesEnd && getFormatOption(options, 'insertFinalNewline', false),
-        selector_separator_newline: getFormatOption(options, 'selectorSeparatorNewline', true),
+        selector_separator_newline: getFormatOption(options, 'newlineBetweenSelectors', true),
         newline_between_rules: getFormatOption(options, 'newlineBetweenRules', true),
-        space_around_selector_separator: getFormatOption(options, 'spaceAroundSelectorSeparator', false)
+        space_around_selector_separator: getFormatOption(options, 'spaceAroundSelectorSeparator', false),
+        brace_style: getFormatOption(options, 'braceStyle', 'collapse'),
+        indent_empty_lines: getFormatOption(options, 'indentEmptyLines', false),
+        max_preserve_newlines: getFormatOption(options, 'maxPreserveNewLines', undefined),
+        preserve_newlines: getFormatOption(options, 'preserveNewLines', true),
+        wrap_line_length: getFormatOption(options, 'wrapLineLength', undefined),
+        eol: '\n'
     };
-    var result = css_beautify(trimLeft(value), cssOptions);
+    var result = css_beautify(value, cssOptions);
+    if (inRule) {
+        result = trimLeft(result.substring(2));
+    }
     if (initialIndentLevel > 0) {
         var indent = options.insertSpaces ? repeat(' ', tabSize * initialIndentLevel) : repeat('\t', initialIndentLevel);
         result = result.split('\n').join('\n' + indent);
@@ -81,6 +85,21 @@ export function format(document, range, options) {
 function trimLeft(str) {
     return str.replace(/^\s+/, '');
 }
+var _CUL = '{'.charCodeAt(0);
+var _CUR = '}'.charCodeAt(0);
+function isInRule(str, offset) {
+    while (offset >= 0) {
+        var ch = str.charCodeAt(offset);
+        if (ch === _CUL) {
+            return true;
+        }
+        else if (ch === _CUR) {
+            return false;
+        }
+        offset--;
+    }
+    return false;
+}
 function getFormatOption(options, key, dflt) {
     if (options && options.hasOwnProperty(key)) {
         var value = options[key];

package/lib/esm/services/selectorPrinting.js

@@ -384,7 +384,7 @@ var SelectorPrinting = /** @class */ (function () {
                         var text = element.getText();
                         if (_this.isPseudoElementIdentifier(text)) {
                             specificity.tag++; // pseudo element
-                            break;
+                            continue elementLoop;
                         }
                         // where and child selectors have zero specificity
                         if (text.match(/^:where/i)) {
@@ -431,7 +431,7 @@ var SelectorPrinting = /** @class */ (function () {
                             continue elementLoop;
                         }
                         specificity.attr++; //pseudo class
-                        break;
+                        continue elementLoop;
                 }
                 if (element.getChildren().length > 0) {
                     var itemSpecificity = calculateScore(element);

package/lib/umd/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. */
 /*
 
@@ -1005,8 +1005,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);
@@ -1053,10 +1053,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(/\/\*/, /\*\//);
 
@@ -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();
+      }
     }
   }
 
@@ -1539,7 +1581,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/umd/cssLanguageTypes.d.ts

@@ -217,10 +217,22 @@ export interface CSSFormatConfiguration {
     insertSpaces?: boolean;
     /** end with a newline: Default: false */
     insertFinalNewline?: boolean;
-    /** separate selectors with newline or not (e.g. "a,\nbr" or "a, br"): Default: true */
-    selectorSeparatorNewline?: boolean;
+    /** separate selectors with newline (e.g. "a,\nbr" or "a, br"): Default: true */
+    newlineBetweenSelectors?: boolean;
     /** add a new line after every css rule: Default: true */
     newlineBetweenRules?: boolean;
     /** ensure space around selector separators:  '>', '+', '~' (e.g. "a>b" -> "a > b"): Default: false */
     spaceAroundSelectorSeparator?: boolean;
+    /** put braces on the same line as rules (`collapse`), or put braces on own line, Allman / ANSI style (`expand`). Default `collapse` */
+    braceStyle?: 'collapse' | 'expand';
+    /** whether existing line breaks before elements should be preserved. Default: true */
+    preserveNewLines?: boolean;
+    /** maximum number of line breaks to be preserved in one chunk. Default: unlimited */
+    maxPreserveNewLines?: number;
+    /** maximum amount of characters per line (0/undefined = disabled). Default: disabled. */
+    wrapLineLength?: number;
+    /** add indenting whitespace to empty lines. Default: false */
+    indentEmptyLines?: boolean;
+    /** @deprecated Use newlineBetweenSelectors instead*/
+    selectorSeparatorNewline?: boolean;
 }