stick-brace: stick closing brace with line-break

Author: mishanga

lib/csscomb.js

@@ -11,10 +11,10 @@ var vfs = require('vow-fs');
 var Comb = function() {
     this._handlers;
     this._options = [
+        'always-semicolon',
         'strip-spaces',
         'stick-brace',
         'colon-space',
-        'always-semicolon',
         'rule-indent',
         'sort-order'
     ];

lib/options/stick-brace.js

@@ -30,6 +30,11 @@ module.exports = {
                 }
             }
         }
+
+        if (nodeType === 'block' || nodeType === 'atrulers') {
+            if (node[node.length - 1][0] === 's') node.pop();
+            node.push(['s', '\n']);
+        }
     }
 
 };

test/integral.expect.css

@@ -3,12 +3,12 @@ a, b, i /* foobar */
 {
     padding: 0;
     margin: 0;
-  }
+}
   div p
 {
     font-size: 1px;
     top: 0;
-    }
+}
     div p em
 {
     font-style: italic;
@@ -25,7 +25,8 @@ a, b, i /* foobar */
         position: relative;
         width: 100%;
         z-index: 3;
-}}
+}
+}
 
 @media screen and (min-width: 35em) /* screen */,
        print and (min-width: 40em) /* print */
@@ -51,12 +52,12 @@ div
 {
     font-size: 1px;
     top: 0;
-  }
+}
     div p em
 {
     font-style: italic;/* inline comment*/
     border-bottom: 1px solid red;
-    }
+}
 
 /* Фигурные скобки. Вариант 3 */
 div
@@ -68,20 +69,22 @@ div
 {
     font-size: 1px;
     top: 0;
-  }
+}
     div p em
 {
         /* upline comment*/
     font-style: italic;
 
     border-bottom: 1px solid red; /* trololo */ /* trololo */
-    }
+}
 
     a
 {
     top: 0;/* ololo */
-    margin: 0;}
+    margin: 0;
+}
     b
 {
     top: 0/* trololo */;
-    margin: 0;}
+    margin: 0;
+}

test/stick-brace.js

@@ -16,35 +16,25 @@ describe('options/stick-brace', function() {
     it('True Boolean value should set 1 space after brace', function() {
         comb.configure({ 'stick-brace': true });
         assert.equal(
-            comb.processString(
-                'a { color: red }' +
-                'a,\nb /* i */\n{ color: red }' +
-                'a{color:red}' +
-                'a \t\t \n{color:red}' +
-                'a /* foo */ {color:red}'
-            ),
-            'a { color: red }' +
-            'a,\nb /* i */ { color: red }' +
-            'a {color:red}' +
-            'a {color:red}' +
-            'a /* foo */ {color:red}'
+            comb.processString('a{color:red }'),
+            'a {color:red \n}'
         );
     });
     it('Valid String value should set equal space after brace', function() {
         comb.configure({ 'stick-brace': '\n' });
         assert.equal(
             comb.processString(
-                'a { color: red }' +
-                'a, b /* i */ { color: red }' +
-                'a{color:red}' +
-                'a \t\t \n{color:red}' +
-                'a /* foo */ {color:red}'
+                'a{ color: red }' +
+                'a, b /* i */ { color: red; }' +
+                'a \t\t \n{color:red\n \n}' +
+                'a /* foo */ {color:red ; \n \n\t}' +
+                '@media all { .input__control { color: #000;\n \n }\t}'
             ),
-            'a\n{ color: red }' +
-            'a, b /* i */\n{ color: red }' +
-            'a\n{color:red}' +
-            'a\n{color:red}' +
-            'a /* foo */\n{color:red}'
+            'a\n{ color: red \n}' +
+            'a, b /* i */\n{ color: red;\n}' +
+            'a\n{color:red\n \n\n}' +
+            'a /* foo */\n{color:red ;\n}' +
+            '@media all\n{ .input__control\n{ color: #000;\n}\n}'
         );
     });
 });