From 763d356ae1528effc39e0bf3718e3b850f14fee5 Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Fri, 14 Jun 2024 20:19:11 -0700
Subject: [PATCH] Fix a bug where comments were incorrectly forbidden in some
 cases

---
 CHANGELOG.md                  |  5 +++++
 lib/src/parse/stylesheet.dart | 20 ++++++++++++++------
 pkg/sass_api/pubspec.yaml     |  4 ++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f299e042..5229a0b08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.77.6
+
+* Fix a few cases where comments and occasionally even whitespace wasn't allowed
+  between the end of Sass statements and the following semicolon.
+
 ## 1.77.5
 
 * Fully trim redundant selectors generated by `@extend`.
diff --git a/lib/src/parse/stylesheet.dart b/lib/src/parse/stylesheet.dart
index e372e3912..046c56e6f 100644
--- a/lib/src/parse/stylesheet.dart
+++ b/lib/src/parse/stylesheet.dart
@@ -770,10 +770,15 @@ abstract class StylesheetParser extends Parser {
           scanner.spanFrom(start));
     }
 
+    var beforeWhitespace = scanner.location;
     whitespace();
-    var arguments = scanner.peekChar() == $lparen
-        ? _argumentInvocation(mixin: true)
-        : ArgumentInvocation.empty(scanner.emptySpan);
+    ArgumentInvocation arguments;
+    if (scanner.peekChar() == $lparen) {
+      arguments = _argumentInvocation(mixin: true);
+      whitespace();
+    } else {
+      arguments = ArgumentInvocation.empty(beforeWhitespace.pointSpan());
+    }
 
     expectStatementSeparator("@content rule");
     return ContentRule(arguments, scanner.spanFrom(start));
@@ -835,7 +840,10 @@ abstract class StylesheetParser extends Parser {
 
     var value = almostAnyValue();
     var optional = scanner.scanChar($exclamation);
-    if (optional) expectIdentifier("optional");
+    if (optional) {
+      expectIdentifier("optional");
+      whitespace();
+    }
     expectStatementSeparator("@extend rule");
     return ExtendRule(value, scanner.spanFrom(start), optional: optional);
   }
@@ -954,6 +962,7 @@ abstract class StylesheetParser extends Parser {
     }
 
     var configuration = _configuration(allowGuarded: true);
+    whitespace();
 
     expectStatementSeparator("@forward rule");
     var span = scanner.spanFrom(start);
@@ -1419,8 +1428,7 @@ abstract class StylesheetParser extends Parser {
     var namespace = _useNamespace(url, start);
     whitespace();
     var configuration = _configuration();
-
-    expectStatementSeparator("@use rule");
+    whitespace();
 
     var span = scanner.spanFrom(start);
     if (!_isUseAllowed) {
diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml
index 69c311a02..bcd120d20 100644
--- a/pkg/sass_api/pubspec.yaml
+++ b/pkg/sass_api/pubspec.yaml
@@ -2,7 +2,7 @@ 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: 10.4.5
+version: 10.4.6
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
@@ -10,7 +10,7 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  sass: 1.77.5
+  sass: 1.77.6
 
 dev_dependencies:
   dartdoc: ">=6.0.0 <9.0.0"