#379: Fix processing of hashes

Author: tonyganch

lib/options/block-indent.js

@@ -6,7 +6,7 @@ module.exports = (function() {
         level = level || 0;
 
         // XXX: Hack for braces
-        if (node.is('braces')) return;
+        if (node.is('braces') || node.is('id')) return;
 
         for (var i = 0; i < node.length; i++) {
             var n = node.get(i);

lib/options/space-before-closing-brace.js

@@ -19,7 +19,7 @@ module.exports = (function() {
         level = level || 0;
 
         // XXX: Hack for braces
-        if (x.is('braces')) return;
+        if (x.is('braces') || x.is('id')) return;
 
         x.forEach(function(node) {
             if (!node.is('block') &&

lib/options/space-before-opening-brace.js

@@ -35,10 +35,10 @@ module.exports = (function() {
         process: function(node) {
             var value = this.getValue('space-before-opening-brace');
 
-            node.forEach(function(block, i) {
-                // XXX: Hack for braces
-                if (typeof block === 'string') return;
+            // XXX: Hack for braces
+            if (node.is('braces') || node.is('id')) return;
 
+            node.forEach(function(block, i) {
                 // If found block node stop at the next one for space check:
                 if (!block.is('block') && !block.is('atrulers')) return;
 
@@ -71,10 +71,10 @@ module.exports = (function() {
         detect: function(node) {
             var variants = [];
 
-            node.forEach(function(block, i) {
-                // XXX: Hack for braces
-                if (typeof block === 'string') return;
+            // XXX: Hack for braces
+            if (node.is('braces') || node.is('id')) return [];
 
+            node.forEach(function(block, i) {
                 // If found block node stop at the next one for space check:
                 if (!block.is('block') && !block.is('atrulers')) return;
 

lib/options/space-between-declarations.js

@@ -67,7 +67,7 @@ module.exports = (function() {
 
             // TODO: Limit nodes to blocks, stylesheet, etc.
             // XXX: Hack for braces
-            if (node.is('braces')) return;
+            if (node.is('braces') || node.is('id')) return;
 
             for (var i = 0, l = node.length; i < l; i++) {
                 if (!node.get(i) || !node.get(i).is('declarationDelimiter')) continue;

test/options/block-indent/issue-379.css

@@ -0,0 +1,3 @@
+.pageArea #header {
+color: red;
+}

test/options/block-indent/issue-379.expected.css

@@ -0,0 +1,3 @@
+.pageArea #header {
+    color: red;
+    }

test/options/block-indent/test.js

@@ -24,6 +24,11 @@ describe('options/block-indent:', function() {
         this.shouldBeEqual('test.css', 'test-2.expected.css');
     });
 
+    it('Issue 379', function() {
+        this.comb.configure({ 'block-indent': 4 });
+        this.shouldBeEqual('issue-379.css', 'issue-379.expected.css');
+    });
+
     it('Should detect nothing with an empty block, test 1', function() {
         this.shouldDetect(
             ['block-indent'],