fix trailing ; with comments within rules

Author: tj

index.js

@@ -144,18 +144,20 @@ Compiler.prototype.keyframes = function(node){
  */
 
 Compiler.prototype.keyframe = function(node){
+  var decls = node.declarations;
+
   if (this.compress) {
     return node.values.join(',')
       + '{'
-      + node.declarations.map(this.declaration, this).join(';')
+      + decls.map(this.visit, this).join('')
       + '}';
   }
 
   return this.indent()
     + node.values.join(', ')
     + ' {\n'
     + this.indent(1)
-    + node.declarations.map(this.declaration, this).join(';\n')
+    + decls.map(this.visit, this).join('\n')
     + this.indent(-1)
     + '\n' + this.indent() + '}\n';
 };
@@ -168,7 +170,7 @@ Compiler.prototype.page = function(node){
   return '@page ' + node.selectors.join(', ')
     + ' {\n'
     + this.indent(1)
-    + node.declarations.map(this.declaration, this).join(';\n')
+    + node.declarations.map(this.visit, this).join('\n')
     + this.indent(-1)
     + '\n}';
 };
@@ -186,14 +188,14 @@ Compiler.prototype.rule = function(node){
 
     return node.selectors.join(',')
       + '{'
-      + decls.map(this.visit, this).join(';')
+      + decls.map(this.visit, this).join('')
       + '}';
   }
 
   return node.selectors.map(function(s){ return indent + s }).join(',\n')
     + ' {\n'
     + this.indent(1)
-    + decls.map(this.visit, this).join(';\n')
+    + decls.map(this.visit, this).join('\n')
     + this.indent(-1)
     + '\n' + this.indent() + '}';
 };
@@ -204,10 +206,10 @@ Compiler.prototype.rule = function(node){
 
 Compiler.prototype.declaration = function(node){
   if (this.compress) {
-    return node.property + ':' + node.value;
+    return node.property + ':' + node.value + ';';
   }
 
-  return this.indent() + node.property + ': ' + node.value;
+  return this.indent() + node.property + ': ' + node.value + ';';
 };
 
 /**

test/cases/document.css

@@ -1,17 +1,17 @@
 @-moz-document url-prefix()  {
   .icon-spin {
-    height: .9em
+    height: .9em;
   }
 
   .btn .icon-spin {
-    height: auto
+    height: auto;
   }
 
   .icon-spin.icon-large {
-    height: 1.25em
+    height: 1.25em;
   }
 
   .btn .icon-spin.icon-large {
-    height: .75em
+    height: .75em;
   }
 }

test/cases/keyframes.css

@@ -1,10 +1,10 @@
 @keyframes fade {
   from {
     opacity: 0;
-    opacity: 1
+    opacity: 1;
   }
 
   to {
-    opacity: 1
+    opacity: 1;
   }
-}
+}

test/cases/media.css

@@ -1,23 +1,23 @@
 @media screen, projection {
   html {
     background: #fffef0;
-    color: #300
+    color: #300;
   }
 
   body {
     max-width: 35em;
-    margin: 0 auto
+    margin: 0 auto;
   }
 }
 
 @media print {
   html {
     background: #fff;
-    color: #000
+    color: #000;
   }
 
   body {
     padding: 1in;
-    border: 0.5pt solid #666
+    border: 0.5pt solid #666;
   }
-}
+}

test/cases/rules.css

@@ -1,9 +1,9 @@
 tobi {
   name: 'tobi';
-  age: 2
+  age: 2;
 }
 
 loki {
   name: 'loki';
-  age: 1
-}
+  age: 1;
+}

test/cases/selectors.css

@@ -1,5 +1,5 @@
 foo,
 bar,
 baz {
-  color: 'black'
-}
+  color: 'black';
+}