Skip to content

Fix crash when @importing a Sass file that @uses another file #2599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix crash when @importing a Sass file that @uses another file #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33b0338
Fix crash when @importing a Sass file that @uses another file
Goodwine Sep 10, 2025
d30c094
update changelog and versions
Goodwine Sep 10, 2025
f4725e2
ping CI
Goodwine Sep 10, 2025
2035463
oops remove debugging stuff
Goodwine Sep 10, 2025
899d697
update changelog to be more accurate
Goodwine Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 1.92.2-dev

* Fix a crash when a style rule contains a nested `@import`, and the loaded file
`@use`s a user-defined module as well as `@include` a top-level mixin which
emits top-level declarations.

## 1.92.1

* Fix a bug where variable definitions from one imported, forwarded module
Expand Down
5 changes: 2 additions & 3 deletions lib/src/visitor/async_evaluate.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4670,9 +4670,8 @@ final class _ImportedCssVisitor implements ModifiableCssVisitor<void> {

void visitCssComment(ModifiableCssComment node) => _visitor._addChild(node);

void visitCssDeclaration(ModifiableCssDeclaration node) {
assert(false, "visitCssDeclaration() should never be called.");
}
void visitCssDeclaration(ModifiableCssDeclaration node) =>
_visitor._addChild(node);

void visitCssImport(ModifiableCssImport node) {
if (_visitor._parent != _visitor._root) {
Expand Down
7 changes: 3 additions & 4 deletions lib/src/visitor/evaluate.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// DO NOT EDIT. This file was generated from async_evaluate.dart.
// See tool/grind/synchronize.dart for details.
//
// Checksum: a32ff6b83b3365e8dad72b8b12c2c17937a5f28e
// Checksum: b79ed685f78b8d5356795eb2d1112f830abaf58e
//
// ignore_for_file: unused_import

Expand Down Expand Up @@ -4652,9 +4652,8 @@ final class _ImportedCssVisitor implements ModifiableCssVisitor<void> {

void visitCssComment(ModifiableCssComment node) => _visitor._addChild(node);

void visitCssDeclaration(ModifiableCssDeclaration node) {
assert(false, "visitCssDeclaration() should never be called.");
}
void visitCssDeclaration(ModifiableCssDeclaration node) =>
_visitor._addChild(node);

void visitCssImport(ModifiableCssImport node) {
if (_visitor._parent != _visitor._root) {
Expand Down
4 changes: 4 additions & 0 deletions pkg/sass-parser/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.4.29-dev

* No user-visible changes.

## 0.4.28

* No user-visible changes.
Expand Down
2 changes: 1 addition & 1 deletion pkg/sass-parser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sass-parser",
"version": "0.4.28",
"version": "0.4.29-dev",
"description": "A PostCSS-compatible wrapper of the official Sass parser",
"repository": "sass/sass",
"author": "Google Inc.",
Expand Down
4 changes: 4 additions & 0 deletions pkg/sass_api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 15.11.1-dev

* No user-visible changes.

## 15.11.0

* No user-visible changes.
Expand Down
4 changes: 2 additions & 2 deletions pkg/sass_api/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0
version: 15.11.1-dev
description: Additional APIs for Dart Sass.
homepage: https://github.com/sass/dart-sass

environment:
sdk: ">=3.6.0 <4.0.0"

dependencies:
sass: 1.92.1
sass: 1.92.2

dev_dependencies:
dartdoc: ^8.0.14
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: sass
version: 1.92.1
version: 1.92.2-dev
description: A Sass implementation in Dart.
homepage: https://github.com/sass/dart-sass

Expand Down
Loading