Added a new option--oneline--to allow one-line for, if and while blocks

jshint · Jan 19, 2011 · 7c7a771 · 7c7a771
1 parent 40e3f73
commit 7c7a771
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/fulljslint.html b/fulljslint.html
@@ -119,10 +119,14 @@
         <a href="http://www.amazon.com/exec/obidos/ASIN/0596517742/wrrrldwideweb"
               target="_blank">Enjoy <i>The Good Parts</i>.</a></p>
     </td></tr></table>
-<script src="fullwebjslint.js">
+<!--<script src="fullwebjslint.js">
 // fullwebjslint.js is the concatenation of
 //    json2.js + fulljslint.js + adsafe.js + intercept.js
-</script>
+</script>-->
+
+<script src="fulljslint.js"></script>
+<script src="adsafe.js"></script>
+<script src="intercept.js"></script>
 
 
 <div id="JSLINT_">
@@ -221,6 +225,8 @@
     <input type="checkbox" id="JSLINT_FRAGMENT" title="fragment"><label for="JSLINT_FRAGMENT" title="fragment">Tolerate <tt>HTML</tt> fragments</label>
   <br>
     <input type="checkbox" id="JSLINT_ESV" title="es5"><label for="JSLINT_ESV" title="es5">Tolerate ES5 syntax</label>
+  <br>
+    <input type="checkbox" id="JSLINT_ONELINE" title="oneline"><label for="JSLINT_ONELINE" title="oneline">Tolerate one-line blocks</label>    
   </div>
   <div class="leftcolumn">
     <input type="button" id="JSLINT_GOODPARTS" value="The Good Parts">

diff --git a/fulljslint.js b/fulljslint.js
@@ -335,6 +335,7 @@ var JSLINT = (function () {
             nomen      : true, // if names should be checked
             on         : true, // if HTML event handlers should be allowed
             onevar     : true, // if only one var statement per function should be allowed
+            oneline    : true, // if one-line blocks should be allowed
             passfail   : true, // if the scan should stop on first error
             plusplus   : true, // if increment/decrement should not be allowed
             regexp     : true, // if the . should not be allowed in regexp literals
@@ -2693,7 +2694,7 @@ loop:   for (;;) {
     }
 
 
-    function block(ordinary) {
+    function block(ordinary, oneline) {
 
 // A block is a sequence of statements wrapped in braces.
 // ordinary is false for function bodies and try blocks.
@@ -2721,8 +2722,10 @@ loop:   for (;;) {
             error("Expected '{a}' and instead saw '{b}'.",
                 nexttoken, '{', nexttoken.value);
         } else {
-            warning("Expected '{a}' and instead saw '{b}'.",
-                nexttoken, '{', nexttoken.value);
+            if (!oneline)
+                warning("Expected '{a}' and instead saw '{b}'.",
+                    nexttoken, '{', nexttoken.value);
+
             a = [statement()];
             if (a[0].disrupt) {
                 a.disrupt = true;
@@ -3608,7 +3611,7 @@ loop:   for (;;) {
         no_space();
         advance(')', t);
         one_space_only();
-        this.block = block(true);
+        this.block = block(true, option.oneline);
         if (nexttoken.id === 'else') {
             one_space();
             advance('else');
@@ -3691,7 +3694,7 @@ loop:   for (;;) {
         no_space();
         advance(')', t);
         one_space_only();
-        this.block = block(true);
+        this.block = block(true, option.oneline);
         if (this.block.disrupt) {
             warning("Strange loop.", prevtoken);
         }
@@ -3879,7 +3882,7 @@ loop:   for (;;) {
             no_space();
             advance(')', t);
             one_space_only();
-            s = block(true);
+            s = block(true, option.oneline);
         }
         if (s.disrupt) {
             warning("Strange loop.", prevtoken);