diff --git a/CHANGELOG.md b/CHANGELOG.md index 90f8a8385..c177002cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.94.3-dev + +* Fix the span reported for standalone `%` expressions followed by whitespace. + ## 1.94.2 ### Command-Line Interface diff --git a/lib/src/parse/stylesheet.dart b/lib/src/parse/stylesheet.dart index 6885e2954..ec56b49f7 100644 --- a/lib/src/parse/stylesheet.dart +++ b/lib/src/parse/stylesheet.dart @@ -2154,11 +2154,12 @@ abstract class StylesheetParser extends Parser { length: operator.operator.length, ); } + var operatorEnd = scanner.position; whitespace(consumeNewlines: true); if (operator == BinaryOperator.modulo && !_lookingAtExpression()) { addSingleExpression(StringExpression.plain( - '%', spanFromPosition(scanner.position - 1))); + '%', spanFromPosition(operatorEnd - 1, operatorEnd))); } else { operators.add(operator); operands.add(singleExpression); diff --git a/pkg/sass-parser/CHANGELOG.md b/pkg/sass-parser/CHANGELOG.md index 068c5ddf7..2b9a16715 100644 --- a/pkg/sass-parser/CHANGELOG.md +++ b/pkg/sass-parser/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.36-dev + +* No user-visible changes. + ## 0.4.35 * No user-visible changes. diff --git a/pkg/sass-parser/package.json b/pkg/sass-parser/package.json index 605de6a01..57e4b0ec9 100644 --- a/pkg/sass-parser/package.json +++ b/pkg/sass-parser/package.json @@ -1,6 +1,6 @@ { "name": "sass-parser", - "version": "0.4.35", + "version": "0.4.36-dev", "description": "A PostCSS-compatible wrapper of the official Sass parser", "repository": "sass/dart-sass", "author": "Google Inc.", diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md index d12cd187f..4c5f5258d 100644 --- a/pkg/sass_api/CHANGELOG.md +++ b/pkg/sass_api/CHANGELOG.md @@ -1,3 +1,7 @@ +## 16.0.3-dev + +* No user-visible changes. + ## 16.0.2 * No user-visible changes. diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml index 08a81f108..e1fa902ba 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: 16.0.2 +version: 16.0.3-dev description: Additional APIs for Dart Sass. homepage: https://github.com/sass/dart-sass @@ -10,7 +10,7 @@ environment: sdk: ">=3.6.0 <4.0.0" dependencies: - sass: 1.94.2 + sass: 1.94.3 dev_dependencies: dartdoc: ">=8.0.14 <10.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6fb8dec60..48ff0a524 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: sass -version: 1.94.2 +version: 1.94.3-dev description: A Sass implementation in Dart. homepage: https://github.com/sass/dart-sass @@ -45,7 +45,7 @@ dev_dependencies: grinder: ^0.9.0 node_preamble: ^2.0.2 lints: ">=4.0.0 <7.0.0" - protoc_plugin: ">=22.0.1 <25.0.0" + protoc_plugin: ">=22.0.1 <24.0.0" pub_api_client: ">=2.1.1 <4.0.0" pubspec_parse: ^1.3.0 test: ^1.16.7