jshint config fix + codestyle

Author: mishanga

.jshint-groups.js

@@ -22,7 +22,7 @@ module.exports = {
     groups: {
         js: {
             options: { node: true },
-            includes: ['lib/*.js']
+            includes: ['lib/**/*.js']
         },
         test: {
             options: {

lib/options/block-indent.js

@@ -21,9 +21,12 @@ module.exports = {
      * @param {node} node
      */
     process: function(nodeType, node, level) {
+        var value;
+        var space;
+
         // Add right space before closing brace
         if (nodeType === 'atrulers' || nodeType === 'block') {
-            var value = '\n' + new Array(level + 1).join(this._value);
+            value = '\n' + new Array(level + 1).join(this._value);
             if (node[node.length - 1][0] === 's') node.pop();
             node.push(['s', value]);
         }
@@ -43,10 +46,10 @@ module.exports = {
             for (var i = 0; i < node.length; i++) {
                 var nodeItem = node[i];
                 if (nodeItem[0] === 'atruler' || nodeItem[0] === 'ruleset') {
-                    var value = (i < 2 && isFirst ? '' : '\n') + new Array(level + 1).join(this._value);
+                    value = (i < 2 && isFirst ? '' : '\n') + new Array(level + 1).join(this._value);
                     isFirst = false;
 
-                    var space = node[i - 1];
+                    space = node[i - 1];
                     if (!space || space[0] !== 's') {
                         space = ['s', ''];
                         if (i) {
@@ -63,7 +66,7 @@ module.exports = {
 
         // Add space before block opening brace
         if (nodeType === 'simpleselector') {
-            var space = node[node.length - 1];
+            space = node[node.length - 1];
             if (space[0] === 's' && space[1].match('\n')) {
                 space[1] += new Array(level + 1).join(this._value);
             }

lib/options/rule-indent.js

@@ -41,7 +41,7 @@ module.exports = {
                     }
                     space[1] = space[1].replace(/(\n)?([\t ]+)?$/, value);
                 }
-            };
+            }
         }
     }
 

lib/options/sort-order.js

@@ -6,7 +6,6 @@ module.exports = {
      * @param {Boolean} isPrevDeclExists
      */
     _splitBunch: function(bunch, isPrevDeclExists) {
-
         var nextBunch = [];
         var declAlready = false;
         var flag = false;
@@ -15,32 +14,31 @@ module.exports = {
 
         for (var i = 0; i < bunch.length; ++i) {
             if (flag) { nextBunch.push(bunch[i]); continue; }
-            if (bunch[i][0] == 'declaration') { declAlready = true; }
+            if (bunch[i][0] === 'declaration') { declAlready = true; }
 
             if (isPrevDeclExists && !declAlready) continue;
-            if (bunch[i][0] != 's') continue;
+            if (bunch[i][0] !== 's') continue;
 
             var indexOfNewLine = bunch[i][1].indexOf('\n');
 
-            if (indexOfNewLine == -1) continue;
+            if (indexOfNewLine === -1) continue;
 
             nextBunch.push(['s', bunch[i][1].substr(indexOfNewLine + 1)]);
             bunch[i][1] = bunch[i][1].substr(0, indexOfNewLine + 1);
 
             flag = i + 1;
         }
 
-        if (nextBunch.length == 1 && nextBunch[0][0] == 's') {
+        if (nextBunch.length === 1 && nextBunch[0][0] === 's') {
             item = nextBunch[0];
-            indexOf = item[1].lastIndexOf('\n')
+            indexOf = item[1].lastIndexOf('\n');
 
-            indexOf != -1 && (item[1] = item[1].substr(indexOf + 1));
+            indexOf !== -1 && (item[1] = item[1].substr(indexOf + 1));
         }
 
         flag && bunch.splice(flag);
 
         return nextBunch;
-
     },
 
     /**
@@ -52,31 +50,26 @@ module.exports = {
      * @param {node} node
      */
     _createNodeExt: function(node) {
-
         var extNode = [];
         var bunch = [];
         var nextBunch;
         var prevDeclPropertyName;
 
         node.forEach(function(node) {
-
-            if (node[0] == 'declaration') {
+            if (node[0] === 'declaration') {
                 nextBunch = this._splitBunch(bunch, prevDeclPropertyName);
                 extNode.push({ data: bunch, decl: prevDeclPropertyName });
                 bunch = nextBunch;
                 prevDeclPropertyName = node[1][1][1];
             }
-
             bunch.push(node);
-
         }, this);
 
         nextBunch = this._splitBunch(bunch, prevDeclPropertyName);
         extNode.push({ data: bunch, decl: prevDeclPropertyName });
         nextBunch.length && extNode.push({ data: nextBunch });
 
         return extNode;
-
     },
 
     /**
@@ -85,16 +78,13 @@ module.exports = {
      * @param {extNode} extNode
      */
     _addGroupDelimiter: function(extNodePrev, extNode) {
-
         if (!extNodePrev.decl || !extNode.decl) return;
 
         var indexA = this._order[extNodePrev.decl];
         var indexB = this._order[extNode.decl];
-        var isGroupBorder = indexA && indexB && indexA.group != indexB.group;
-
-        if (isGroupBorder)
-            extNode.data.unshift(['s', '\n']);
+        var isGroupBorder = indexA && indexB && indexA.group !== indexB.group;
 
+        if (isGroupBorder) extNode.data.unshift(['s', '\n']);
     },
 
     /**
@@ -103,14 +93,11 @@ module.exports = {
      * @param {extNode} extNode
      */
     _applyNodeExt: function(node, extNode) {
-
         node.splice(0, node.length);
-
         extNode.forEach(function(item, i) {
             i > 0 && this._addGroupDelimiter(extNode[i - 1], item);
             node.push.apply(node, item.data);
         }, this);
-
     },
 
     /**
@@ -120,18 +107,16 @@ module.exports = {
      * @returns {Object}
      */
     setValue: function(value) {
-
         if (!value) return;
 
-        this._order = {}
-        value.forEach(function(group, groupIndex){
+        this._order = {};
+        value.forEach(function(group, groupIndex) {
             group.forEach(function(prop, propIndex) {
                 this._order[prop] = { group: groupIndex, prop: propIndex };
-            }, this)
+            }, this);
         }, this);
 
         return this;
-
     },
 
     /**
@@ -140,7 +125,6 @@ module.exports = {
      * @param {node} node
      */
     process: function(nodeType, node) {
-
         if (nodeType !== 'block') return;
 
         var order = this._order;
@@ -149,21 +133,18 @@ module.exports = {
         var lastSymbols = nodeExt[nodeExt.length - 1].decl || nodeExt.pop();
 
         nodeExt.sort(function(a, b) {
-
             var indexA = order[a.decl] || { prop: -1 };
             var indexB = order[b.decl] || { prop: -1 };
             var groupDelta = indexA.group - indexB.group;
             var propDelta = indexA.prop - indexB.prop;
 
             return groupDelta !== 0 ? groupDelta : propDelta;
-
         });
 
         firstSymbols && nodeExt.unshift(firstSymbols);
         lastSymbols && nodeExt.push(lastSymbols);
 
         this._applyNodeExt(node, nodeExt);
-
     }
 
 };