Merge pull request #24 from csscomb/m.indent

Option: rule-indent

Author: mishanga

lib/csscomb.js

@@ -14,8 +14,8 @@ var Comb = function() {
         'strip-spaces',
         'stick-brace',
         'colon-space',
-        'rule-indent',
         'always-semicolon',
+        'rule-indent',
         'sort-order'
     ];
     this._config = {};
@@ -54,21 +54,23 @@ Comb.prototype = {
      * @returns {Array}
      */
     processTree: function(tree) {
-        this.processNode(['tree', tree]);
+        this.processNode(['tree', tree], 0);
         return tree;
     },
 
     /**
      * Processes tree node.
      * @param {Array} node Tree node
+     * @param {Number} level Indent level
      */
     processNode: function(node, level) {
         var _this = this;
         node.forEach(function(node) {
             if (!Array.isArray(node)) return;
             var nodeType = node.shift();
+            if (nodeType === 'atrulers') level++;
             _this._handlers.forEach(function(handler) {
-                handler.process(nodeType, node);
+                handler.process(nodeType, node, level);
             });
             node.unshift(nodeType);
             _this.processNode(node, level);

lib/options/rule-indent.js

@@ -0,0 +1,52 @@
+module.exports = {
+
+    /**
+     * Sets handler value.
+     *
+     * @param {String|Number|Boolean} value Option value
+     * @returns {Object}
+     */
+    setValue: function(value) {
+        this._value = false;
+        if (value === true) value = 4;
+        if (typeof value === 'number' && value === Math.abs(Math.round(value))) value = new Array(value + 1).join(' ');
+        if (typeof value === 'string' && value.match(/^[ \t]*$/)) this._value = value;
+        if (!this._value) return;
+        return this;
+    },
+
+    /**
+     * Processes tree node.
+     * @param {String} nodeType
+     * @param {node} node
+     */
+    process: function(nodeType, node, level) {
+        // increasing indent level
+        if (nodeType === 'block') {
+            var value = '\n' + new Array(level + 2).join(this._value);
+            if (node[0][0] !== 's') {
+                node.unshift(['s', '']);
+            }
+            node.forEach(function(nodeItem, i) {
+                if (nodeItem[0] === 'declaration') {
+                    var space = node[i - 1];
+                    var tail;
+
+                    if (space[0] !== 's') {
+                        space = ['s', ''];
+                        tail = node.splice(i);
+                        tail.unshift(space);
+                        Array.prototype.push.apply(node, tail);
+                    }
+
+                    // replacing last line space by value:
+                    // '' => '\n\t'
+                    // '\n   ' => '\n\t'
+                    // '\n \n ' => '\n \n\t'
+                    space[1] = space[1].replace(/(\n)?([\t ]+)?$/, value);
+                }
+            });
+        }
+    }
+
+};

test/integral.expect.css

@@ -1,84 +1,87 @@
 /* Фигурные скобки. Вариант 1 */
 a, b, i /* foobar */
 {
-  padding: 0;
-  margin: 0;
+    padding: 0;
+    margin: 0;
   }
   div p
 {
     font-size: 1px;
-      top: 0;
+    top: 0;
     }
     div p em
 {
-        font-style: italic;
-        border-bottom: 1px solid red;
+    font-style: italic;
+    border-bottom: 1px solid red;
 }
 
 @media all /* media */
 { /* foobar */
 .input__control
 {
-    color: #000;
-    font-size: 100%;
-    margin: 0;
-    position: relative;
-    width: 100%;
-    z-index: 3;
+        color: #000;
+        font-size: 100%;
+        margin: 0;
+        position: relative;
+        width: 100%;
+        z-index: 3;
 }}
 
 @media screen and (min-width: 35em) /* screen */,
        print and (min-width: 40em) /* print */
 { /* foobar */
 .input__control
 {
-    -moz-box-sizing: border-box;
-    background: none;
-    border: 0;
-    box-sizing: border-box;
-    outline: 0;
-    padding: 0.4em 0;
+        -moz-box-sizing: border-box;
+        background: none;
+        border: 0;
+        box-sizing: border-box;
+        outline: 0;
+        padding: 0.4em 0;
 }
 }
 
 /* Фигурные скобки. Вариант 2 */
 div
 {
-  padding: 0;
-  margin: 0;
+    padding: 0;
+    margin: 0;
 }
   div p
 {
     font-size: 1px;
-      top: 0;
+    top: 0;
   }
     div p em
 {
-        font-style: italic;/* inline comment*/
-        border-bottom: 1px solid red;
+    font-style: italic;/* inline comment*/
+    border-bottom: 1px solid red;
     }
 
 /* Фигурные скобки. Вариант 3 */
 div
 {
-  padding: 0;
-  margin: 0;
+    padding: 0;
+    margin: 0;
 }
 /* foo */  div p
 {
     font-size: 1px;
-      top: 0;
+    top: 0;
   }
     div p em
 {
         /* upline comment*/
-        font-style: italic;
-        border-bottom: 1px solid red; /* trololo */ /* trololo */
+    font-style: italic;
+
+    border-bottom: 1px solid red; /* trololo */ /* trololo */
     }
 
     a
 {
-top: 0;/* ololo */margin: 0;}
+    top: 0;/* ololo */
+    margin: 0;}
     b
 {
-top: 0/* trololo */;margin: 0;}
+    top: 0/* trololo */;
+    margin: 0;}

test/integral.origin.css

@@ -66,6 +66,7 @@ div {
     div p em {
         /* upline comment*/
         font-style:italic;
+        
         border-bottom:1px solid red /* trololo */ /* trololo */
     }
 

test/rule-indent.js

@@ -0,0 +1,52 @@
+var Comb = require('../lib/csscomb');
+var assert = require('assert');
+
+describe('options/rule-indent', function() {
+    var comb;
+    beforeEach(function() {
+        comb = new Comb();
+    });
+    it('Invalid Number value should not change space after brace', function() {
+        comb.configure({ 'rule-indent': 3.5 });
+        assert.equal(
+            comb.processString('a {\n color: red }'),
+            'a {\n color: red }'
+        );
+    });
+    it('Invalid String value should not change space after brace', function() {
+        comb.configure({ 'rule-indent': 'foobar' });
+        assert.equal(
+            comb.processString('a {\n color: red }'),
+            'a {\n color: red }'
+        );
+    });
+    it('True Boolean value should set 4 spaces indent', function() {
+        comb.configure({ 'rule-indent': true });
+        assert.equal(
+            comb.processString('a {\n color: red }'),
+            'a {\n    color: red }'
+        );
+    });
+    it('Valid Number value should set equal space after brace', function() {
+        comb.configure({ 'rule-indent': 3 });
+        assert.equal(
+            comb.processString('a {\n color: red }'),
+            'a {\n   color: red }'
+        );
+    });
+    it('Valid String value should set equal space after brace', function() {
+        comb.configure({ 'rule-indent': '\t' });
+        assert.equal(
+            comb.processString(
+                'a{color:red;background:#fff}\n' +
+                'a { color: red; background: #fff; }\n' +
+                'a {\ncolor:red;\n\nbackground: #fff}\n' +
+                'a { /* foo */ color:red; /* bar */\n\nbackground: #fff\n}\n'
+            ),
+            'a{\n\tcolor:red;\n\tbackground:#fff}\n' +
+            'a {\n\tcolor: red;\n\tbackground: #fff; }\n' +
+            'a {\n\tcolor:red;\n\n\tbackground: #fff}\n' +
+            'a { /* foo */\n\tcolor:red; /* bar */\n\n\tbackground: #fff\n}\n'
+        );
+    });
+});