Watch files through @forward rules (#871)

Closes #870

Author: nex3

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.23.4
+
+### Command-Line Interface
+
+* Fix a bug where `--watch` wouldn't watch files referred to by `@forward`
+  rules.
+
 ## 1.23.3
 
 * Fix a bug where selectors were being trimmed over-eagerly when `@extend`

lib/src/visitor/find_imports.dart

@@ -32,6 +32,10 @@ class _FindImportsVisitor extends RecursiveStatementVisitor<void> {
     _imports.add(DynamicImport(node.url.toString(), node.span));
   }
 
+  void visitForwardRule(ForwardRule node) {
+    _imports.add(DynamicImport(node.url.toString(), node.span));
+  }
+
   void visitImportRule(ImportRule node) {
     for (var import in node.imports) {
       if (import is DynamicImport) _imports.add(import);

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.23.3
+version: 1.23.4
 description: A Sass implementation in Dart.
 author: Sass Team
 homepage: https://github.com/sass/dart-sass

test/cli/shared/watch.dart

@@ -173,24 +173,66 @@ void sharedTests(Future<TestProcess> runSass(Iterable<String> arguments)) {
           ]).validate();
         });
 
-        test("when its dependency is modified", () async {
-          await d.file("_other.scss", "a {b: c}").create();
-          await d.file("test.scss", "@import 'other'").create();
+        group("when its dependency is modified", () {
+          test("through @import", () async {
+            await d.file("_other.scss", "a {b: c}").create();
+            await d.file("test.scss", "@import 'other'").create();
 
-          var sass = await watch(["test.scss:out.css"]);
-          await expectLater(
-              sass.stdout, emits('Compiled test.scss to out.css.'));
-          await expectLater(sass.stdout, _watchingForChanges);
-          await tickIfPoll();
+            var sass = await watch(["test.scss:out.css"]);
+            await expectLater(
+                sass.stdout, emits('Compiled test.scss to out.css.'));
+            await expectLater(sass.stdout, _watchingForChanges);
+            await tickIfPoll();
 
-          await d.file("_other.scss", "x {y: z}").create();
-          await expectLater(
-              sass.stdout, emits('Compiled test.scss to out.css.'));
-          await sass.kill();
+            await d.file("_other.scss", "x {y: z}").create();
+            await expectLater(
+                sass.stdout, emits('Compiled test.scss to out.css.'));
+            await sass.kill();
 
-          await d
-              .file("out.css", equalsIgnoringWhitespace("x { y: z; }"))
-              .validate();
+            await d
+                .file("out.css", equalsIgnoringWhitespace("x { y: z; }"))
+                .validate();
+          });
+
+          test("through @use", () async {
+            await d.file("_other.scss", "a {b: c}").create();
+            await d.file("test.scss", "@use 'other'").create();
+
+            var sass = await watch(["test.scss:out.css"]);
+            await expectLater(
+                sass.stdout, emits('Compiled test.scss to out.css.'));
+            await expectLater(sass.stdout, _watchingForChanges);
+            await tickIfPoll();
+
+            await d.file("_other.scss", "x {y: z}").create();
+            await expectLater(
+                sass.stdout, emits('Compiled test.scss to out.css.'));
+            await sass.kill();
+
+            await d
+                .file("out.css", equalsIgnoringWhitespace("x { y: z; }"))
+                .validate();
+          });
+
+          test("through @forward", () async {
+            await d.file("_other.scss", "a {b: c}").create();
+            await d.file("test.scss", "@forward 'other'").create();
+
+            var sass = await watch(["test.scss:out.css"]);
+            await expectLater(
+                sass.stdout, emits('Compiled test.scss to out.css.'));
+            await expectLater(sass.stdout, _watchingForChanges);
+            await tickIfPoll();
+
+            await d.file("_other.scss", "x {y: z}").create();
+            await expectLater(
+                sass.stdout, emits('Compiled test.scss to out.css.'));
+            await sass.kill();
+
+            await d
+                .file("out.css", equalsIgnoringWhitespace("x { y: z; }"))
+                .validate();
+          });
         });
 
         test("when it's deleted and re-added", () async {