Skip to content

fix !default bug #86

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

Merged
leafo merged 4 commits into from
May 17, 2013
Merged

fix !default bug #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31e5db3
Added test cases for !default properties with spaces
jamesshannon Apr 4, 2013
89f9e63
attempt fix of #82
robocoder Apr 5, 2013
650599a
avoid: Uninitialized string offset: 0
robocoder Apr 6, 2013
1410b84
fix from @albyrock87
robocoder May 16, 2013
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
24 changes: 16 additions & 8 deletions scss.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2734,16 +2734,13 @@ protected function parseChunk() {
$this->literal(":") &&
$this->valueList($value) && $this->end())
{
$defaultVar = false;
// check for !default
if ($value[0] == "list") {
$def = end($value[2]);
if ($def[0] == "keyword" && $def[1] == "!default") {
array_pop($value[2]);
$value = $this->flattenList($value);
$defaultVar = true;
}
$defaultVar = $value[0] == "list" && $this->stripDefault($value);
if (!$defaultVar && isset($value[2]) && is_array($value[2])) {
$nestedValue = end($value[2]);
$defaultVar = is_array($nestedValue) && $nestedValue[0] == "list" && $this->stripDefault($value[2][count($value[2]) - 1]);
}

$this->append(array("assign", $name, $value, $defaultVar), $s);
return true;
} else {
Expand Down Expand Up @@ -2817,6 +2814,17 @@ protected function parseChunk() {
return false;
}

protected function stripDefault(&$value) {
$def = end($value[2]);
if ($def[0] == "keyword" && $def[1] == "!default") {
array_pop($value[2]);
$value = $this->flattenList($value);
return true;
}

return false;
}

protected function literal($what, $eatWhitespace = null) {
if (is_null($eatWhitespace)) $eatWhitespace = $this->eatWhiteDefault;

Expand Down
13 changes: 13 additions & 0 deletions tests/inputs/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,16 @@ del {
color: $something;
}

$font-family-simple: Arial !default;
$font-family-spaces: Helvetica Neue !default;
$font-family-quotes: "Helvetica Neue" !default;
$font-family-commas: Helvetica, Arial, sans-serif !default;
$font-family-sans: "Helvetica Neue", Helvetica, Arial, sans-serif !default;

body {
font-family: $font-family-simple;
font-family: $font-family-spaces;
font-family: $font-family-quotes;
font-family: $font-family-commas;
font-family: $font-family-sans;
}
7 changes: 7 additions & 0 deletions tests/outputs/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,10 @@ del {
color: red; }
del div pre {
color: red; }

body {
font-family: Arial;
font-family: Helvetica Neue;
font-family: "Helvetica Neue";
font-family: Helvetica, Arial, sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }