Merge pull request #15 from puzankov/always-semicolon

Option: always-semicolon

Author: mishanga

.csscomb.json

@@ -7,6 +7,7 @@
     "rule-indent": true,
     "stick-brace": "\n",
     "strip-spaces": true,
+    "always-semicolon": true,
     "sort-order": [
         [
             "position",

README.md

@@ -35,7 +35,8 @@ Example configuration:
     "exclude": ["node_modules/**"],
     "colon-space": true,
     "stick-brace": true,
-    "strip-spaces": true
+    "strip-spaces": true,
+    "always-semicolon": true
 }
 ```
 

lib/csscomb.js

@@ -15,6 +15,7 @@ var Comb = function() {
         'stick-brace',
         'colon-space',
         'rule-indent',
+        'always-semicolon',
         'sort-order'
     ];
     this._config = {};

lib/options/always-semicolon.js

@@ -0,0 +1,48 @@
+module.exports = {
+
+    /**
+     * Sets handler value.
+     *
+     * @param {String|Boolean} value Option value
+     * @returns {Object}
+     */
+    setValue: function(value) {
+        this._value = value === true;
+        if (!this._value) return;
+        return this;
+    },
+
+    /**
+     * Processes tree node.
+     * @param {String} nodeType
+     * @param {node} node
+     */
+    process: function(nodeType, node) {
+        if (this._value === true) {
+            if (nodeType === 'block') {
+                for (var i = node.length; i--;) {
+                    var nodeItem = node[i];
+                    var type = nodeItem[0];
+                    var value = nodeItem[2];
+
+                    if (type === 'decldelim') break;
+
+                    if (type === 'declaration') {
+                        var space = [];
+
+                        for (var j = value.length; j--;) {
+                            if (value[j][0] !== 's' && value[j][0] !== 'comment') break;
+
+                            space.unshift(value.splice(j)[0]);
+                        }
+
+                        node.splice.apply(node, [i + 1, 0, ['decldelim']].concat(space));
+                        break;
+                    }
+                }
+            }
+        }
+
+    }
+
+};

test/always-semicolon.js

@@ -0,0 +1,60 @@
+var Comb = require('../lib/csscomb');
+var assert = require('assert');
+
+describe('options/always-semicolon', function() {
+    var comb;
+
+    beforeEach(function() {
+        comb = new Comb();
+    });
+
+    it('Should add semicolon for last property if missing. Test 1', function() {
+        comb.configure({ 'always-semicolon': true });
+        assert.equal(
+            comb.processString(
+                'div { height: 0 }'
+            ),
+            'div { height: 0; }'
+        );
+    });
+
+    it('Should add semicolon for last property if missing. Test 2', function() {
+        comb.configure({ 'always-semicolon': true });
+        assert.equal(
+            comb.processString(
+                'div {\nheight: 0\n}'
+            ),
+            'div {\nheight: 0;\n}'
+        );
+    });
+
+    it('Should add semicolon for last property if missing. Test 3', function() {
+        comb.configure({ 'always-semicolon': true });
+        assert.equal(
+            comb.processString(
+                'div {height: 0}'
+            ),
+            'div {height: 0;}'
+        );
+    });
+
+    it('Should add semicolon for last property if missing. Test 4', function() {
+        comb.configure({ 'always-semicolon': true });
+        assert.equal(
+            comb.processString(
+                'div {\nheight: 0 /* Comment */\n}'
+            ),
+            'div {\nheight: 0; /* Comment */\n}'
+        );
+    });
+
+    it('Should add semicolon for last property if missing. Test 5', function() {
+        comb.configure({ 'always-semicolon': true });
+        assert.equal(
+            comb.processString(
+                'div {\ntop: 1px;\nheight: 0 /* 1comment */  /* 2comment */\n}'
+            ),
+            'div {\ntop: 1px;\nheight: 0; /* 1comment */  /* 2comment */\n}'
+        );
+    });
+});

test/integral.expect.css

@@ -47,12 +47,12 @@ div
 {
         /* upline comment*/
         font-style: italic;
-        border-bottom: 1px solid red
+        border-bottom: 1px solid red; /* trololo */ /* trololo */
     }
 
     a
 {
 top: 0;/* ololo */margin: 0;}
     b
 {
-top: 0/* trololo */;margin: 0}
+top: 0/* trololo */;margin: 0;}

test/integral.origin.css

@@ -41,7 +41,7 @@ div {
     div p em {
         /* upline comment*/
         font-style:italic;
-        border-bottom:1px solid red
+        border-bottom:1px solid red /* trololo */ /* trololo */
     }
 
     a{