Merge pull request #47 from kizu/colon-space

Added an alternative way of setting the colon-space option

Author: mishanga

README.md

@@ -85,9 +85,11 @@ a { color: red }
 ### colon-space
 Available values:
   * `{Boolean}` true (means `after`)
-  * `{String}`: `before`, `after` or `both`
+  * `{String}`: `before`, `after`, `both` or any combination of whitespaces
+  and/or a colon (` `, `: `, `\t:\n\t` etc.)
 
 Example: `{ "colon-space": true }`
+
 ```css
 /* before */
 a { color:red }
@@ -96,6 +98,31 @@ a { color:red }
 a { color: red }
 ```
 
+Example: `{ "colon-space": ":\n\t\t" }`
+
+```css
+/* before */
+a {
+  color: red;
+}
+
+/* after */
+a {
+  color:
+    red;
+}
+```
+
+Example: `{ "colon-space": ":" }`
+
+```css
+/* before */
+a { color: red }
+
+/* after */
+a { color:red }
+```
+
 ## Tests
 
 Run `npm test` for tests.

lib/options/colon-space.js

@@ -9,7 +9,9 @@ module.exports = {
     setValue: function(value) {
         this._value = false;
         if (value === true) this._value = 'after';
-        if (typeof value === 'string' && value.match(/after|before|both/)) this._value = value;
+        if (typeof value === 'string'&& value.match(/after|before|both|(?=.*(?:[ \t\n]|:))[ \t\n]*:?[ \t\n]*/)) {
+            this._value = value;
+        }
         if (!this._value) return;
         return this;
     },
@@ -20,15 +22,20 @@ module.exports = {
      * @param {node} node
      */
     process: function(nodeType, node) {
+        var detectSpaces = this._value.match(/(([ \t\n]*):)?([ \t\n]*)/);
         if (nodeType === 'property') {
             if (node[node.length - 1][0] === 's') node.pop();
             if (this._value === 'both' || this._value === 'before')
                 node.push(['s', ' ']);
+            if (detectSpaces && detectSpaces[1])
+                node.push(['s', detectSpaces[2]]);
         }
         if (nodeType === 'value') {
             if (node[0][0] === 's') node.shift();
             if (this._value === 'both' || this._value === 'after')
                 node.unshift(['s', ' ']);
+            if (detectSpaces)
+                node.unshift(['s', detectSpaces[3]]);
         }
     }
 

test/colon-space.js

@@ -77,4 +77,56 @@ describe('options/colon-space', function() {
             'a {color : red}'
         );
     });
+    it('`  ` value should set two spaces after colon', function() {
+        comb.configure({ 'colon-space': '  ' });
+        assert.equal(
+            comb.processString(
+                'a { color: red }' +
+                'a{color:red}' +
+                'a {color : red}'
+            ),
+            'a { color:  red }' +
+            'a{color:  red}' +
+            'a {color:  red}'
+        );
+    });
+    it('`:` value should set no space around colon', function() {
+        comb.configure({ 'colon-space': ':' });
+        assert.equal(
+            comb.processString(
+                'a { color: red }' +
+                'a{color:red}' +
+                'a {color : red}'
+            ),
+            'a { color:red }' +
+            'a{color:red}' +
+            'a {color:red}'
+        );
+    });
+    it('`\n:` value should set a newline before colon', function() {
+        comb.configure({ 'colon-space': '\n:' });
+        assert.equal(
+            comb.processString(
+                'a { color: red }' +
+                'a{color:red}' +
+                'a {color : red}'
+            ),
+            'a { color\n:red }' +
+            'a{color\n:red}' +
+            'a {color\n:red}'
+        );
+    });
+    it('`\t:\t` value should set tabs around colon', function() {
+        comb.configure({ 'colon-space': '\t:\t' });
+        assert.equal(
+            comb.processString(
+                'a { color: red }' +
+                'a{color:red}' +
+                'a {color : red}'
+            ),
+            'a { color\t:\tred }' +
+            'a{color\t:\tred}' +
+            'a {color\t:\tred}'
+        );
+    });
 });