fix #269, missing on NameValue type

oyejorge · Nov 3, 2015 · a8dac63 · a8dac63
1 parent fc29f0d
commit a8dac63
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/lib/Less/Parser.php b/lib/Less/Parser.php
@@ -87,7 +87,7 @@ public function __construct( $env = null ){
 		// mbstring.func_overload > 1 bugfix
 		// The encoding value must be set for each source file,
 		// therefore, to conserve resources and improve the speed of this design is taken here
-		if (ini_get('mbstring.func_overload')) {			
+		if (ini_get('mbstring.func_overload')) {
 			$this->mb_internal_encoding = ini_get('mbstring.internal_encoding');
 			@ini_set('mbstring.internal_encoding', 'ascii');
 		}
@@ -220,7 +220,7 @@ public function getCss(){
 		@ini_set('precision',$precision);
 		setlocale(LC_NUMERIC, $locale);
 
-		// If you previously defined $this->mb_internal_encoding 
+		// If you previously defined $this->mb_internal_encoding
 		// is required to return the encoding as it was before
 		if ($this->mb_internal_encoding != '') {
 			@ini_set("mbstring.internal_encoding", $this->mb_internal_encoding);

diff --git a/lib/Less/Tree/NameValue.php b/lib/Less/Tree/NameValue.php
@@ -17,6 +17,7 @@ class Less_Tree_NameValue extends Less_Tree{
 	public $index;
 	public $currentFileInfo;
 	public $type = 'NameValue';
+	public $important = '';
 
 	public function __construct($name, $value = null, $index = null, $currentFileInfo = null ){
 		$this->name = $name;
@@ -31,11 +32,20 @@ public function genCSS( $output ){
 			$this->name
 			. Less_Environment::$_outputMap[': ']
 			. $this->value
+			. $this->important
 			. (((Less_Environment::$lastRule && Less_Parser::$options['compress'])) ? "" : ";")
 			, $this->currentFileInfo, $this->index);
 	}
 
 	public function compile ($env){
 		return $this;
 	}
+
+	public function makeImportant(){
+		$new = new Less_Tree_NameValue($this->name, $this->value, $this->index, $this->currentFileInfo);
+		$new->important = ' !important';
+		return $new;
+	}
+
+
 }
diff --git a/lib/Less/Tree/Ruleset.php b/lib/Less/Tree/Ruleset.php
@@ -264,7 +264,7 @@ function makeImportant(){
 
 		$important_rules = array();
 		foreach($this->rules as $rule){
-			if( $rule instanceof Less_Tree_Rule || $rule instanceof Less_Tree_Ruleset ){
+			if( $rule instanceof Less_Tree_Rule || $rule instanceof Less_Tree_Ruleset || $rule instanceof Less_Tree_NameValue ){
 				$important_rules[] = $rule->makeImportant();
 			}else{
 				$important_rules[] = $rule;

diff --git a/test/Fixtures/bug-reports/css/198.css b/test/Fixtures/bug-reports/css/198.css
@@ -0,0 +1,3 @@
+.goog-menuitem-icon {
+  filter: alpha(opacity=30);
+}
diff --git a/test/Fixtures/bug-reports/css/210.css b/test/Fixtures/bug-reports/css/210.css
@@ -1,4 +1,4 @@
-
+/* color channel functions */
 body .color-channels {
   --hue: 210;
   --saturation: 50%;