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

Quote channel names in color functions #2218

Merged
merged 2 commits into from
Apr 13, 2024
Merged

Quote channel names in color functions #2218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c96442f
Quote channel names in color functions
nex3 Apr 10, 2024
854d3df
Factor out a _channelName helper
nex3 Apr 13, 2024
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
21 changes: 11 additions & 10 deletions lib/src/functions/color.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,11 +448,8 @@ final module = BuiltInModule("color", functions: <Callable>[
r"$color, $channel",
(arguments) => SassBoolean(arguments[0]
.assertColor("color")
.isChannelMissing(
(arguments[1].assertString("channel")..assertQuoted("channel"))
.text,
colorName: "color",
channelName: "channel"))),
.isChannelMissing(_channelName(arguments[1]),
colorName: "color", channelName: "channel"))),

_function(
"is-in-gamut",
Expand All @@ -475,7 +472,7 @@ final module = BuiltInModule("color", functions: <Callable>[

_function("channel", r"$color, $channel, $space: null", (arguments) {
var color = _colorInSpace(arguments[0], arguments[2]);
var channelName = arguments[1].assertString("channel").text.toLowerCase();
var channelName = _channelName(arguments[1]);
if (channelName == "alpha") return SassNumber(color.alpha);

var channelIndex = color.space.channels
Expand Down Expand Up @@ -511,10 +508,8 @@ final module = BuiltInModule("color", functions: <Callable>[
"is-powerless",
r"$color, $channel, $space: null",
(arguments) => SassBoolean(_colorInSpace(arguments[0], arguments[2])
.isChannelPowerless(
arguments[1].assertString("channel").text.toLowerCase(),
colorName: "color",
channelName: "channel"))),
.isChannelPowerless(_channelName(arguments[1]),
colorName: "color", channelName: "channel"))),

_complement,

Expand Down Expand Up @@ -1510,6 +1505,12 @@ String _suggestScaleAndAdjust(
return suggestion + "color.adjust(\$color, \$$channelName: $difference)";
}

/// Asserts that `value` is an unquoted string and throws an error if it's not.
///
/// Assumes that `value` comes from a parameter named `$channel`.
String _channelName(Value value) =>
(value.assertString("channel")..assertQuoted("channel")).text.toLowerCase();

/// Like [BuiltInCallable.function], but always sets the URL to
/// `sass:color`.
BuiltInCallable _function(
Expand Down