Skip to content

Commit

Permalink
option.todo
Browse files Browse the repository at this point in the history
  • Loading branch information
@douglascrockford
douglascrockford committed Jul 11, 2012
1 parent d3dcb36 commit 49284af
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 32 deletions.
33 changes: 19 additions & 14 deletions jslint.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,18 +231,6 @@
Directive</h1><textarea rows="8" readonly=true ></textarea>
</fieldset>
<fieldset id=JSLINT_OPTIONS><button>clear options</button><h1>Options</h1>
<div class=tristate>Assume...
<div title=browser><button></button><var></var> a browser</div>
<div title=devel><button></button><var></var> console,alert,&nbsp;...</div>
<div title=node><button></button><var></var> <a href="http://nodejs.org/">Node.js</a></div>
<div title=rhino><button></button><var></var> <a href="http://www.mozilla.org/rhino/">Rhino</a></div>
<div title=windows><button></button><var></var> Windows</div>
<br>
<div title=passfail><button></button><var></var> Stop on first error</div>
<br>
<div title=safe><button></button><var></var> Safe Subset</div>
<div title=adsafe><button></button><var></var> Verify&nbsp;<a href="http://www.ADsafe.org">ADsafe</a></div>
</div>
<div class=tristate>Tolerate...
<div title=bitwise><button></button><var></var> bitwise operators</div>
<div title=continue><button></button><var></var> continue </div>
Expand All @@ -252,22 +240,39 @@
<div title=evil><button></button><var></var> eval </div>
<div title=forin><button></button><var></var> <a href="http://yuiblog.com/blog/2006/09/26/for-in-intrigue/">unfiltered</a> for in </div>
<div title=newcap><button></button><var></var> uncapitalized constructors</div>
</div>
<div class=tristate>Tolerate...
<div title=nomen><button></button><var></var> dangling _ in identifiers</div>
<div title=plusplus><button></button><var></var> ++&nbsp;and&nbsp;-- </div>
<div title=regexp><button></button><var></var> .&nbsp;and&nbsp;[^ ... ]&nbsp;in&nbsp;/RegExp/</div>
</div>
<div class=tristate>Tolerate...
<div title=undef><button></button><var></var> misordered definitions</div>
<div title=unparam><button></button><var></var> unused parameters</div>
<div title=sloppy><button></button><var></var> missing&nbsp;'use strict'&nbsp;pragma</div>
<div title=stupid><button></button><var></var> stupidity</div>
<div title=sub><button></button><var></var> inefficient subscripting</div>
</div>
<div class=tristate>Tolerate...
<div title=todo><button></button><var></var> TODO comments</div>
<div title=vars><button></button><var></var> many var statements per function</div>
<div title=white><button></button><var></var> messy white space</div>
<div title=css><button></button><var></var> CSS workarounds</div>
<div title=cap><button></button><var></var> HTML case</div>
<div title=on><button></button><var></var> HTML event handlers</div>
<div title=fragment><button></button><var></var> HTML fragments</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
</div>
<div class=tristate>Assume...
<div title=browser><button></button><var></var> a browser</div>
<div title=devel><button></button><var></var> console,alert,&nbsp;...</div>
<div title=node><button></button><var></var> <a href="http://nodejs.org/">Node.js</a></div>
<div title=rhino><button></button><var></var> <a href="http://www.mozilla.org/rhino/">Rhino</a></div>
<div title=windows><button></button><var></var> Windows</div>
<br>
<div title=passfail><button></button><var></var> Stop on first error</div>
<br>
<div title=safe><button></button><var></var> Safe Subset</div>
<div title=adsafe><button></button><var></var> Verify&nbsp;<a href="http://www.ADsafe.org">ADsafe</a></div>
</div>
<div>
<input id=JSLINT_INDENT type=text title=indent value="" autocomplete=off>
Expand Down
41 changes: 23 additions & 18 deletions jslint.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// jslint.js
// 2012-05-09
// 2012-07-10

// Copyright (c) 2002 Douglas Crockford (www.JSLint.com)

Expand Down Expand Up @@ -292,19 +292,19 @@
style, styleproperty, sub, subscript, substr, sup, supplant, sync_a, t,
table, 'table-layout', tag_a_in_b, tbody, td, test, 'text-align',
'text-decoration', 'text-indent', 'text-shadow', 'text-transform', textarea,
tfoot, th, thead, third, thru, time, title, toLowerCase, toString,
toUpperCase, token, too_long, too_many, top, tr, trailing_decimal_a, tree,
tt, tty, tv, type, u, ul, unclosed, unclosed_comment, unclosed_regexp, undef,
undefined, unescaped_a, unexpected_a, unexpected_char_a_b,
unexpected_comment, unexpected_else, unexpected_label_a,
unexpected_property_a, unexpected_space_a_b, 'unicode-bidi',
unnecessary_initialize, unnecessary_use, unparam, unreachable_a_b,
unrecognized_style_attribute_a, unrecognized_tag_a, unsafe, unused, url,
urls, use_array, use_braces, use_charAt, use_object, use_or, use_param,
used_before_a, var, var_a_not, vars, 'vertical-align', video, visibility,
was, weird_assignment, weird_condition, weird_new, weird_program,
weird_relation, weird_ternary, white, 'white-space', width, windows,
'word-spacing', 'word-wrap', wrap, wrap_immediate, wrap_regexp,
tfoot, th, thead, third, thru, time, title, todo, todo_comment, toLowerCase,
toString, toUpperCase, token, too_long, too_many, top, tr,
trailing_decimal_a, tree, tt, tty, tv, type, u, ul, unclosed,
unclosed_comment, unclosed_regexp, undef, undefined, unescaped_a,
unexpected_a, unexpected_char_a_b, unexpected_comment, unexpected_else,
unexpected_label_a, unexpected_property_a, unexpected_space_a_b,
'unicode-bidi', unnecessary_initialize, unnecessary_use, unparam,
unreachable_a_b, unrecognized_style_attribute_a, unrecognized_tag_a, unsafe,
unused, url, urls, use_array, use_braces, use_charAt, use_object, use_or,
use_param, used_before_a, var, var_a_not, vars, 'vertical-align', video,
visibility, was, weird_assignment, weird_condition, weird_new,
weird_program, weird_relation, weird_ternary, white, 'white-space', width,
windows, 'word-spacing', 'word-wrap', wrap, wrap_immediate, wrap_regexp,
write_is_wrong, writeable, 'z-index'
*/

Expand Down Expand Up @@ -516,12 +516,12 @@ var JSLINT = (function () {
expected_type_a: "Expected a type, and instead saw {a}.",
for_if: "The body of a for in should be wrapped in an if " +
"statement to filter unwanted properties from the prototype.",
function_block: "Function statements should not be placed in blocks. " +
function_block: "Function statements should not be placed in blocks." +
"Use a function expression or move the statement to the top of " +
"the outer function.",
function_eval: "The Function constructor is eval.",
function_loop: "Don't make functions within a loop.",
function_statement: "Function statements are not invocable. " +
function_statement: "Function statements are not invocable." +
"Wrap the whole function invocation in parens.",
function_strict: "Use the function form of 'use strict'.",
html_confusion_a: "HTML confusion in regular expression '<{a}'.",
Expand Down Expand Up @@ -566,12 +566,13 @@ var JSLINT = (function () {
scanned_a_b: "{a} ({b}% scanned).",
slash_equal: "A regular expression literal can be confused with '/='.",
statement_block: "Expected to see a statement and instead saw a block.",
stopping: "Stopping. ",
stopping: "Stopping.",
strange_loop: "Strange loop.",
strict: "Strict violation.",
subscript: "['{a}'] is better written in dot notation.",
sync_a: "Unexpected sync method: '{a}'.",
tag_a_in_b: "A '<{a}>' must be within '<{b}>'.",
todo_comment: "Unexpected TODO comment.",
too_long: "Line too long.",
too_many: "Too many errors.",
trailing_decimal_a: "A trailing decimal point can be confused " +
Expand Down Expand Up @@ -939,6 +940,8 @@ var JSLINT = (function () {
// style
sx = /^\s*([{}:#%.=,>+\[\]@()"';]|[*$\^~]=|[a-zA-Z_][a-zA-Z0-9_\-]*|[0-9]+|<\/|\/\*)/,
ssx = /^\s*([@#!"'};:\-%.=,+\[\]()*_]|[a-zA-Z][a-zA-Z0-9._\-]*|\/\*?|\d+(?:\.\d+)?|<\/)/,
// comment todo
tox = /^\s*to\s*do/i,
// token
tx = /^\s*([(){}\[\]\?.,:;'"~#@`]|={1,3}|\/(\*(jslint|properties|property|members?|globals?)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|[\^%]=?|&[&=]?|\|[|=]?|>{1,3}=?|<(?:[\/=!]|\!(\[|--)?|<=?)?|\!={0,2}|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+(?:[xX][0-9a-fA-F]+|\.[0-9]*)?(?:[eE][+\-]?[0-9]+)?)/,
// url badness
Expand Down Expand Up @@ -1410,6 +1413,8 @@ var JSLINT = (function () {
warn_at('unexpected_a', line, character, '<\/');
} else if (option.safe && ax.test(snippet)) {
warn_at('dangerous_comment', line, character);
} else if (!option.todo && tox.test(snippet)) {
warn_at('todo_comment', line, character);
}
}

Expand Down Expand Up @@ -6394,7 +6399,7 @@ klass: do {

itself.jslint = itself;

itself.edition = '2012-05-09';
itself.edition = '2012-07-10';

return itself;
}());
6 changes: 6 additions & 0 deletions lint.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,12 @@ <h1 id=options>Options</h1>
<td><code>true</code> if subscript notation may be used for expressions
better expressed in dot notation.</td>
</tr>
<tr>
<td>Tolerate TODO comments<br>
</td>
<td><code>todo</code></td>
<td><code>true</code> if comments starting with <code>TODO</code> should be allowed.</td>
</tr>
<tr>
<td> Tolerate misordered definitions </td>
<td><code>undef</code></td>
Expand Down

1 comment on commit 49284af

@Walfisch
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for the TODO option

Please sign in to comment.