Skip to content
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.

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

Add calculation interpolation migrator #245

Merged
merged 1 commit into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.8.0

### Calc Functions Interpolation Migrator

* Removes interpolation in calculation functions `calc()`, `clamp()`, `min()`, and `max()`.
See the [scss/function-calculation-no-interpolation](https://github.com/stylelint-scss/stylelint-scss/tree/master/src/rules/function-calculation-no-interpolation) rule for more information.

## 1.7.3

* Fixes a bug where path arguments on the command line were incorrectly treated
Expand Down
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,3 @@ review. In addition, because these models were trained indiscriminately and
non-consensually on open-source code with a variety of licenses, it's not
obvious that we have the moral or legal right to redistribute code they
generate.


53 changes: 53 additions & 0 deletions lib/src/migrators/calc_interpolation.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// Copyright 2023 Google LLC
//
// Use of this source code is governed by an MIT-style
// license that can be found in the LICENSE file or at
// https://opensource.org/licenses/MIT.

import 'package:sass_api/sass_api.dart';

import '../migration_visitor.dart';
import '../migrator.dart';
import '../patch.dart';

/// Removes interpolation in calculation functions.
class CalculationInterpolationMigrator extends Migrator {
final name = "calc-interpolation";
final description = r"Removes interpolation in calculation functions"
r"`calc()`, `clamp()`, `min()`, and `max()`";

@override
Map<Uri, String> migrateFile(
ImportCache importCache, Stylesheet stylesheet, Importer importer) {
var visitor =
_CalculationInterpolationVisitor(importCache, migrateDependencies);
var result = visitor.run(stylesheet, importer);
missingDependencies.addAll(visitor.missingDependencies);
return result;
}
}

class _CalculationInterpolationVisitor extends MigrationVisitor {
_CalculationInterpolationVisitor(
ImportCache importCache, bool migrateDependencies)
: super(importCache, migrateDependencies);

@override
void visitCalculationExpression(CalculationExpression node) {
const calcFunctions = ['calc', 'clamp', 'min', 'max'];
final interpolation = RegExp(r'^#{.*\s*}');
if (calcFunctions.contains(node.name)) {
for (var arg in node.arguments) {
for (var match in interpolation.allMatches(arg.toString())) {
var noInterpolation = match[0].toString().substring(2, match.end - 1);
var interpolationSpan =
node.span.file.span(arg.span.start.offset, arg.span.end.offset);
if (interpolationSpan.text == match[0].toString()) {
addPatch(Patch(interpolationSpan, noInterpolation));
}
}
}
}
super.visitCalculationExpression(node);
}
}
2 changes: 2 additions & 0 deletions lib/src/runner.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import 'package:source_span/source_span.dart';
import 'package:term_glyph/term_glyph.dart' as glyph;

import 'io.dart';
import 'migrators/calc_interpolation.dart';
import 'migrators/division.dart';
import 'migrators/media_logic.dart';
import 'migrators/module.dart';
Expand Down Expand Up @@ -54,6 +55,7 @@ class MigratorRunner extends CommandRunner<Map<Uri, String>> {
abbr: 'v', help: 'Print more information.', negatable: false)
..addFlag('version',
help: 'Print the version of the Sass migrator.', negatable: false);
addCommand(CalculationInterpolationMigrator());
addCommand(DivisionMigrator());
addCommand(MediaLogicMigrator());
addCommand(ModuleMigrator());
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_migrator
version: 1.7.3
version: 1.8.0
description: A tool for running migrations on Sass files
homepage: https://github.com/sass/migrator

Expand Down
4 changes: 4 additions & 0 deletions test/migrators/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ not contain a file if it would not be changed by the migrator.
The migration's expected standard output should be included in a file named
`log.txt`. Its standard error should be included in a file called `error.txt` if
the migration fails, or `warning.txt` if it completes successfully.

## Testing
Run `dart run grinder pkg-compile-snapshot-dev` for compiling the latest changes of code,
`dart test` for running all tests and `dart test -x node` to run all tests except the node tests.
13 changes: 13 additions & 0 deletions test/migrators/calc_interpolation/calc_remove_interpolation.hrx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<==> input/entrypoint.scss
$c: 1;
.a { .b: calc(#{$c + 1}); }

// Nested
.a { .b: calc(max(#{$c, 2})); }

<==> output/entrypoint.scss
$c: 1;
.a { .b: calc($c + 1); }

// Nested
.a { .b: calc(max($c, 2)); }
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<==> input/entrypoint.scss
$c: 1;
.a { .b: clamp(#{$c}); }

<==> output/entrypoint.scss
$c: 1;
.a { .b: clamp($c); }
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<==> input/entrypoint.scss
$c: 1;
.a { .b: max(#{$c, 3}); }

<==> output/entrypoint.scss
$c: 1;
.a { .b: max($c, 3); }
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<==> input/entrypoint.scss
$c: 1;
.a { .b: min(#{$c, 3}); }

<==> output/entrypoint.scss
$c: 1;
.a { .b: min($c, 3); }
Loading