requireCurlyBraces: support the with statement

Closes gh-661

lib/rules/require-curly-braces.js

@@ -44,6 +44,7 @@ module.exports.prototype = {
         }
 
         var typeIndex = this._typeIndex;
+
         if (typeIndex['if'] || typeIndex['else']) {
             file.iterateNodesByType('IfStatement', function(node) {
                 if (typeIndex.if && node.consequent && node.consequent.type !== 'BlockStatement') {
@@ -57,6 +58,7 @@ module.exports.prototype = {
                 }
             });
         }
+
         if (typeIndex['case'] || typeIndex['default']) {
             file.iterateNodesByType('SwitchCase', function(node) {
                 // empty case statement
@@ -77,16 +79,23 @@ module.exports.prototype = {
                 }
             });
         }
+
         if (typeIndex['while']) {
             checkBody('WhileStatement', 'While');
         }
+
         if (typeIndex['for']) {
             checkBody('ForStatement', 'For');
             checkBody('ForInStatement', 'For in');
         }
+
         if (typeIndex['do']) {
             checkBody('DoWhileStatement', 'Do while');
         }
+
+        if (typeIndex['with']) {
+            checkBody('WithStatement', 'With');
+        }
     }
 
 };

lib/utils.js

@@ -97,7 +97,8 @@ exports.curlyBracedKeywords = [
     'while',
     'do',
     'case',
-    'default'
+    'default',
+    'with'
 ];
 
 /**

test/rules/require-curly-braces.js

@@ -113,13 +113,13 @@ describe('rules/require-curly-braces', function() {
         checker.configure({ requireCurlyBraces: true });
 
         assert(!checker.checkString('if (x) x++;').isEmpty());
-        assert(!checker.checkString('if (x) {x++} else x--;;').isEmpty());
+        assert(!checker.checkString('if (x) {x++} else x--;').isEmpty());
         assert(!checker.checkString('for (x = 0; x < 10; x++) x++;').isEmpty());
         assert(!checker.checkString('while (x) x++;').isEmpty());
-        assert(!checker.checkString('do x++;').isEmpty());
-        assert(!checker.checkString('try x++;').isEmpty());
+        assert(!checker.checkString('do x++; while(x < 5);').isEmpty());
         assert(!checker.checkString('try {x++;} catch(e) throw e;').isEmpty());
         assert(!checker.checkString('switch(\'4\'){ case \'4\': break; }').isEmpty());
         assert(!checker.checkString('switch(\'4\'){ case \'4\': {break;} default: 1; }').isEmpty());
+        assert(!checker.checkString('with(x) console.log(toString());').isEmpty());
     });
 });