From da57341b44576859a2676089e00d28e98aaa4b46 Mon Sep 17 00:00:00 2001 From: Mike Sherov Date: Fri, 6 Feb 2015 10:40:50 -0500 Subject: [PATCH] [[TEST]] Upgrade JSCS and use it for indentation checking. --- .jscsrc | 3 +-- .jshintrc | 3 +-- package.json | 2 +- src/jshint.js | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.jscsrc b/.jscsrc index 25a1539760..cfb510f61e 100644 --- a/.jscsrc +++ b/.jscsrc @@ -5,8 +5,7 @@ "allowComments": true, "allowRegex": true }, - // disabled due to https://github.com/jscs-dev/node-jscs/issues/915 - // "validateIndentation": 2, + "validateIndentation": 2, "disallowMultipleLineStrings": true, "disallowMixedSpacesAndTabs": true, diff --git a/.jshintrc b/.jshintrc index c400fb6ed9..a5973b342e 100644 --- a/.jshintrc +++ b/.jshintrc @@ -6,6 +6,5 @@ "undef": true, "unused": true, "onecase": true, - "lastsemic": true, - "indent": 2 + "lastsemic": true } diff --git a/package.json b/package.json index bdb2410cd1..9886572a9e 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "browserify": "6.x", "coveralls": "2.11.x", "istanbul": "0.3.x", - "jscs": "1.9.x", + "jscs": "1.11.x", "jshint": "2.5.x", "mock-stdin": "0.3.x", "nodeunit": "0.9.x", diff --git a/src/jshint.js b/src/jshint.js index 9e12a2bf6a..fc06647657 100644 --- a/src/jshint.js +++ b/src/jshint.js @@ -2062,7 +2062,7 @@ var JSHINT = (function() { return that; } while (true) { - if (!(expr = expression(10))) { + if (!(expr = expression(10))) { break; } that.exprs.push(expr);