2 participants
nzakas
commented
antonkovalyov
closed this
Owner
antonkovalyov
commented
Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
This page is out of date. Refresh to see the latest.
Showing 1 changed file with 38 additions and 22 deletions. Show Diff Stats
@@ -4,13 +4,26 @@ |
||
| 4 | 4 |
load("jshint.js");
|
| 5 | 5 |
|
| 6 | 6 |
(function (args) {
|
| 7 |
- var name = args[0], |
|
| 8 |
- optstr = args[1], // arg1=val1,arg2=val2,... |
|
| 9 |
- predef = args[2], // global1=override,global2,global3,... |
|
| 7 |
+ var filenames = [], |
|
| 8 |
+ optstr, // arg1=val1,arg2=val2,... |
|
| 9 |
+ predef, // global1=override,global2,global3,... |
|
| 10 | 10 |
opts = { rhino: true },
|
| 11 |
- input;
|
|
| 11 |
+ retval = 0;
|
|
| 12 | 12 |
|
| 13 |
- if (!name) {
|
|
| 13 |
+ args.forEach(function(arg){
|
|
| 14 |
+ if (arg.indexOf("=") > -1){
|
|
| 15 |
+ //first time it's the options |
|
| 16 |
+ if (!optstr){
|
|
| 17 |
+ optstr = arg; |
|
| 18 |
+ } else if (!predef) {
|
|
| 19 |
+ predef = arg; |
|
| 20 |
+ } |
|
| 21 |
+ } else {
|
|
| 22 |
+ filenames.push(arg); |
|
| 23 |
+ } |
|
| 24 |
+ }); |
|
| 25 |
+ |
|
| 26 |
+ if (filenames.length === 0) {
|
|
| 14 | 27 |
print('Usage: jshint.js file.js');
|
| 15 | 28 |
quit(1); |
| 16 | 29 |
} |
@@ -27,35 +40,38 @@ load("jshint.js");
|
||
| 27 | 40 |
default: |
| 28 | 41 |
return ov; |
| 29 | 42 |
} |
| 30 |
- }(o[1]));
|
|
| 43 |
+ })(o[1]);
|
|
| 31 | 44 |
}); |
| 32 | 45 |
} |
| 33 |
- |
|
| 46 |
+
|
|
| 34 | 47 |
if (predef) {
|
| 35 | 48 |
opts.predef = {};
|
| 36 | 49 |
predef.split(',').forEach(function (arg) {
|
| 37 | 50 |
var global = arg.split('=');
|
| 38 | 51 |
opts.predef[global[0]] = (function (override) {
|
| 39 | 52 |
return (override === 'false') ? false : true; |
| 40 |
- }(global[1]));
|
|
| 53 |
+ })(global[1]);
|
|
| 41 | 54 |
}); |
| 42 | 55 |
} |
| 43 | 56 |
|
| 44 |
- input = readFile(name);
|
|
| 57 |
+ filenames.forEach(function(name){
|
|
| 45 | 58 |
|
| 46 |
- if (!input) {
|
|
| 47 |
- print('jshint: Couldn\'t open file ' + name);
|
|
| 48 |
- quit(1); |
|
| 49 |
- } |
|
| 59 |
+ var input = readFile(name); |
|
| 50 | 60 |
|
| 51 |
- if (!JSHINT(input, opts)) {
|
|
| 52 |
- for (var i = 0, err; err = JSHINT.errors[i]; i += 1) {
|
|
| 53 |
- print(err.reason + ' (' + name + ':' + err.line + ':' + err.character + ')');
|
|
| 54 |
- print('> ' + (err.evidence || '').replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
|
|
| 55 |
- print('');
|
|
| 61 |
+ if (!input) {
|
|
| 62 |
+ print('jshint: Couldn\'t open file ' + name);
|
|
| 63 |
+ quit(1); |
|
| 56 | 64 |
} |
| 57 |
- quit(1); |
|
| 58 |
- } |
|
| 59 | 65 |
|
| 60 |
- quit(0); |
|
| 61 |
-}(arguments)); |
|
| 66 |
+ if (!JSHINT(input, opts)) {
|
|
| 67 |
+ for (var i = 0, err; err = JSHINT.errors[i]; i++) {
|
|
| 68 |
+ print(err.reason + ' (' + name + ':' + err.line + ':' + err.character + ')');
|
|
| 69 |
+ print('> ' + (err.evidence || '').replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
|
|
| 70 |
+ print('');
|
|
| 71 |
+ } |
|
| 72 |
+ retval = 1; |
|
| 73 |
+ } |
|
| 74 |
+ }); |
|
| 75 |
+ |
|
| 76 |
+ quit(retval); |
|
| 77 |
+}(arguments));
|
|
Tip: You can add notes to lines in a file. Hover to the left of a line to make a note
This patch allows multiple filenames to be passed to the Rhino CLI. When checking multiple files, you end up starting up and tearing down a JVM for every single file, which adds a significant amount of time to the overall linting process. By allowing the Rhino CLI to process multiple files, you can dramatically reduce the total amount of time for processing a large number of files.
When I made this change to the CSSLint JSHint task, it went from taking 45s to check the entire source tree to 3s.
I tried to ensure backwards compatibility with the current CLI, and believe everything still works the same way. The only difference is that any value passed on the command line without an = sign is considered to be a filename.