lib,test,tools: alignment on variable assignments

Correct alignment on variable assignments that span multiple lines in
preparation for lint rule to enforce such alignment.
PR-URL: #6242
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: Trott

lib/child_process.js

@@ -463,9 +463,10 @@ function checkExecSyncError(ret) {
 ret.error=null;
 
 if(!err){
-varmsg='Command failed: '+
-(ret.cmd ? ret.cmd : ret.args.join(' '))+
-(ret.stderr ? '\n'+ret.stderr.toString() : '');
+varmsg='Command failed: ';
+msg+=ret.cmd||ret.args.join(' ');
+if(ret.stderr)
+msg+='\n'+ret.stderr.toString();
 err=newError(msg);
 }
 

lib/repl.js

@@ -70,8 +70,8 @@ exports._builtinLibs = ['assert', 'buffer', 'child_process', 'cluster',
 'string_decoder','tls','tty','url','util','v8','vm','zlib'];
 
 
-constBLOCK_SCOPED_ERROR='Block-scoped declarations (let, '+
-'const, function, class) not yet supported outside strict mode';
+constBLOCK_SCOPED_ERROR='Block-scoped declarations (let, const, function, '+
+'class) not yet supported outside strict mode';
 
 
 classLineParser{

lib/util.js

@@ -460,9 +460,12 @@ function formatPrimitive(ctx, value) {
 vartype=typeofvalue;
 
 if(type==='string'){
-varsimple='\''+JSON.stringify(value).replace(/^"|"$/g,'')
-.replace(/'/g,"\\'")
-.replace(/\\"/g,'"')+'\'';
+varsimple='\''+
+JSON.stringify(value)
+.replace(/^"|"$/g,'')
+.replace(/'/g,"\\'")
+.replace(/\\"/g,'"')+
+'\'';
 returnctx.stylize(simple,'string');
 }
 if(type==='number'){

lib/zlib.js

@@ -6,8 +6,8 @@ const binding = process.binding('zlib');
 constutil=require('util');
 constassert=require('assert').ok;
 constkMaxLength=require('buffer').kMaxLength;
-constkRangeErrorMessage='Cannot create final Buffer. '+
-'It would be larger than 0x'+kMaxLength.toString(16)+' bytes.';
+constkRangeErrorMessage='Cannot create final Buffer. It would be larger '+
+'than 0x'+kMaxLength.toString(16)+' bytes';
 
 // zlib doesn't provide these, so kludge them in following the same
 // const naming scheme zlib uses.

test/parallel/test-buffer-alloc.js

@@ -536,17 +536,17 @@ assert.equal('TWFu', (Buffer.from('Man')).toString('base64'));
 {
 // big example
 constquote='Man is distinguished, not only by his reason, but by this '+
-'singular passion from other animals, which is a lust '+
-'of the mind, that by a perseverance of delight in the '+
-'continued and indefatigable generation of knowledge, exceeds '+
-'the short vehemence of any carnal pleasure.';
+'singular passion from other animals, which is a lust '+
+'of the mind, that by a perseverance of delight in the '+
+'continued and indefatigable generation of knowledge, '+
+'exceeds the short vehemence of any carnal pleasure.';
 constexpected='TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb'+
-'24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBh'+
-'bmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnk'+
-'gYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGludWVkIG'+
-'FuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBle'+
-'GNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVh'+
-'c3VyZS4=';
+'24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlci'+
+'BhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQ'+
+'gYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu'+
+'dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZ'+
+'GdlLCBleGNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm'+
+'5hbCBwbGVhc3VyZS4=';
 assert.equal(expected,(Buffer.from(quote)).toString('base64'));
 
 letb=Buffer.allocUnsafe(1024);
@@ -556,11 +556,11 @@ assert.equal('TWFu', (Buffer.from('Man')).toString('base64'));
 
 // check that the base64 decoder ignores whitespace
 constexpectedWhite=expected.slice(0,60)+' \n'+
-expected.slice(60,120)+' \n'+
-expected.slice(120,180)+' \n'+
-expected.slice(180,240)+' \n'+
-expected.slice(240,300)+'\n'+
-expected.slice(300,360)+'\n';
+expected.slice(60,120)+' \n'+
+expected.slice(120,180)+' \n'+
+expected.slice(180,240)+' \n'+
+expected.slice(240,300)+'\n'+
+expected.slice(300,360)+'\n';
 b=Buffer.allocUnsafe(1024);
 bytesWritten=b.write(expectedWhite,0,'base64');
 assert.equal(quote.length,bytesWritten);
@@ -574,11 +574,11 @@ assert.equal('TWFu', (Buffer.from('Man')).toString('base64'));
 
 // check that the base64 decoder ignores illegal chars
 constexpectedIllegal=expected.slice(0,60)+' \x80'+
-expected.slice(60,120)+' \xff'+
-expected.slice(120,180)+' \x00'+
-expected.slice(180,240)+' \x98'+
-expected.slice(240,300)+'\x03'+
-expected.slice(300,360);
+expected.slice(60,120)+' \xff'+
+expected.slice(120,180)+' \x00'+
+expected.slice(180,240)+' \x98'+
+expected.slice(240,300)+'\x03'+
+expected.slice(300,360);
 b=Buffer.from(expectedIllegal,'base64');
 assert.equal(quote.length,b.length);
 assert.equal(quote,b.toString('ascii',0,quote.length));

test/parallel/test-buffer.js

@@ -533,17 +533,17 @@ assert.equal('TWFu', (new Buffer('Man')).toString('base64'));
 {
 // big example
 constquote='Man is distinguished, not only by his reason, but by this '+
-'singular passion from other animals, which is a lust '+
-'of the mind, that by a perseverance of delight in the '+
-'continued and indefatigable generation of knowledge, exceeds '+
-'the short vehemence of any carnal pleasure.';
+'singular passion from other animals, which is a lust '+
+'of the mind, that by a perseverance of delight in the '+
+'continued and indefatigable generation of knowledge, '+
+'exceeds the short vehemence of any carnal pleasure.';
 constexpected='TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb'+
-'24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBh'+
-'bmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnk'+
-'gYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGludWVkIG'+
-'FuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBle'+
-'GNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVh'+
-'c3VyZS4=';
+'24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlci'+
+'BhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQ'+
+'gYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu'+
+'dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZ'+
+'GdlLCBleGNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm'+
+'5hbCBwbGVhc3VyZS4=';
 assert.equal(expected,(newBuffer(quote)).toString('base64'));
 
 letb=newBuffer(1024);
@@ -553,11 +553,11 @@ assert.equal('TWFu', (new Buffer('Man')).toString('base64'));
 
 // check that the base64 decoder ignores whitespace
 constexpectedWhite=expected.slice(0,60)+' \n'+
-expected.slice(60,120)+' \n'+
-expected.slice(120,180)+' \n'+
-expected.slice(180,240)+' \n'+
-expected.slice(240,300)+'\n'+
-expected.slice(300,360)+'\n';
+expected.slice(60,120)+' \n'+
+expected.slice(120,180)+' \n'+
+expected.slice(180,240)+' \n'+
+expected.slice(240,300)+'\n'+
+expected.slice(300,360)+'\n';
 b=newBuffer(1024);
 bytesWritten=b.write(expectedWhite,0,'base64');
 assert.equal(quote.length,bytesWritten);
@@ -571,11 +571,11 @@ assert.equal('TWFu', (new Buffer('Man')).toString('base64'));
 
 // check that the base64 decoder ignores illegal chars
 constexpectedIllegal=expected.slice(0,60)+' \x80'+
-expected.slice(60,120)+' \xff'+
-expected.slice(120,180)+' \x00'+
-expected.slice(180,240)+' \x98'+
-expected.slice(240,300)+'\x03'+
-expected.slice(300,360);
+expected.slice(60,120)+' \xff'+
+expected.slice(120,180)+' \x00'+
+expected.slice(180,240)+' \x98'+
+expected.slice(240,300)+'\x03'+
+expected.slice(300,360);
 b=newBuffer(expectedIllegal,'base64');
 assert.equal(quote.length,b.length);
 assert.equal(quote,b.toString('ascii',0,quote.length));

test/parallel/test-cluster-worker-exit.js

@@ -107,7 +107,7 @@ function checkResults(expected_results, results) {
 constexpected=expected_results[k];
 
 varmsg=(expected[1]||'')+
-(' [expected: '+expected[0]+' / actual: '+actual+']');
+(' [expected: '+expected[0]+' / actual: '+actual+']');
 
 if(expected&&expected.length){
 assert.equal(actual,expected[0],msg);

test/parallel/test-cluster-worker-kill.js

@@ -90,7 +90,7 @@ function checkResults(expected_results, results) {
 constexpected=expected_results[k];
 
 varmsg=(expected[1]||'')+
-(' [expected: '+expected[0]+' / actual: '+actual+']');
+(' [expected: '+expected[0]+' / actual: '+actual+']');
 if(expected&&expected.length){
 assert.equal(actual,expected[0],msg);
 }else{

test/parallel/test-domain-no-error-handler-abort-on-uncaught.js

@@ -160,8 +160,8 @@ if (process.argv[2] === 'child') {
 
 child.on('exit',functiononExit(exitCode,signal){
 consterrMsg='Test at index '+testIndex+' should have aborted '+
-'but instead exited with exit code '+exitCode+' and signal '+
-signal;
+'but instead exited with exit code '+exitCode+
+' and signal '+signal;
 assert(common.nodeProcessAborted(exitCode,signal),errMsg);
 });
 });

test/parallel/test-error-reporting.js

@@ -8,7 +8,7 @@ var exits = 0;
 
 functionerrExec(script,callback){
 varcmd='"'+process.argv[0]+'" "'+
-path.join(common.fixturesDir,script)+'"';
+path.join(common.fixturesDir,script)+'"';
 returnexec(cmd,function(err,stdout,stderr){
 // There was some error
 assert.ok(err);