Pass through the "important" flag of a mixin to inner mixins.

Author: Horcrux7

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

@@ -108,6 +108,8 @@ private static class SharedState {
         private CssFormatter                                 header;
 
         private boolean                                      isReference;
+
+        private int                                          importantCount;
     }
 
     private String[] selectors;
@@ -122,8 +124,6 @@ private static class SharedState {
 
     private StringBuilder                   insets    = new StringBuilder();
 
-    private boolean                         important;
-
     private boolean                         inlineMode;
 
     private final DecimalFormat             decFormat = new DecimalFormat( "#.########", DecimalFormatSymbols.getInstance( Locale.ENGLISH ) );
@@ -732,7 +732,7 @@ void appendProperty( @Nonnull String name, @Nonnull Expression value ) {
         } else {
             value.appendTo( this );
         }
-        if( important || value.isImportant() ) {
+        if( state.importantCount > 0 || value.isImportant() ) {
             output.append( " !important" );
         }
         semicolon();
@@ -766,12 +766,17 @@ void appendFontPropertyValue( Operation value ) {
     }
 
     /**
-     * Set the flag important.
-     * 
-     * @param important the new value
+     * Increment the important flag.
+     */
+    void incImportant() {
+        state.importantCount++;
+    }
+
+    /**
+     * Decrement the important flag.
      */
-    void setImportant( boolean important ) {
-        this.important = important;
+    void decImportant() {
+        state.importantCount--;
     }
 
     /**

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

@@ -76,8 +76,10 @@ public final int getType() {
      */
     @Override
     public void appendTo( CssFormatter formatter ) {
-        formatter.setImportant( important );
         try {
+            if( important ) {
+                formatter.incImportant();
+            }
             for( MixinMatch match : getRules( formatter ) ) {
                 Rule rule = match.getRule();
                 formatter.addMixin( rule, match.getMixinParameters(), rule.getVariables() );
@@ -89,8 +91,11 @@ public void appendTo( CssFormatter formatter ) {
             throw ex;
         } catch( StackOverflowError soe ) {
             throw createException( "Maximum call stack size exceeded in mixin: " + name, soe );
+        } finally {
+            if( important ) {
+                formatter.decImportant();
+            }
         }
-        formatter.setImportant( false );
     }
 
     /**
@@ -100,6 +105,9 @@ public void appendTo( CssFormatter formatter ) {
      */
     void appendSubRules( String[] parentSelector, CssFormatter formatter ) {
         try {
+            if( important ) {
+                formatter.incImportant();
+            }
             for( MixinMatch match : getRules( formatter ) ) {
                 Rule rule = match.getRule();
                 formatter.addMixin( rule, match.getMixinParameters(), rule.getVariables() );
@@ -114,6 +122,10 @@ void appendSubRules( String[] parentSelector, CssFormatter formatter ) {
         } catch( LessException ex ) {
             ex.addPosition( filename, line, column );
             throw ex;
+        } finally {
+            if( important ) {
+                formatter.decImportant();
+            }
         }
     }
 

test/com/inet/lib/less/samples/less_org_tests/less/mixins-important.css

@@ -0,0 +1,33 @@
+.class {
+  border: 1;
+  boxer: 1;
+  border-width: 1;
+  border: 2 !important;
+  boxer: 2 !important;
+  border-width: 2 !important;
+  border: 3;
+  boxer: 3;
+  border-width: 3;
+  border: 4 !important;
+  boxer: 4 !important;
+  border-width: 4 !important;
+  border: 5;
+  boxer: 5;
+  border-width: 5;
+  border: 0 !important;
+  boxer: 0 !important;
+  border-width: 0 !important;
+  border: 9 !important;
+  border: 9;
+  boxer: 9;
+  border-width: 9;
+}
+.class .inner {
+  test: 1;
+  test: 2 !important;
+  test: 3;
+  test: 4 !important;
+  test: 5;
+  test: 0 !important;
+  test: 9;
+}

test/com/inet/lib/less/samples/less_org_tests/less/mixins-important.less

@@ -0,0 +1,25 @@
+.submixin(@a) {
+  border-width: @a;
+}
+.mixin (9) {
+  border: 9 !important;  
+}
+.mixin (@a: 0) {
+  border: @a;
+  boxer: @a;
+  .inner {
+    test: @a;
+  }
+  // comment
+  .submixin(@a);
+}
+
+.class {
+  .mixin(1);
+  .mixin(2) !important;
+  .mixin(3);
+  .mixin(4) !important;
+  .mixin(5);
+  .mixin !important;
+  .mixin(9);
+}