From 034484260d3295d85ae057eedbd6db2f9e7fd3df Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Wed, 7 Sep 2022 14:27:35 -0700 Subject: [PATCH] Fix span for not operations (#1797) --- CHANGELOG.md | 4 ++++ lib/src/parse/stylesheet.dart | 5 +++-- pkg/sass_api/CHANGELOG.md | 5 +++++ pkg/sass_api/pubspec.yaml | 4 ++-- pubspec.yaml | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14900de80..566d20f85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.54.9 + +* Fix an incorrect span in certain `@media` query deprecation warnings. + ## 1.54.8 * No user-visible changes. diff --git a/lib/src/parse/stylesheet.dart b/lib/src/parse/stylesheet.dart index 5398bb885..f4dc5ca20 100644 --- a/lib/src/parse/stylesheet.dart +++ b/lib/src/parse/stylesheet.dart @@ -2713,8 +2713,9 @@ abstract class StylesheetParser extends Parser { invocation, identifier.span.expand(invocation.span)); } else if (plain == "not") { whitespace(); - return UnaryOperationExpression( - UnaryOperator.not, _singleExpression(), identifier.span); + var expression = _singleExpression(); + return UnaryOperationExpression(UnaryOperator.not, expression, + identifier.span.expand(expression.span)); } lower = plain.toLowerCase(); diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md index 032731a7f..bbcab2bb6 100644 --- a/pkg/sass_api/CHANGELOG.md +++ b/pkg/sass_api/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.0.4 + +* `UnaryOperationExpression`s with operator `not` now include a correct span, + covering the expression itself instead of just the operator. + ## 3.0.3 * No user-visible changes. diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml index ffd2b3ae6..bf8ff8e8d 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: 3.0.3 +version: 3.0.4 description: Additional APIs for Dart Sass. homepage: https://github.com/sass/dart-sass @@ -10,7 +10,7 @@ environment: sdk: ">=2.17.0 <3.0.0" dependencies: - sass: 1.54.8 + sass: 1.54.9 dev_dependencies: dartdoc: ^5.0.0 diff --git a/pubspec.yaml b/pubspec.yaml index a292405b6..48484ab97 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: sass -version: 1.54.8 +version: 1.54.9 description: A Sass implementation in Dart. homepage: https://github.com/sass/dart-sass