Merge pull request #2583 from sass/list-parens

Properly add `ParenthesizedExpression` for comma-separated lists

Author: nex3

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.89.1
+
+* No user-visible changes.
+
 ## 1.89.0
 
 * Allow the Node package importer to load files even when there are multiple

lib/src/parse/stylesheet.dart

@@ -2396,6 +2396,7 @@ abstract class StylesheetParser extends Parser {
       var start = scanner.state;
       scanner.expectChar($lparen);
       whitespace(consumeNewlines: true);
+      var inside = scanner.state;
       if (!_lookingAtExpression()) {
         scanner.expectChar($rparen);
         return ListExpression(
@@ -2425,12 +2426,13 @@ abstract class StylesheetParser extends Parser {
         whitespace(consumeNewlines: true);
       }
 
-      scanner.expectChar($rparen);
-      return ListExpression(
+      var list = ListExpression(
         expressions,
         ListSeparator.comma,
-        scanner.spanFrom(start),
+        scanner.spanFrom(inside),
       );
+      scanner.expectChar($rparen);
+      return ParenthesizedExpression(list, scanner.spanFrom(start));
     } finally {
       _inParentheses = wasInParentheses;
     }

pkg/sass-parser/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.4.23
+
+* Update types for compatibility with the latest PostCSS.
+
+* **Potentially-breaking bug fix**: parenthesized, comma-separated lists are now
+  correctly wrapped in a `ParenthesizedExpression`.
+
 ## 0.4.22
 
 * No user-visible changes.

pkg/sass-parser/lib/src/node.d.ts

@@ -121,7 +121,12 @@ declare abstract class Node
     opts?: Pick<postcss.WarningOptions, 'index' | 'word'>,
   ): postcss.Position;
   positionInside(index: number): postcss.Position;
-  rangeBy(opts?: Pick<postcss.WarningOptions, 'endIndex' | 'index' | 'word'>): {
+  rangeBy(
+    opts?: Pick<
+      postcss.WarningOptions,
+      'end' | 'endIndex' | 'index' | 'start' | 'word'
+    >,
+  ): {
     start: postcss.Position;
     end: postcss.Position;
   };

pkg/sass-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-parser",
-  "version": "0.4.22",
+  "version": "0.4.23",
   "description": "A PostCSS-compatible wrapper of the official Sass parser",
   "repository": "sass/sass",
   "author": "Google Inc.",

pkg/sass_api/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 15.7.0
+
+* **Potentially-breaking bug fix**: parenthesized, comma-separated lists are now
+  correctly wrapped in a `ParenthesizedExpression`.
+
 ## 15.6.0
 
 * No user-visible changes.

pkg/sass_api/pubspec.yaml

@@ -2,15 +2,15 @@ name: sass_api
 # Note: Every time we add a new Sass AST node, we need to bump the *major*
 # version because it's a breaking change for anyone who's implementing the
 # visitor interface(s).
-version: 15.6.0
+version: 15.7.0
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=3.6.0 <4.0.0"
 
 dependencies:
-  sass: 1.89.0
+  sass: 1.89.1
 
 dev_dependencies:
   dartdoc: ^8.0.14

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.89.0
+version: 1.89.1
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass