From 48e2d0cb02f03e70a61fd91b4d1eedb3f46c077f Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Tue, 12 Mar 2024 14:20:25 -0700 Subject: [PATCH] Preserve underscores in `VariableExpression.toString()` (#2185) Closes #2180 --- CHANGELOG.md | 3 +++ lib/src/ast/sass/expression/variable.dart | 2 +- pkg/sass_api/CHANGELOG.md | 4 ++++ pkg/sass_api/pubspec.yaml | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 790613be0..d0e3727ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ * Allow the Node.js `pkg:` importer to load Sass stylesheets for `package.json` `exports` field entries without extensions. +* When printing suggestions for variables, use underscores in variable names + when the original usage used underscores. + ## 1.71.1 ### Command-Line Interface diff --git a/lib/src/ast/sass/expression/variable.dart b/lib/src/ast/sass/expression/variable.dart index c07ffbc5a..7a839d867 100644 --- a/lib/src/ast/sass/expression/variable.dart +++ b/lib/src/ast/sass/expression/variable.dart @@ -35,5 +35,5 @@ final class VariableExpression implements Expression, SassReference { T accept(ExpressionVisitor visitor) => visitor.visitVariableExpression(this); - String toString() => namespace == null ? '\$$name' : '$namespace.\$$name'; + String toString() => span.text; } diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md index 02ada6ee5..a444830d7 100644 --- a/pkg/sass_api/CHANGELOG.md +++ b/pkg/sass_api/CHANGELOG.md @@ -1,3 +1,7 @@ +## 9.4.2 + +* No user-visible changes. + ## 9.4.1 * No user-visible changes. diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml index 452c66f3b..b2c6b87bb 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: 9.4.1 +version: 9.4.2 description: Additional APIs for Dart Sass. homepage: https://github.com/sass/dart-sass @@ -10,7 +10,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sass: 1.71.1 + sass: 1.71.2 dev_dependencies: dartdoc: ^6.0.0