Refactor

tonyganch · tonyganch · commit 4f68f39b4dd2 · 2016-07-12T00:44:46.000+02:00
diff --git a/.jscs.json b/.jscs.json
@@ -48,13 +48,18 @@
     "requireSpaceBetweenArguments": true,
     "requireSpacesInForStatement": true,
     "validateIndentation": 2,
-    "validateJSDoc": {
-        "checkParamNames": true,
-        "checkRedundantParams": true,
-        "requireParamTypes": true
-    },
     "validateQuoteMarks": {
         "mark": "'",
         "escape": true
+    },
+    "jsDoc": {
+        "checkAnnotations": "closurecompiler",
+        "checkParamNames": true,
+        "checkRedundantParams": true,
+        "checkRedundantReturns": true,
+        "checkReturnTypes": true,
+        "checkTypes": true,
+        "requireParamTypes": true,
+        "requireReturnTypes": true
     }
 }
diff --git a/.jshint-groups.js b/.jshint-groups.js
diff --git a/.jshintrc b/.jshintrc
@@ -1,12 +1,15 @@
 {
+    "eqeqeq": true,
+    "esnext": true,
+    "freeze": true,
     "globals": {
         "afterEach": false,
         "beforeEach": false,
         "describe": false,
         "it": false
     },
-    "esnext": true,
     "node": true,
+    "strict": true,
     "undef": true,
     "unused": true,
     "-W084": true
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "babel": "^5.5.3",
-    "jscs": "1.13.1",
+    "jscs": "2.1.0",
     "jshint": "2.8.0",
     "mocha": "1.20.1"
   },
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -14,7 +14,7 @@ printf "\n\
 ----------------\n\
  Running JSHint\n\
 ----------------\n\n"
-test ./node_modules/.bin/jshint-groups
+test ./node_modules/.bin/jshint ./src
 
 printf "\n\
 --------------\n\
diff --git a/src/cli.js b/src/cli.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Command line implementation for CSSComb
  *
diff --git a/src/csscomb.js b/src/csscomb.js
@@ -1,3 +1,5 @@
+'use strict';
+
 let Comb = require('csscomb-core');
 let gonzales = require('./gonzales');
 let fs = require('fs');
diff --git a/src/format.js b/src/format.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function(string) {
   return string.replace(/\n\s+/gm, ' ');
 };
diff --git a/src/gonzales.js b/src/gonzales.js
@@ -1,2 +1,5 @@
-// jscs:disable
+// jscs:disable maximumLineLength
+
+'use strict';
+
 module.exports = require('../node_modules/csscomb-core/node_modules/gonzales-pe');
diff --git a/src/options/always-semicolon.js b/src/options/always-semicolon.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 let option = {
@@ -29,8 +31,9 @@ let option = {
 
   /**
    * Checks ast for code style errors.
+   *
    * @param {Node} ast
-   * @return {Array} List of found errors.
+   * @return {Array?} List of found errors.
    */
   lint(ast) {
     var errors = [];
@@ -120,7 +123,7 @@ let option = {
   /**
    * Detects the value of this option in ast.
    * @param {Node} ast
-   * @return {Array} List of detected values
+   * @return {Array?} List of detected values
    */
   detect(ast) {
     var detected = [];
diff --git a/src/options/block-indent.js b/src/options/block-indent.js
@@ -1,3 +1,5 @@
+'use strict';
+
 let option = {
   /**
    * Option's name as it's used in config.
diff --git a/src/options/color-case.js b/src/options/color-case.js
@@ -1,3 +1,5 @@
+'use strict';
+
 let option = {
   /**
    * Option's name as it's used in config.
diff --git a/src/options/color-shorthand.js b/src/options/color-shorthand.js
@@ -1,3 +1,5 @@
+'use strict';
+
 let option = {
   /**
    * Option's name as it's used in config.
diff --git a/src/options/element-case.js b/src/options/element-case.js
@@ -1,3 +1,5 @@
+'use strict';
+
 let option = {
   /**
    * Option's name as it's used in config.
diff --git a/src/options/eof-newline.js b/src/options/eof-newline.js
@@ -1,3 +1,5 @@
+'use strict';
+
 let gonzales = require('../gonzales');
 
 let option = {
diff --git a/src/options/leading-zero.js b/src/options/leading-zero.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   name: 'leading-zero',
 
diff --git a/src/options/quotes.js b/src/options/quotes.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   name: 'quotes',
 
diff --git a/src/options/remove-empty-rulesets.js b/src/options/remove-empty-rulesets.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = (function() {
   function processNode(node) {
     removeEmptyRulesets(node);
diff --git a/src/options/sort-order-fallback.js b/src/options/sort-order-fallback.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   name: 'sort-order-fallback',
 
diff --git a/src/options/sort-order.js b/src/options/sort-order.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = {
diff --git a/src/options/space-after-colon.js b/src/options/space-after-colon.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = {
diff --git a/src/options/space-after-combinator.js b/src/options/space-after-combinator.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = {
diff --git a/src/options/space-after-opening-brace.js b/src/options/space-after-opening-brace.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = {
diff --git a/src/options/space-after-selector-delimiter.js b/src/options/space-after-selector-delimiter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = {
diff --git a/src/options/space-before-closing-brace.js b/src/options/space-before-closing-brace.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = (function() {
diff --git a/src/options/space-before-colon.js b/src/options/space-before-colon.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = {
diff --git a/src/options/space-before-combinator.js b/src/options/space-before-combinator.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = {
diff --git a/src/options/space-before-opening-brace.js b/src/options/space-before-opening-brace.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = (function() {
diff --git a/src/options/space-before-selector-delimiter.js b/src/options/space-before-selector-delimiter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = {
diff --git a/src/options/space-between-declarations.js b/src/options/space-between-declarations.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = (function() {
diff --git a/src/options/strip-spaces.js b/src/options/strip-spaces.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = (function() {
   /**
    * Trim trailing spaces on each line.
diff --git a/src/options/tab-size.js b/src/options/tab-size.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   name: 'tab-size',
 
diff --git a/src/options/unitless-zero.js b/src/options/unitless-zero.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   name: 'unitless-zero',
 
diff --git a/src/options/vendor-prefix-align.js b/src/options/vendor-prefix-align.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var gonzales = require('../gonzales');
 
 module.exports = (function() {
@@ -214,8 +216,8 @@ module.exports = (function() {
   /**
    * Updates dict which contains info about items align.
    *
-   * @param {Object} info,
-   * @param {Object} dict,
+   * @param {Object} info
+   * @param {Object} dict
    */
   function updateDict(info, dict) {
     if (info.prefixLength === 0 && info.extra === 0) return;
@@ -237,8 +239,8 @@ module.exports = (function() {
   /**
    * Returns string with correct number of spaces for info.baseName property.
    *
-   * @param {Object} info,
-   * @param {Object} dict,
+   * @param {Object} info
+   * @param {Object} dict
    * @param {String} whitespaceNode
    * @returns {String}
    */

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`/**`
`2`	`4`	`* Command line implementation for CSSComb`
`3`	`5`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`let Comb = require('csscomb-core');`
`2`	`4`	`let gonzales = require('./gonzales');`
`3`	`5`	`let fs = require('fs');`