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

Fix CSS duplicate definitions #4874

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix CSS duplicate definitions #4874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c3bc6e
Use `Call::fromCall()` in `Visitor::visitCall()` irrespective of call…
raviks789 Jul 12, 2022
6711654
Avoid rendering duplicated CSS definitions in `var()` function calls
raviks789 Jul 12, 2022
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
31 changes: 26 additions & 5 deletions library/Icinga/Less/Call.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use Less_Tree_Call;
use Less_Tree_Color;
use Less_Tree_Keyword;
use Less_Tree_Value;
use Less_Tree_Variable;

Expand All @@ -23,12 +24,17 @@ public function compile($env = null)
return parent::compile($env);
}

$keyWord = null;
foreach ($this->args as $arg) {
if (! is_array($arg->value)) {
continue;
}

$name = null;
if ($arg->value[0] instanceof Less_Tree_Keyword) {
$keyWord = $arg->value[0]->value;
}

if ($arg->value[0] instanceof Less_Tree_Variable) {
// This is the case when defining a variable with a callable LESS rules such as fade, fadeout..
// Example: `@foo: #fff; @foo-bar: fade(@foo, 10);`
Expand All @@ -55,13 +61,28 @@ public function compile($env = null)
$vr->compile($env);
}

// Get the uppermost variable of the variable references
while (! $vr instanceof ColorProp) {
$vr = $vr->getRef();
if ($this->name === 'var') {
// If calling var() CSS function, get the next variable in variable references
// if keyword value and color property name are same
if (substr($keyWord ?? '', 2) === $vr->getName()) {
// Get the uppermost variable of the variable references in case the keyword
// value and color property name are same.
$vr = $vr->getRef();
}
} else {
// If not calling var() CSS function get the uppermost variable of the
// variable references
while (! $vr instanceof ColorProp) {
$vr = $vr->getRef();
}
}
} elseif ($vr instanceof Less_Tree_Color) {
$vr = ColorProp::fromColor($vr);
$vr->setName($name);
// Only if keyword value and color property name are not same then set variable to
// ColorProp::fromColor($vr)
if (substr($keyWord ?? '', 2) !== substr($name, 1)) {
$vr = ColorProp::fromColor($vr);
$vr->setName($name);
}
}

$arg->value[0] = $vr;
Expand Down
8 changes: 3 additions & 5 deletions library/Icinga/Less/Visitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,9 @@ class Visitor extends Less_VisitorReplacing

public function visitCall($c)
{
if ($c->name !== 'var') {
// We need to use our own tree call class , so that we can precompile the arguments before making
// the actual LESS function calls. Otherwise, it will produce lots of invalid argument exceptions!
$c = Call::fromCall($c);
}
// We need to use our own tree call class , so that we can precompile the arguments before making
// the actual LESS function calls. Otherwise, it will produce lots of invalid argument exceptions!
$c = Call::fromCall($c);

return $c;
}
Expand Down
60 changes: 60 additions & 0 deletions test/php/library/Icinga/Util/LessParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,66 @@ public function testNestedVariables()
);
}

public function testNestedCssDefinitions()
{
$this->assertEquals(
<<<CSS
.black {
color: var(--my-color, var(--black, #000000));
}
.notBlack {
color: var(--my-black-color, var(--my-color, var(--black, #000000)));
}

CSS
,
$this->compileLess(<<<LESS
@black: black;
@my-color: @black;
@my-black-color: @my-color;

.black {
color: var(--my-color, @black);
}

.notBlack {
color: var(--my-black-color, @my-color);
}
LESS
)
);
}

public function testNestedDuplcateCssDefinitions()
{
$this->assertEquals(
<<<CSS
.black {
color: var(--my-color, var(--black, #000000));
}
.notBlack {
color: var(--my-black-color, var(--my-color, var(--black, #000000)));
}

CSS
,
$this->compileLess(<<<LESS
@black: black;
@my-color: @black;
@my-black-color: @my-color;

.black {
color: var(--my-color, @my-color);
}

.notBlack {
color: var(--my-black-color, @my-black-color);
}
LESS
)
);
}

public function testNestedVariablesInMixinCalls()
{
$this->assertEquals(
Expand Down