tools: increase lint coverage

Extend linting to tools/license2rtf.js and any other JS that gets added
to the `tools` directory by default.
This incidentally simplifies lint invocation.
PR-URL: #7647
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

Author: Trott

.eslintignore

@@ -2,7 +2,7 @@ lib/internal/v8_prof_polyfill.js
 lib/punycode.js
 test/addons/??_*/
 test/fixtures
-test/**/node_modules
 test/disabled
 test/tmp*/
-tools/doc/node_modules
+tools/eslint
+node_modules

Makefile

@@ -678,13 +678,11 @@ bench-idle:
 $(NODE) benchmark/idle_clients.js &
 
 jslint:
-$(NODE) tools/jslint.js -J benchmark lib src test tools/doc \
- tools/eslint-rules tools/jslint.js
+$(NODE) tools/jslint.js -J benchmark lib src test tools
 
 jslint-ci:
 $(NODE) tools/jslint.js $(PARALLEL_ARGS) -f tap -o test-eslint.tap \
- benchmark lib src test tools/doc \
- tools/eslint-rules tools/jslint.js
+ benchmark lib src test tools
 
 CPPLINT_EXCLUDE ?=
 CPPLINT_EXCLUDE += src/node_root_certs.h

tools/license2rtf.js

@@ -1,15 +1,16 @@
+'use strict';
 
-varassert=require('assert'),
-Stream=require('stream'),
-inherits=require('util').inherits;
+constassert=require('assert');
+constStream=require('stream');
+constinherits=require('util').inherits;
 
 
 /*
  * This filter consumes a stream of characters and emits one string per line.
  */
 functionLineSplitter(){
-varself=this,
-buffer="";
+constself=this;
+varbuffer='';
 
 Stream.call(this);
 this.writable=true;
@@ -38,33 +39,31 @@ inherits(LineSplitter, Stream);
  * This filter consumes lines and emits paragraph objects.
  */
 functionParagraphParser(){
-varself=this,
-block_is_license_block=false,
-block_has_c_style_comment,
-is_first_line_in_paragraph,
-paragraph_line_indent,
-paragraph;
-
-Stream.call(this);
-this.writable=true;
-
-resetBlock(false);
-
-this.write=function(data){
-parseLine(data+'');
-returntrue;
-};
-
-this.end=function(data){
-if(data){
-parseLine(data+'');
-}
-flushParagraph();
-self.emit('end');
-};
+constself=this;
+varblock_is_license_block=false;
+varblock_has_c_style_comment;
+varparagraph_line_indent;
+varparagraph;
+
+Stream.call(this);
+this.writable=true;
+
+resetBlock(false);
+
+this.write=function(data){
+parseLine(data+'');
+returntrue;
+};
+
+this.end=function(data){
+if(data){
+parseLine(data+'');
+}
+flushParagraph();
+self.emit('end');
+};
 
 functionresetParagraph(){
-is_first_line_in_paragraph=true;
 paragraph_line_indent=-1;
 
 paragraph={
@@ -165,8 +164,6 @@ function ParagraphParser() {
 
 if(line)
 paragraph.lines.push(line);
-
-is_first_line_in_paragraph=false;
 }
 }
 inherits(ParagraphParser,Stream);
@@ -184,16 +181,16 @@ function Unwrapper() {
 this.writable=true;
 
 this.write=function(paragraph){
-varlines=paragraph.lines,
-break_after=[],
-i;
+varlines=paragraph.lines;
+varbreak_after=[];
+vari;
 
 for(i=0;i<lines.length-1;i++){
 varline=lines[i];
 
 // When a line is really short, the line was probably kept separate for a
 // reason.
-if(line.length<50){
+if(line.length<50){
 // If the first word on the next line really didn't fit after the line,
 // it probably was just ordinary wrapping after all.
 varnext_first_word_length=lines[i+1].replace(/\s.*$/,'').length;
@@ -203,7 +200,7 @@ function Unwrapper() {
 }
 }
 
-for(i=0;i<lines.length-1;){
+for(i=0;i<lines.length-1;){
 if(!break_after[i]){
 lines[i]+=' '+lines.splice(i+1,1)[0];
 }else{
@@ -233,8 +230,8 @@ inherits(Unwrapper, Stream);
  * This filter generates an rtf document from a stream of paragraph objects.
  */
 functionRtfGenerator(){
-varself=this,
-did_write_anything=false;
+constself=this;
+vardid_write_anything=false;
 
 Stream.call(this);
 this.writable=true;
@@ -245,11 +242,11 @@ function RtfGenerator() {
 did_write_anything=true;
 }
 
-varli=paragraph.li,
-level=paragraph.level+(li ? 1 : 0),
-lic=paragraph.in_license_block;
+varli=paragraph.li;
+varlevel=paragraph.level+(li ? 1 : 0);
+varlic=paragraph.in_license_block;
 
-varrtf="\\pard";
+varrtf='\\pard';
 rtf+='\\sa150\\sl300\\slmult1';
 if(level>0)
 rtf+='\\li'+(level*240);
@@ -290,18 +287,19 @@ function RtfGenerator() {
 functionrtfEscape(string){
 returnstring
 .replace(/[\\\{\}]/g,function(m){
-return'\\'+m;
+return'\\'+m;
 })
 .replace(/\t/g,function(){
 return'\\tab ';
 })
+// eslint-disable-next-line no-control-regex
 .replace(/[\x00-\x1f\x7f-\xff]/g,function(m){
 return'\\\''+toHex(m.charCodeAt(0),2);
 })
 .replace(/\ufeff/g,'')
 .replace(/[\u0100-\uffff]/g,function(m){
 return'\\u'+toHex(m.charCodeAt(0),4)+'?';
-});
+});
 }
 
 functionemitHeader(){
@@ -317,12 +315,12 @@ function RtfGenerator() {
 inherits(RtfGenerator,Stream);
 
 
-varstdin=process.stdin,
-stdout=process.stdout,
-line_splitter=newLineSplitter(),
-paragraph_parser=newParagraphParser(),
-unwrapper=newUnwrapper(),
-rtf_generator=newRtfGenerator();
+conststdin=process.stdin;
+conststdout=process.stdout;
+constline_splitter=newLineSplitter();
+constparagraph_parser=newParagraphParser();
+constunwrapper=newUnwrapper();
+constrtf_generator=newRtfGenerator();
 
 stdin.setEncoding('utf-8');
 stdin.resume();

vcbuild.bat

@@ -348,12 +348,12 @@ if defined jslint_ci goto jslint-ci
 ifnotdefined jslint gotoexit
 ifnotexist tools\eslint\bin\eslint.js goto no-lint
 echo running jslint
-%config%\node tools\jslint.js -J benchmark lib src test tools\doc tools\eslint-rules tools\jslint.js
+%config%\node tools\jslint.js -J benchmark lib src test tools
 gotoexit
 
 :jslint-ci
 echo running jslint-ci
-%config%\node tools\jslint.js -J -f tap -o test-eslint.tap benchmark lib src test tools\doc tools\eslint-rules tools\jslint.js
+%config%\node tools\jslint.js -J -f tap -o test-eslint.tap benchmark lib src test tools
 gotoexit
 
 :no-lint