Fix --quiet-deps for @content blocks (#2474)

Closes #2418

Author: nex3

CHANGELOG.md

@@ -1,4 +1,7 @@
-## 1.83.1-dev
+## 1.83.1
+
+* Fix a bug where `--quiet-deps` would get deactivated for `@content` blocks,
+  even when those blocks were entirely contained within dependencies.
 
 * Include deprecation IDs in deprecation warnings to make it easier to determine
   what to pass to `--silence-deprecation` or `--fatal-deprecation`.

lib/src/visitor/async_evaluate.dart

@@ -1211,8 +1211,7 @@ final class _EvaluateVisitor
     if (siblings.last != _parent &&
         // Reproduce this condition from [_warn] so that we don't add anything to
         // [interleavedRules] for declarations in dependencies.
-        !(_quietDeps &&
-            (_inDependency || (_currentCallable?.inDependency ?? false)))) {
+        !(_quietDeps && _inDependency)) {
       loop:
       for (var sibling in siblings.skip(siblings.indexOf(_parent) + 1)) {
         switch (sibling) {
@@ -2946,7 +2945,9 @@ final class _EvaluateVisitor
     if (name != "@content") name += "()";
 
     var oldCallable = _currentCallable;
+    var oldInDependency = _inDependency;
     _currentCallable = callable;
+    _inDependency = callable.inDependency;
     var result = await _withStackFrame(name, nodeWithSpan, () {
       // Add an extra closure() call so that modifications to the environment
       // don't affect the underlying environment closure.
@@ -3014,6 +3015,7 @@ final class _EvaluateVisitor
       });
     });
     _currentCallable = oldCallable;
+    _inDependency = oldInDependency;
     return result;
   }
 
@@ -3873,10 +3875,7 @@ final class _EvaluateVisitor
 
   /// Emits a warning with the given [message] about the given [span].
   void _warn(String message, FileSpan span, [Deprecation? deprecation]) {
-    if (_quietDeps &&
-        (_inDependency || (_currentCallable?.inDependency ?? false))) {
-      return;
-    }
+    if (_quietDeps && _inDependency) return;
 
     if (!_warningsEmitted.add((message, span))) return;
     var trace = _stackTrace(span);

lib/src/visitor/evaluate.dart

@@ -5,7 +5,7 @@
 // DO NOT EDIT. This file was generated from async_evaluate.dart.
 // See tool/grind/synchronize.dart for details.
 //
-// Checksum: e47d81d6a53ba17bf1f6bf37e431c47fc82195e5
+// Checksum: 548e54482bead470a6c7931a9d3e098da8b600d6
 //
 // ignore_for_file: unused_import
 
@@ -1211,8 +1211,7 @@ final class _EvaluateVisitor
     if (siblings.last != _parent &&
         // Reproduce this condition from [_warn] so that we don't add anything to
         // [interleavedRules] for declarations in dependencies.
-        !(_quietDeps &&
-            (_inDependency || (_currentCallable?.inDependency ?? false)))) {
+        !(_quietDeps && _inDependency)) {
       loop:
       for (var sibling in siblings.skip(siblings.indexOf(_parent) + 1)) {
         switch (sibling) {
@@ -2924,7 +2923,9 @@ final class _EvaluateVisitor
     if (name != "@content") name += "()";
 
     var oldCallable = _currentCallable;
+    var oldInDependency = _inDependency;
     _currentCallable = callable;
+    _inDependency = callable.inDependency;
     var result = _withStackFrame(name, nodeWithSpan, () {
       // Add an extra closure() call so that modifications to the environment
       // don't affect the underlying environment closure.
@@ -2991,6 +2992,7 @@ final class _EvaluateVisitor
       });
     });
     _currentCallable = oldCallable;
+    _inDependency = oldInDependency;
     return result;
   }
 
@@ -3837,10 +3839,7 @@ final class _EvaluateVisitor
 
   /// Emits a warning with the given [message] about the given [span].
   void _warn(String message, FileSpan span, [Deprecation? deprecation]) {
-    if (_quietDeps &&
-        (_inDependency || (_currentCallable?.inDependency ?? false))) {
-      return;
-    }
+    if (_quietDeps && _inDependency) return;
 
     if (!_warningsEmitted.add((message, span))) return;
     var trace = _stackTrace(span);

pkg/sass-parser/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.4.9-dev
+## 0.4.9
 
 * No user-visible changes.
 

pkg/sass-parser/package.json

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

pkg/sass_api/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 15.0.1-dev
+## 15.0.1
 
 * No user-visible changes.
 

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: 15.0.1-dev
+version: 15.0.1
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 

pubspec.yaml

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

test/cli/shared.dart

@@ -487,6 +487,29 @@ void sharedTests(
         expect(sass.stderr, emitsDone);
         await sass.shouldExit(0);
       });
+
+      // Regression test for sass/dart-sass#2418
+      test("doesn't emit runner warnings in content blocks from local @include",
+          () async {
+        await d.file("test.scss", """
+          @use 'other';
+          @include other.foo;
+        """).create();
+        await d.dir("dir", [
+          d.file("_other.scss", """
+            @mixin bar {@content}
+            @mixin foo {
+              @include bar {
+                #{blue} {x: y}
+              }
+            }
+          """)
+        ]).create();
+
+        var sass = await runSass(["--quiet-deps", "-I", "dir", "test.scss"]);
+        expect(sass.stderr, emitsDone);
+        await sass.shouldExit(0);
+      });
     });
 
     group("silences warnings through @import", () {