New option: space-before-selector-delimiter

csscomb · Jun 9, 2014 · 8d78ac9 · 8d78ac9
1 parent dc55303
commit 8d78ac9
Show file tree

Hide file tree

Showing 8 changed files with 169 additions and 0 deletions.
diff --git a/config/csscomb.json b/config/csscomb.json
@@ -19,6 +19,7 @@
     "space-before-colon": "",
     "space-before-combinator": " ",
     "space-before-opening-brace": "\n",
+    "space-before-selector-delimiter": "",
     "strip-spaces": true,
     "unitless-zero": true,
     "vendor-prefix-align": true,

diff --git a/lib/csscomb.js b/lib/csscomb.js
@@ -21,6 +21,7 @@ var OPTIONS = [
     'space-after-colon',
     'space-before-opening-brace',
     'space-after-opening-brace',
+    'space-before-selector-delimiter',
     'block-indent',
     'sort-order',
     'space-before-closing-brace',

diff --git a/lib/options/space-before-selector-delimiter.js b/lib/options/space-before-selector-delimiter.js
@@ -0,0 +1,54 @@
+module.exports = {
+    name: 'space-before-selector-delimiter',
+
+    accepts: {
+        number: true,
+        string: /^[ \t\n]*$/
+    },
+
+    /**
+     * Processes tree node.
+     *
+     * @param {String} nodeType
+     * @param {node} node
+     */
+    process: function(nodeType, node) {
+        if (nodeType !== 'selector') return;
+
+        var value = this.getValue('space-before-selector-delimiter');
+
+        for (var i = node.length; i--;) {
+            if (node[i][0] === 'delim') {
+                if (node[i - 1][node[i - 1].length - 1][0] === 's') {
+                    node[i - 1][node[i - 1].length - 1][1] = value;
+                } else {
+                    node[i - 1].push(['s', value]);
+                }
+            }
+        }
+    },
+
+    /**
+     * Detects the value of an option at the tree node.
+     *
+     * @param {String} nodeType
+     * @param {node} node
+     */
+    detect: function(nodeType, node) {
+        if (nodeType !== 'selector') return;
+
+        var variants = [];
+
+        for (var i = node.length; i--;) {
+            if (node[i][0] !== 'delim') continue;
+
+            if (node[i - 1][node[i - 1].length - 1][0] === 's') {
+                variants.push(node[i - 1][node[i - 1].length - 1][1]);
+            } else {
+                variants.push('');
+            }
+        }
+
+        return variants;
+    }
+};
diff --git a/test/options/space-before-selector-delimiter.js b/test/options/space-before-selector-delimiter.js
@@ -0,0 +1,83 @@
+describe('options/space-before-selector-delimiter:', function() {
+    beforeEach(function() {
+        this.filename = __filename;
+    });
+
+    it('Array value => should not change anything', function() {
+        this.comb.configure({ 'space-before-selector-delimiter': ['', ' '] });
+        this.shouldBeEqual('test.css');
+    });
+
+    it('Invalid string value => should not change anything', function() {
+        this.comb.configure({ 'space-before-selector-delimiter': '  nani  ' });
+        this.shouldBeEqual('test.css');
+    });
+
+    it('Float number value => should not change anything', function() {
+        this.comb.configure({ 'space-before-selector-delimiter': 3.5 });
+        this.shouldBeEqual('test.css');
+    });
+
+    it('Integer value => should set proper space before selector delimiter', function() {
+        this.comb.configure({ 'space-before-selector-delimiter': 0 });
+        this.shouldBeEqual('test.css', 'test.expected.css');
+    });
+
+    it('Valid string value (spaces only) => should set proper space before selector delimiter', function() {
+        this.comb.configure({ 'space-before-selector-delimiter': '  ' });
+        this.shouldBeEqual('test.css', 'test-2.expected.css');
+    });
+
+    it('Valid string value (spaces and newlines) => should set proper space before selector delimiter', function() {
+        this.comb.configure({ 'space-before-selector-delimiter': '\n    ' });
+        this.shouldBeEqual('test.css', 'test-3.expected.css');
+    });
+
+    it('Should detect no whitespace', function() {
+        this.shouldDetect(
+            ['space-before-selector-delimiter'],
+            'a,b{top:0}',
+            { 'space-before-selector-delimiter': '' }
+        );
+    });
+
+    it('Should detect whitespace', function() {
+        this.shouldDetect(
+            ['space-before-selector-delimiter'],
+            'a \n ,b {top:0}',
+            { 'space-before-selector-delimiter': ' \n ' }
+        );
+    });
+
+    it('Should detect no whitespace (2 blocks)', function() {
+        this.shouldDetect(
+            ['space-before-selector-delimiter'],
+            'a,b{top:0} a ,b{left:0}',
+            { 'space-before-selector-delimiter': '' }
+        );
+    });
+
+    it('Should detect whitespace (2 blocks)', function() {
+        this.shouldDetect(
+            ['space-before-selector-delimiter'],
+            'a ,b {top:0} b,a{left:0}',
+            { 'space-before-selector-delimiter': ' ' }
+        );
+    });
+
+    it('Should detect no whitespace (3 blocks)', function() {
+        this.shouldDetect(
+            ['space-before-selector-delimiter'],
+            'a ,b{top:0} b,c{left:0} c,d{right:0}',
+            { 'space-before-selector-delimiter': '' }
+        );
+    });
+
+    it('Should detect whitespace (3 blocks)', function() {
+        this.shouldDetect(
+            ['space-before-selector-delimiter'],
+            'a,b{top:0} b ,c{left:0} c ,d{right:0}',
+            { 'space-before-selector-delimiter': ' ' }
+        );
+    });
+});
diff --git a/test/options/space-before-selector-delimiter/test-2.expected.css b/test/options/space-before-selector-delimiter/test-2.expected.css
@@ -0,0 +1,6 @@
+a  ,b { color: red }
+a  , b { color: red }
+a  ,b { color: red }
+a  ,
+b { color: red }
+a+b  ,c>d  ,e{ color: red }
diff --git a/test/options/space-before-selector-delimiter/test-3.expected.css b/test/options/space-before-selector-delimiter/test-3.expected.css
@@ -0,0 +1,12 @@
+a
+    ,b { color: red }
+a
+    , b { color: red }
+a
+    ,b { color: red }
+a
+    ,
+b { color: red }
+a+b
+    ,c>d
+    ,e{ color: red }
diff --git a/test/options/space-before-selector-delimiter/test.css b/test/options/space-before-selector-delimiter/test.css
@@ -0,0 +1,6 @@
+a,b { color: red }
+a, b { color: red }
+a ,b { color: red }
+a,
+b { color: red }
+a+b,c>d,e{ color: red }
diff --git a/test/options/space-before-selector-delimiter/test.expected.css b/test/options/space-before-selector-delimiter/test.expected.css
@@ -0,0 +1,6 @@
+a,b { color: red }
+a, b { color: red }
+a,b { color: red }
+a,
+b { color: red }
+a+b,c>d,e{ color: red }