Merge pull request #20 from csscomb/stick-brace-fix

Лишние переносы строк "stick-brace": "\n" (close #19)

Author: mishanga

lib/options/colon-space.js

@@ -7,6 +7,7 @@ module.exports = {
      * @returns {Object}
      */
     setValue: function(value) {
+        this._value = false;
         if (value === true) this._value = 'after';
         if (typeof value === 'string' && value.match(/after|before|both/)) this._value = value;
         if (!this._value) return;

lib/options/stick-brace.js

@@ -7,6 +7,7 @@ module.exports = {
      * @returns {Object}
      */
     setValue: function(value) {
+        this._value = false;
         if (value === true) value = ' ';
         if (typeof value === 'string' && value.match(/^[ \t\n]*$/)) this._value = value;
         if (!this._value) return;
@@ -19,9 +20,15 @@ module.exports = {
      * @param {node} node
      */
     process: function(nodeType, node) {
-        if (nodeType === 'simpleselector') {
-            if (node[node.length - 1][0] === 's') node.pop();
-            node.push(['s', this._value]);
+        if (nodeType === 'selector') {
+            for (var i = node.length; i--;) {
+                var nodeItem = node[i];
+                if (nodeItem[0] === 'simpleselector') {
+                    if (nodeItem[nodeItem.length - 1][0] === 's') nodeItem.pop();
+                    nodeItem.push(['s', this._value]);
+                    break;
+                }
+            }
         }
     }
 

test/stick-brace.js

@@ -18,11 +18,13 @@ describe('options/stick-brace', function() {
         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}'
@@ -33,11 +35,13 @@ describe('options/stick-brace', function() {
         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\n{ color: red }' +
+            'a, b /* i */\n{ color: red }' +
             'a\n{color:red}' +
             'a\n{color:red}' +
             'a /* foo */\n{color:red}'