Fixed improper newline remover and a small codestyle fix

Author: kizu

lib/options/block-indent.js

@@ -81,7 +81,7 @@ module.exports = {
         var result = null;
         if (nodeType === 'atrulers' || nodeType === 'block') {
             if (node[node.length - 1][0] === 's' && level > 0) {
-                result = node[node.length - 1][1].replace(/\n/g, '');
+                result = node[node.length - 1][1].replace(/\s*\n/g, '');
 
                 if (this._prev !== undefined && this._prev[0] < level) {
                     result = result.replace(result.replace(this._prev[1], ''), '');

lib/options/combinator-space.js

@@ -56,7 +56,7 @@ module.exports = {
     detect: function(nodeType, node) {
         if (nodeType === 'selector') {
             var variants = {};
-            var best_guess = null;
+            var bestGuess = null;
             var maximum = 0;
             for (var i = node.length; i--;) {
                 var subSelector = node[i];
@@ -85,13 +85,13 @@ module.exports = {
                         }
                         if (variants[result] > maximum) {
                             maximum = variants[result];
-                            best_guess = result;
+                            bestGuess = result;
                         }
                     }
                 }
             }
-            if (best_guess) {
-                return best_guess;
+            if (bestGuess) {
+                return bestGuess;
             }
         }
     }

lib/options/element-case.js

@@ -42,7 +42,7 @@ module.exports = {
     detect: function(nodeType, node) {
         if (nodeType === 'simpleselector') {
             var variants = {};
-            var best_guess = null;
+            var bestGuess = null;
             var maximum = 0;
             for (var i = node.length; i--;) {
                 var nodeItem = node[i];
@@ -62,13 +62,13 @@ module.exports = {
                         }
                         if (variants[result] > maximum) {
                             maximum = variants[result];
-                            best_guess = result;
+                            bestGuess = result;
                         }
                     }
                 }
             }
-            if (best_guess) {
-                return best_guess;
+            if (bestGuess) {
+                return bestGuess;
             }
         }
     }

lib/options/rule-indent.js

@@ -56,7 +56,7 @@ module.exports = {
 
         if (nodeType === 'declaration') {
             if (this._prev !== undefined) {
-                result = this._prev.replace(/\n/g, '');
+                result = this._prev.replace(/\s*\n/g, '');
                 if (level > 0) {
                     result = result.substr(0, parseInt(result.length / (level + 1), 10));
                 }

test/block-indent.js

@@ -88,4 +88,13 @@ describe('options/block-indent', function() {
             }
         );
     });
+    it('Should detect the block-indent option in a complex case', function() {
+        should_detect(
+            ['block-indent'],
+            'a { color: red \n}\n@media all {\n\t.input__control\n\t{ color: #000;\n\t\n\t\n\t\n\t}\n}',
+            {
+                'block-indent': '\t'
+            }
+        );
+    });
 });

test/rule-indent.js

@@ -104,4 +104,14 @@ describe('options/rule-indent', function() {
             }
         );
     });
+
+    it('Should detect the rule-indent option equal to a tab with a lot of whitespaces', function() {
+        should_detect(
+            ['rule-indent'],
+            'a{\n\t\n\tcolor: red\n}',
+            {
+                'rule-indent': '\t'
+            }
+        );
+    });
 });