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.

Sign up for GitHub

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

Jump to bottom

Reformat #1133

Merged
merged 1 commit into from Nov 4, 2020
Merged

Reformat #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/src/value/color.dart
View file
Open in desktop
Expand Up @@ -98,8 +98,10 @@ class SassColor extends Value implements ext.SassColor {
factory SassColor.hwb(num hue, num whiteness, num blackness, [num alpha]) {
// From https://www.w3.org/TR/css-color-4/#hwb-to-rgb
var scaledHue = hue % 360 / 360;
var scaledWhiteness = fuzzyAssertRange(whiteness, 0, 100, "whiteness") / 100;
var scaledBlackness = fuzzyAssertRange(blackness, 0, 100, "blackness") / 100;
var scaledWhiteness =
fuzzyAssertRange(whiteness, 0, 100, "whiteness") / 100;
var scaledBlackness =
fuzzyAssertRange(blackness, 0, 100, "blackness") / 100;

var sum = scaledWhiteness + scaledBlackness;
if (sum > 1) {
Expand All @@ -117,11 +119,8 @@ class SassColor extends Value implements ext.SassColor {
// don't cache its values because we expect the memory overhead of doing so
// to outweigh the cost of recalculating it on access. Instead, we eagerly
// convert it to RGB and then convert back if necessary.
return SassColor.rgb(
toRgb(scaledHue + 1/3),
toRgb(scaledHue),
toRgb(scaledHue - 1/3),
alpha);
return SassColor.rgb(toRgb(scaledHue + 1 / 3), toRgb(scaledHue),
toRgb(scaledHue - 1 / 3), alpha);
}

SassColor._(this._red, this._green, this._blue, this._hue, this._saturation,
Expand Down
24 changes: 13 additions & 11 deletions test/dart_api/value/color_test.dart
View file
Open in desktop
Expand Up @@ -130,22 +130,21 @@ void main() {
equals(SassColor.hwb(210, 7.0588235294117645, 42)));
expect(
value.changeHwb(alpha: 0.5),
equals(
SassColor.hwb(210, 7.0588235294117645, 66.27450980392157, 0.5)));
equals(SassColor.hwb(
210, 7.0588235294117645, 66.27450980392157, 0.5)));
expect(
value.changeHwb(
hue: 120, whiteness: 42, blackness: 42, alpha: 0.5),
value.changeHwb(hue: 120, whiteness: 42, blackness: 42, alpha: 0.5),
equals(SassColor.hwb(120, 42, 42, 0.5)));
expect(
value.changeHwb(whiteness: 50),
equals(SassColor.hwb(210, 43, 57)));
value.changeHwb(whiteness: 50), equals(SassColor.hwb(210, 43, 57)));
});

test("allows valid values", () {
expect(value.changeHwb(whiteness: 0).whiteness, equals(0));
expect(value.changeHwb(whiteness: 100).whiteness, equals(60.0));
expect(value.changeHwb(blackness: 0).blackness, equals(0));
expect(value.changeHwb(blackness: 100).blackness, equals(93.33333333333333));
expect(value.changeHwb(blackness: 100).blackness,
equals(93.33333333333333));
expect(value.changeHwb(alpha: 0).alpha, equals(0));
expect(value.changeHwb(alpha: 1).alpha, equals(1));
});
Expand Down Expand Up @@ -219,7 +218,10 @@ void main() {
test("equals the same color", () {
expect(value, equalsWithHash(SassColor.rgb(0x3E, 0x98, 0x3E)));
expect(value, equalsWithHash(SassColor.hsl(120, 42, 42)));
expect(value, equalsWithHash(SassColor.hwb(120, 24.313725490196077, 40.3921568627451)));
expect(
value,
equalsWithHash(
SassColor.hwb(120, 24.313725490196077, 40.3921568627451)));
});
});

Expand Down Expand Up @@ -295,9 +297,9 @@ void main() {
});

test("allows valid values", () {
expect(SassColor.hwb(0, 0, 0, 0), equals(parseValue("rgba(255, 0, 0, 0)")));
expect(SassColor.hwb(4320, 100, 100, 1),
equals(parseValue("grey")));
expect(
SassColor.hwb(0, 0, 0, 0), equals(parseValue("rgba(255, 0, 0, 0)")));
expect(SassColor.hwb(4320, 100, 100, 1), equals(parseValue("grey")));
});

test("disallows invalid values", () {
Expand Down