space-after-declaration -> space-between-declarations

Author: tonyganch

lib/options/space-after-declaration.js

@@ -0,0 +1,95 @@
+module.exports = (function() {
+    function getDeclarationEnd(node, i) {
+        for (;i < node.length; i++) {
+            if (!node[i + 1]) {
+                return 0;
+            } else if (node[i + 1][0] === 's') {
+                if (node[i + 1][1].indexOf('\n') > -1) {
+                    if (node[i + 2] && node[i + 2][0] === 'declaration') {
+                        return i;
+                    } else {
+                        return 0;
+                    }
+                } else if (node[i + 2] && node[i + 2][0] === 'commentML') {
+                    if (node[i + 3] && node[i + 3][0] === 'declaration') {
+                        return i + 2;
+                    } else if (node[i + 3] && node[i + 3][0] === 's') {
+                        if (node[i + 4] && node[i + 4][0] === 'declaration') {
+                            return i + 2;
+                        } else {
+                            return 0;
+                        }
+                    } else {
+                        return 0;
+                    }
+                } else if (node[i + 2] && node[i + 2][0] === 'declaration') {
+                    return i;
+                }
+            } else if (node[i + 1][0] === 'declaration') {
+                return i;
+            } else if (node[i + 1][0] === 'commentML') {
+                if (node[i + 2] && node[i + 2][0] === 'declaration') {
+                    return i + 1;
+                } else if (node[i + 2] && node[i + 2][0] === 's') {
+                    if (node[i + 3] && node[i + 3][0] === 'declaration') {
+                        return i + 1;
+                    }
+                } else {
+                    return 0;
+                }
+            } else {
+                return 0;
+            }
+        }
+    }
+
+    return {
+        name: 'space-between-declarations',
+
+        runBefore: 'block-indent',
+
+        syntax: ['css', 'less', 'scss'],
+
+        accepts: {
+            number: true,
+            string: /^[ \t\n]*$/
+        },
+
+        /**
+         * Processes tree node.
+         *
+         * @param {String} nodeType
+         * @param {node} node
+         */
+        process: function(nodeType, node) {
+            var value = this.getValue('space-between-declarations');
+
+            // TODO: Limit nodes to blocks, stylesheet, etc.
+
+            for (var i = 0, l = node.length; i < l; i++) {
+                var currentNode = node[i];
+
+                if (currentNode[0] !== 'declDelim') continue;
+
+                // Grom user's point of view "declaration" includes semicolons
+                // and comments placed on the same line.
+                // So group those things together:
+                var declarationEnd = getDeclarationEnd(node, i);
+                if (!declarationEnd) {
+                    continue;
+                } else {
+                    i = declarationEnd;
+                }
+
+                var nextNode = node[i + 1];
+                if (nextNode[0] === 's') {
+                    nextNode[1] = value;
+                } else {
+                    i++;
+                    l++;
+                    node.splice(i, 0, ['s', value]);
+                }
+            }
+        }
+    };
+})();

lib/options/space-between-declarations.js

@@ -21,13 +21,13 @@ describe('.use()', function() {
           'sort-order-fallback',
           'space-after-colon',
           'space-after-combinator',
-          'space-after-declaration',
           'space-after-opening-brace',
           'space-after-selector-delimiter',
           'space-before-colon',
           'space-before-combinator',
           'space-before-opening-brace',
           'space-before-selector-delimiter',
+          'space-between-declarations',
           'block-indent',
           'sort-order',
           'strip-spaces',

test/core/use.js

@@ -1,45 +1,45 @@
-describe('options/space-after-declaration:', function() {
+describe('options/space-between-declarations:', function() {
     beforeEach(function() {
         this.filename = __filename;
     });
 
     it('Array value => should not change anything', function() {
-        this.comb.configure({ 'space-after-declaration': ['', ' '] });
+        this.comb.configure({ 'space-between-declarations': ['', ' '] });
         this.shouldBeEqual('test.css');
     });
 
     it('Invalid string value => should not change anything', function() {
-        this.comb.configure({ 'space-after-declaration': '  nani  ' });
+        this.comb.configure({ 'space-between-declarations': '  nani  ' });
         this.shouldBeEqual('test.css');
     });
 
     it('Float number value => should not change anything', function() {
-        this.comb.configure({ 'space-after-declaration': 3.5 });
+        this.comb.configure({ 'space-between-declarations': 3.5 });
         this.shouldBeEqual('test.css');
     });
 
     it('Integer value => should set proper space after declaration', function() {
-        this.comb.configure({ 'space-after-declaration': 0 });
+        this.comb.configure({ 'space-between-declarations': 0 });
         this.shouldBeEqual('integer-value.css', 'integer-value.expected.css');
     });
 
     it('Valid string value (spaces only) => should set proper space after declaration', function() {
-        this.comb.configure({ 'space-after-declaration': ' ' });
+        this.comb.configure({ 'space-between-declarations': ' ' });
         this.shouldBeEqual('space-value.css', 'space-value.expected.css');
     });
 
     it('Valid string value (spaces and newlines) => should set proper space after declaration', function() {
-        this.comb.configure({ 'space-after-declaration': '\n    ' });
+        this.comb.configure({ 'space-between-declarations': '\n    ' });
         this.shouldBeEqual('space-newline-value.css', 'space-newline-value.expected.css');
     });
 
     it('Should leave comments as is', function() {
-        this.comb.configure({ 'space-after-declaration': 1 });
+        this.comb.configure({ 'space-between-declarations': 1 });
         this.shouldBeEqual('comments.css', 'comments.expected.css');
     });
 
     it('Issue 239', function() {
-        this.comb.configure({ 'space-after-declaration': '\n    ' });
+        this.comb.configure({ 'space-between-declarations': '\n    ' });
         this.shouldBeEqual('issue-239.css', 'issue-239.expected.css');
     });
 });

test/options/space-after-declaration/comments.expected.css

@@ -1,7 +1,7 @@
 a {
     color: tomato;
     /* comment */
-    top: 0;
+    top: 0;     /* comment */
     left: 10px;
     right: 0;
     /* comment */

test/options/space-after-declaration/integer-value.expected.css

@@ -0,0 +1,6 @@
+a {
+    color: tomato;
+    /* comment */
+    top: 0;     /* comment */ left: 10px; right: 0;
+    /* comment */
+    }