Merge branch 'main' into browser

* main:
  Split SilentComment nodes on empty lines in SCSS (sass#1945)
  Fix :has(+ &) (sass#1938)

Author: jgerigmeyer

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.62.1
+
+* Fix a bug where `:has(+ &)` and related constructs would drop the leading
+  combinator.
+
 ## 1.62.0
 
 * Deprecate the use of multiple `!global` or `!default` flags on the same

lib/src/ast/selector/list.dart

@@ -137,7 +137,18 @@ class SelectorList extends Selector {
             }
           }
         } else if (newComplexes.isEmpty) {
-          newComplexes.addAll(resolved);
+          newComplexes.addAll(complex.leadingCombinators.isEmpty
+              ? resolved
+              : resolved.map((resolvedComplex) => ComplexSelector(
+                  resolvedComplex.leadingCombinators.isEmpty
+                      ? complex.leadingCombinators
+                      : [
+                          ...complex.leadingCombinators,
+                          ...resolvedComplex.leadingCombinators
+                        ],
+                  resolvedComplex.components,
+                  complex.span,
+                  lineBreak: resolvedComplex.lineBreak)));
         } else {
           var previousComplexes = newComplexes;
           newComplexes = [

lib/src/parse/scss.dart

@@ -151,7 +151,7 @@ class ScssParser extends StylesheetParser {
     do {
       while (!scanner.isDone && !isNewline(scanner.readChar())) {}
       if (scanner.isDone) break;
-      whitespaceWithoutComments();
+      spaces();
     } while (scanner.scan("//"));
 
     if (plainCss) {

pkg/sass_api/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 7.0.0
+
+* Silent comments in SCSS that are separated by blank lines are now parsed as
+  separate `SilentComment` nodes rather than a single conjoined node.
+
 ## 6.3.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: 6.3.0
+version: 7.0.0
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
-  sass: 1.62.0
+  sass: 1.62.1
 
 dev_dependencies:
   dartdoc: ^5.0.0

pubspec.yaml

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