Skip to content

Commit

Permalink
Throw errors for misplaced statements in keyframe blocks (#2226)
Browse files Browse the repository at this point in the history
  • Loading branch information
nex3 authored Apr 24, 2024
1 parent eafc279 commit f145e1c
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.75.1

* Throw errors for misplaced statements in keyframe blocks.

## 1.75.0

* Fix a bug in which stylesheet canonicalization could be cached incorrectly
Expand Down
21 changes: 21 additions & 0 deletions lib/src/visitor/async_evaluate.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1324,6 +1324,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"At-rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

var name = await _interpolationToValue(node.name);
Expand Down Expand Up @@ -1895,6 +1898,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"Media rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

var queries = await _visitMediaQueries(node.query);
Expand Down Expand Up @@ -1985,6 +1991,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"Style rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"Style rules may not be used within keyframe blocks.", node.span);
}

var (selectorText, selectorMap) =
Expand Down Expand Up @@ -2112,6 +2121,9 @@ final class _EvaluateVisitor
throw _exception(
"Supports rules may not be used within nested declarations.",
node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

var condition = CssValue(
Expand Down Expand Up @@ -3270,6 +3282,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"At-rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

if (node.isChildless) {
Expand Down Expand Up @@ -3353,6 +3368,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"Media rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

var mergedQueries = _mediaQueries.andThen(
Expand Down Expand Up @@ -3401,6 +3419,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"Style rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"Style rules may not be used within keyframe blocks.", node.span);
}

var styleRule = _styleRule;
Expand Down
23 changes: 22 additions & 1 deletion lib/src/visitor/evaluate.dart
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: 05cb957cd0c7698d8ad648f31d862dc91f0daa7b
// Checksum: 135bf44f65efcbebb4a55b38ada86c754fcdb86b
//
// ignore_for_file: unused_import

Expand Down Expand Up @@ -1321,6 +1321,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"At-rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

var name = _interpolationToValue(node.name);
Expand Down Expand Up @@ -1887,6 +1890,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"Media rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

var queries = _visitMediaQueries(node.query);
Expand Down Expand Up @@ -1975,6 +1981,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"Style rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"Style rules may not be used within keyframe blocks.", node.span);
}

var (selectorText, selectorMap) =
Expand Down Expand Up @@ -2102,6 +2111,9 @@ final class _EvaluateVisitor
throw _exception(
"Supports rules may not be used within nested declarations.",
node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

var condition =
Expand Down Expand Up @@ -3240,6 +3252,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"At-rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

if (node.isChildless) {
Expand Down Expand Up @@ -3323,6 +3338,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"Media rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"At-rules may not be used within keyframe blocks.", node.span);
}

var mergedQueries = _mediaQueries.andThen(
Expand Down Expand Up @@ -3369,6 +3387,9 @@ final class _EvaluateVisitor
if (_declarationName != null) {
throw _exception(
"Style rules may not be used within nested declarations.", node.span);
} else if (_inKeyframes && _parent is CssKeyframeBlock) {
throw _exception(
"Style rules may not be used within keyframe blocks.", node.span);
}

var styleRule = _styleRule;
Expand Down
4 changes: 4 additions & 0 deletions pkg/sass_api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 10.2.1

* No user-visible changes.

## 10.2.0

* No user-visible changes.
Expand Down
4 changes: 2 additions & 2 deletions pkg/sass_api/pubspec.yaml
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: 10.2.0
version: 10.2.1-dev
description: Additional APIs for Dart Sass.
homepage: https://github.com/sass/dart-sass

environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
sass: 1.75.0
sass: 1.75.1

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

Expand Down

0 comments on commit f145e1c

Please sign in to comment.