Gonzales 3.0: Update block-indent option

Author: tonyganch

lib/options/block-indent.js

@@ -1,22 +1,50 @@
 module.exports = (function() {
+    var syntax;
+    var value;
+
     function processStylesheet(node) {
         var spaces;
         var whitespaceNode;
         var i;
 
         for (i = node.length; i--;) {
-            whitespaceNode = node[i];
+            whitespaceNode = node.get(i);
 
-            if (whitespaceNode[0] !== 's') continue;
+            if (!whitespaceNode.is('s')) continue;
 
-            spaces = whitespaceNode[1].replace(/\n[ \t]+/gm, '\n');
+            spaces = whitespaceNode.content.replace(/\n[ \t]+/gm, '\n');
 
             if (spaces === '') {
-                node.splice(i, 1);
+                node.content.splice(i, 1);
             } else {
-                whitespaceNode[1] = spaces;
+                whitespaceNode.content = spaces;
+            }
+        }
+
+        function processBlock(x, level) {
+            level = level || 0;
+
+            for (var i = 0; i < x.content.length; i++) {
+                var n = x.get(i);
+                if (!n) continue;
+
+
+                if (syntax === 'sass' && n.is('block')) {
+                    processSassBlock(n, level, value);
+                }
+
+                // Continue only with space nodes inside {...}:
+                if (syntax !== 'sass' && level !== 0 && n.is('s')) {
+                    processSpaceNode(n, level, value);
+                }
+
+                if (n.is('block') || n.is('atrulers')) level++;
+
+                processBlock(n, level);
             }
         }
+
+        processBlock(node);
     }
 
     function processSassBlock(node, level, value) {
@@ -25,28 +53,28 @@ module.exports = (function() {
         var i;
 
         for (i = node.length; i--;) {
-            whitespaceNode = node[i];
+            whitespaceNode = node.get(i);
 
-            if (whitespaceNode[0] !== 's') continue;
+            if (!whitespaceNode.is('s')) continue;
 
-            if (whitespaceNode[1] === '\n') continue;
+            if (whitespaceNode.content === '\n') continue;
 
-            spaces = whitespaceNode[1].replace(/[ \t]/gm, '');
+            spaces = whitespaceNode.content.replace(/[ \t]/gm, '');
             spaces += new Array(level + 2).join(value);
-            whitespaceNode[1] = spaces;
+            whitespaceNode.content = spaces;
         }
     }
 
     function processSpaceNode(node, level, value) {
         var spaces;
 
         // Remove all whitespaces and tabs, leave only new lines:
-        spaces = node[0].replace(/[ \t]/gm, '');
+        spaces = node.content.replace(/[ \t]/gm, '');
 
         if (!spaces) return;
 
         spaces += new Array(level + 1).join(value);
-        node[0] = spaces;
+        node.content = spaces;
     }
 
     return {
@@ -64,26 +92,16 @@ module.exports = (function() {
         /**
          * Processes tree node.
          *
-         * @param {String} nodeType
          * @param {node} node
-         * @param {Number} level
          */
-        process: function process(nodeType, node, level) {
-            var syntax = this.getSyntax();
-            var value = this.getValue('block-indent');
+        process: function process(node) {
+            if (!node.is('stylesheet')) return;
 
-            if (nodeType === 'stylesheet') {
-                return processStylesheet(node);
-            }
+            syntax = this.getSyntax();
+            value = this.getValue('block-indent');
 
-            if (syntax === 'sass' && nodeType === 'block') {
-                return processSassBlock(node, level, value);
-            }
+            processStylesheet(node);
 
-            // Continue only with space nodes inside {...}:
-            if (syntax !== 'sass' && level !== 0 && nodeType === 's') {
-                processSpaceNode(node, level, value);
-            }
         },
 
         /**

test/options/block-indent-sass/test.js

@@ -1,4 +1,4 @@
-describe.skip('options/block-indent (sass):', function() {
+describe('options/block-indent (sass):', function() {
     it('First level ruleset\'s block', function() {
         this.comb.configure({ 'block-indent': 2 });
         this.shouldBeEqual('block.sass', 'block.expected.sass');

test/options/block-indent-scss/test.js

@@ -1,4 +1,4 @@
-describe.skip('options/block-indent (scss):', function() {
+describe('options/block-indent (scss):', function() {
     it('Issue 213', function() {
         this.comb.configure({ 'block-indent': 2 });
         this.shouldBeEqual('nested-include.scss', 'nested-include.expected.scss');

test/options/block-indent/test.js

@@ -1,4 +1,4 @@
-describe.skip('options/block-indent:', function() {
+describe('options/block-indent:', function() {
     it('Array value => should not change anything', function() {
         this.comb.configure({ 'block-indent': ['', ' '] });
         this.shouldBeEqual('test.css');
@@ -24,38 +24,38 @@ describe.skip('options/block-indent:', function() {
         this.shouldBeEqual('test.css', 'test-2.expected.css');
     });
 
-    it('Should detect nothing with an empty block, test 1', function() {
+    it.skip('Should detect nothing with an empty block, test 1', function() {
         this.shouldDetect(
             ['block-indent'],
             'a{ }',
             {}
         );
     });
 
-    it('Should detect nothing with an empty block, test 2', function() {
+    it.skip('Should detect nothing with an empty block, test 2', function() {
         this.shouldDetect(
             ['block-indent'],
             'a{}',
             {}
         );
     });
 
-    it('Should detect correct number of spaces', function() {
+    it.skip('Should detect correct number of spaces', function() {
         this.shouldDetect(
             ['block-indent'],
             'a{\n    top: 0;\n    color: tomato;\n}',
             { 'block-indent': '    ' }
         );
     });
 
-    it('Should detect no indent for one-line code', function() {
+    it.skip('Should detect no indent for one-line code', function() {
         this.shouldDetect(
             ['block-indent'],
             'a{ top: 0; color: tomato; }',
             {}
         );
     });
-    it('Valid string value => should set proper space after combnator', function() {
+    it.skip('Valid string value => should set proper space after combnator', function() {
         this.comb.configure({ 'block-indent': '    ', 'space-before-closing-brace': '\n' });
         this.shouldBeEqual('test.css', 'test-3.expected.css');
     });