implements parsing of !important for CSS properties. #16

Author: Horcrux7

src/com/inet/lib/less/CssFormatter.java

@@ -732,7 +732,7 @@ void appendProperty( @Nonnull String name, @Nonnull Expression value ) {
         } else {
             value.appendTo( this );
         }
-        if( important ) {
+        if( important || value.isImportant() ) {
             output.append( " !important" );
         }
         semicolon();

src/com/inet/lib/less/Expression.java

@@ -58,6 +58,8 @@ abstract class Expression extends LessObject implements Formattable {
 
     private String str;
 
+    private boolean important;
+
     /**
      * Create a new instance.
      * 
@@ -156,7 +158,7 @@ public void appendTo( CssFormatter formatter ) {
      *            the CCS target
      * @return the value
      */
-    public String stringValue( CssFormatter formatter ) {
+    String stringValue( CssFormatter formatter ) {
         try {
             formatter.addOutput();
             appendTo( formatter );
@@ -166,6 +168,21 @@ public String stringValue( CssFormatter formatter ) {
         }
     }
 
+    /**
+     * If this expression is mark as important
+     * @return true, if important
+     */
+    boolean isImportant() {
+        return important;
+    }
+
+    /**
+     * Enable the important flag.
+     */
+    void setImportant() {
+        important = true;
+    }
+
     /**
      * Get the value as a list
      * 

src/com/inet/lib/less/LessParser.java

@@ -878,6 +878,31 @@ private Expression parseExpression( char leftOperator ) {
                 case '`':
                     left = concat( left, ' ', new JavaScriptExpression( reader, readQuote( ch ) ) );
                     break;
+                case '!':
+                    if( builder.length() > 0 ) {
+                        left = concat( left, ' ', buildExpression( trim( builder ) ) );
+                    }
+                    if( left != null ) {
+                        for( ;; ) {
+                            ch = read();
+                            switch( ch ) {
+                                case ';':
+                                case ')':
+                                case '}':
+                                    str = trim( builder );
+                                    if( str.equals( "important" ) ) {
+                                        left.setImportant();
+                                        back( ch );
+                                    } else {
+                                        left = concat( left, ' ', buildExpression( '!' + str ) );
+                                    }
+                                    return left;
+                                default:
+                                    builder.append( ch );
+                            }
+                        }
+                    }
+                    //$FALL-THROUGH$ 
                 default:
                     boolean isWhite = Character.isWhitespace( ch );
                     if( isWhite ) {

src/com/inet/lib/less/Operation.java

@@ -599,6 +599,14 @@ public Operation listValue( CssFormatter formatter ) {
         return super.listValue( formatter );
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    boolean isImportant() {
+        return super.isImportant() || operands.get( operands.size() -1 ) .isImportant();
+    }
+
     /**
      * {@inheritDoc}
      */

test/com/inet/lib/less/samples/general/important.css

@@ -0,0 +1,6 @@
+#important {
+  color1: #FFFFFF !important;
+  color2: #FFFFFF !important;
+  color3: #777777 !important;
+  color4: #343434 !important;
+}

test/com/inet/lib/less/samples/general/important.less

@@ -0,0 +1,6 @@
+#important {
+    color1: #FFFFFF!important;
+    color2: #FFFFFF !important;
+    color3: #777777 ! important;
+    color4: #333 + 1 !important;
+}

test/com/inet/lib/less/samples/less_org_tests/less/css.css

@@ -79,8 +79,8 @@ p + h1 {
 }
 #important {
   color: red !important;
-  width: 100%!important;
-  height: 20px ! important;
+  width: 100% !important;
+  height: 20px !important;
 }
 @font-face {
   font-family: font-a;