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>
MylesBorins · Apr 2, 2016 · Apr 5, 2016 · Apr 4, 2016 · Apr 4, 2016 · Apr 6, 2016
commit 799f41410a3575109796957b0b1c1f088487bc3a
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -463,9 +463,10 @@ function checkExecSyncError(ret) {
     ret.error = null;
 
     if (!err) {
-      var msg = 'Command failed: ' +
-                (ret.cmd ? ret.cmd : ret.args.join(' ')) +
-                (ret.stderr ? '\n' + ret.stderr.toString() : '');
+      var msg = 'Command failed: ';
+      msg += ret.cmd || ret.args.join(' ');
+      if (ret.stderr)
+        msg += '\n' + ret.stderr.toString();
       err = new Error(msg);
     }
 

diff --git a/lib/repl.js b/lib/repl.js
@@ -70,8 +70,8 @@ exports._builtinLibs = ['assert', 'buffer', 'child_process', 'cluster',
   'string_decoder', 'tls', 'tty', 'url', 'util', 'v8', 'vm', 'zlib'];
 
 
-const BLOCK_SCOPED_ERROR = 'Block-scoped declarations (let, ' +
-    'const, function, class) not yet supported outside strict mode';
+const BLOCK_SCOPED_ERROR = 'Block-scoped declarations (let, const, function, ' +
+                           'class) not yet supported outside strict mode';
 
 
 class LineParser {

diff --git a/lib/util.js b/lib/util.js
@@ -460,9 +460,12 @@ function formatPrimitive(ctx, value) {
   var type = typeof value;
 
   if (type === 'string') {
-    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
-        .replace(/'/g, "\\'")
-        .replace(/\\"/g, '"') + '\'';
+    var simple = '\'' +
+                 JSON.stringify(value)
+                     .replace(/^"|"$/g, '')
+                     .replace(/'/g, "\\'")
+                     .replace(/\\"/g, '"') +
+                 '\'';
     return ctx.stylize(simple, 'string');
   }
   if (type === 'number') {

diff --git a/lib/zlib.js b/lib/zlib.js
@@ -6,8 +6,8 @@ const binding = process.binding('zlib');
 const util = require('util');
 const assert = require('assert').ok;
 const kMaxLength = require('buffer').kMaxLength;
-const kRangeErrorMessage = 'Cannot create final Buffer. ' +
-    'It would be larger than 0x' + kMaxLength.toString(16) + ' bytes.';
+const kRangeErrorMessage = '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.

diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js
@@ -536,17 +536,17 @@ assert.equal('TWFu', (Buffer.from('Man')).toString('base64'));
 {
   // big example
   const quote = '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.';
   const expected = 'TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb' +
-                 '24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBh' +
-                 'bmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnk' +
-                 'gYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGludWVkIG' +
-                 'FuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBle' +
-                 'GNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVh' +
-                 'c3VyZS4=';
+                   '24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlci' +
+                   'BhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQ' +
+                   'gYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu' +
+                   'dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZ' +
+                   'GdlLCBleGNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm' +
+                   '5hbCBwbGVhc3VyZS4=';
   assert.equal(expected, (Buffer.from(quote)).toString('base64'));
 
   let b = Buffer.allocUnsafe(1024);
@@ -556,11 +556,11 @@ assert.equal('TWFu', (Buffer.from('Man')).toString('base64'));
 
   // check that the base64 decoder ignores whitespace
   const expectedWhite = 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
   const expectedIllegal = 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));

diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js
@@ -533,17 +533,17 @@ assert.equal('TWFu', (new Buffer('Man')).toString('base64'));
 {
   // big example
   const quote = '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.';
   const expected = 'TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb' +
-                 '24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBh' +
-                 'bmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnk' +
-                 'gYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGludWVkIG' +
-                 'FuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBle' +
-                 'GNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVh' +
-                 'c3VyZS4=';
+                   '24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlci' +
+                   'BhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQ' +
+                   'gYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu' +
+                   'dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZ' +
+                   'GdlLCBleGNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm' +
+                   '5hbCBwbGVhc3VyZS4=';
   assert.equal(expected, (new Buffer(quote)).toString('base64'));
 
   let b = new Buffer(1024);
@@ -553,11 +553,11 @@ assert.equal('TWFu', (new Buffer('Man')).toString('base64'));
 
   // check that the base64 decoder ignores whitespace
   const expectedWhite = 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 = new Buffer(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
   const expectedIllegal = 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 = new Buffer(expectedIllegal, 'base64');
   assert.equal(quote.length, b.length);
   assert.equal(quote, b.toString('ascii', 0, quote.length));

diff --git a/test/parallel/test-cluster-worker-exit.js b/test/parallel/test-cluster-worker-exit.js
@@ -107,7 +107,7 @@ function checkResults(expected_results, results) {
     const expected = expected_results[k];
 
     var msg = (expected[1] || '') +
-        (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
+              (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
 
     if (expected && expected.length) {
       assert.equal(actual, expected[0], msg);

diff --git a/test/parallel/test-cluster-worker-kill.js b/test/parallel/test-cluster-worker-kill.js
@@ -90,7 +90,7 @@ function checkResults(expected_results, results) {
     const expected = expected_results[k];
 
     var msg = (expected[1] || '') +
-        (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
+              (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
     if (expected && expected.length) {
       assert.equal(actual, expected[0], msg);
     } else {

diff --git a/test/parallel/test-domain-no-error-handler-abort-on-uncaught.js b/test/parallel/test-domain-no-error-handler-abort-on-uncaught.js
@@ -160,8 +160,8 @@ if (process.argv[2] === 'child') {
 
     child.on('exit', function onExit(exitCode, signal) {
       const errMsg = '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);
     });
   });

diff --git a/test/parallel/test-error-reporting.js b/test/parallel/test-error-reporting.js
@@ -8,7 +8,7 @@ var exits = 0;
 
 function errExec(script, callback) {
   var cmd = '"' + process.argv[0] + '" "' +
-      path.join(common.fixturesDir, script) + '"';
+            path.join(common.fixturesDir, script) + '"';
   return exec(cmd, function(err, stdout, stderr) {
     // There was some error
     assert.ok(err);

diff --git a/test/parallel/test-fs-append-file-sync.js b/test/parallel/test-fs-append-file-sync.js
@@ -8,12 +8,12 @@ var currentFileData = 'ABCD';
 
 var num = 220;
 var data = '南越国是前203年至前111年存在于岭南地区的一个国家，国都位于番禺，疆域包括今天中国的广东、' +
-        '广西两省区的大部份地区，福建省、湖南、贵州、云南的一小部份地区和越南的北部。' +
-        '南越国是秦朝灭亡后，由南海郡尉赵佗于前203年起兵兼并桂林郡和象郡后建立。' +
-        '前196年和前179年，南越国曾先后两次名义上臣属于西汉，成为西汉的“外臣”。前112年，' +
-        '南越国末代君主赵建德与西汉发生战争，被汉武帝于前111年所灭。南越国共存在93年，' +
-        '历经五代君主。南越国是岭南地区的第一个有记载的政权国家，采用封建制和郡县制并存的制度，' +
-        '它的建立保证了秦末乱世岭南地区社会秩序的稳定，有效的改善了岭南地区落后的政治、##济现状。\n';
+           '广西两省区的大部份地区，福建省、湖南、贵州、云南的一小部份地区和越南的北部。' +
+           '南越国是秦朝灭亡后，由南海郡尉赵佗于前203年起兵兼并桂林郡和象郡后建立。' +
+           '前196年和前179年，南越国曾先后两次名义上臣属于西汉，成为西汉的“外臣”。前112年，' +
+           '南越国末代君主赵建德与西汉发生战争，被汉武帝于前111年所灭。南越国共存在93年，' +
+           '历经五代君主。南越国是岭南地区的第一个有记载的政权国家，采用封建制和郡县制并存的制度，' +
+           '它的建立保证了秦末乱世岭南地区社会秩序的稳定，有效的改善了岭南地区落后的政治、##济现状。\n';
 
 common.refreshTmpDir();
 

diff --git a/test/parallel/test-http-1.0.js b/test/parallel/test-http-1.0.js
@@ -88,11 +88,11 @@ function test(handler, request_generator, response_validator) {
   }
 
   function response_validator(server_response, client_got_eof, timed_out) {
-    var expected_response = ('HTTP/1.1 200 OK\r\n' +
-        'Content-Type: text/plain\r\n' +
-        'Connection: close\r\n' +
-        '\r\n' +
-        'Hello, world!');
+    var expected_response = 'HTTP/1.1 200 OK\r\n' +
+                            'Content-Type: text/plain\r\n' +
+                            'Connection: close\r\n' +
+                            '\r\n' +
+                            'Hello, world!';
 
     assert.equal(expected_response, server_response);
     assert.equal(true, client_got_eof);
@@ -125,17 +125,17 @@ function test(handler, request_generator, response_validator) {
   }
 
   function response_validator(server_response, client_got_eof, timed_out) {
-    var expected_response = ('HTTP/1.1 200 OK\r\n' +
-        'Content-Type: text/plain\r\n' +
-        'Connection: close\r\n' +
-        'Transfer-Encoding: chunked\r\n' +
-        '\r\n' +
-        '7\r\n' +
-        'Hello, \r\n' +
-        '6\r\n' +
-        'world!\r\n' +
-        '0\r\n' +
-        '\r\n');
+    var expected_response = 'HTTP/1.1 200 OK\r\n' +
+                            'Content-Type: text/plain\r\n' +
+                            'Connection: close\r\n' +
+                            'Transfer-Encoding: chunked\r\n' +
+                            '\r\n' +
+                            '7\r\n' +
+                            'Hello, \r\n' +
+                            '6\r\n' +
+                            'world!\r\n' +
+                            '0\r\n' +
+                            '\r\n';
 
     assert.equal(expected_response, server_response);
     assert.equal(true, client_got_eof);

diff --git a/test/parallel/test-path-parse-format.js b/test/parallel/test-path-parse-format.js
@@ -119,12 +119,11 @@ const trailingTests = [
 const failures = [];
 trailingTests.forEach(function(test) {
   const parse = test[0];
+  const os = parse === path.win32.parse ? 'win32' : 'posix';
   test[1].forEach(function(test) {
     const actual = parse(test[0]);
     const expected = test[1];
-    const fn = 'path.' +
-               (parse === path.win32.parse ? 'win32' : 'posix') +
-               '.parse(';
+    const fn = `path.${os}.parse(`;
     const message = fn +
                     JSON.stringify(test[0]) +
                     ')' +

diff --git a/test/parallel/test-path.js b/test/parallel/test-path.js
@@ -155,13 +155,16 @@ assert.equal(path.win32.dirname({}), '.');
 ].forEach(function(test) {
   [path.posix.extname, path.win32.extname].forEach(function(extname) {
     let input = test[0];
-    if (extname === path.win32.extname)
+    let os;
+    if (extname === path.win32.extname) {
       input = input.replace(/\//g, '\\');
+      os = 'win32';
+    } else {
+      os = 'posix';
+    }
     const actual = extname(input);
     const expected = test[1];
-    const fn = 'path.' +
-               (extname === path.win32.extname ? 'win32' : 'posix') +
-               '.extname(';
+    const fn = `path.${os}.extname(`;
     const message = fn + JSON.stringify(input) + ')' +
                     '\n  expect=' + JSON.stringify(expected) +
                     '\n  actual=' + JSON.stringify(actual);
@@ -319,11 +322,15 @@ joinTests.forEach(function(test) {
       // For non-Windows specific tests with the Windows join(), we need to try
       // replacing the slashes since the non-Windows specific tests' `expected`
       // use forward slashes
-      const actualAlt = (join === path.win32.join) ?
-        actual.replace(/\\/g, '/') : undefined;
-      const fn = 'path.' +
-                 (join === path.win32.join ? 'win32' : 'posix') +
-                 '.join(';
+      let actualAlt;
+      let os;
+      if (join === path.win32.join) {
+        actualAlt = actual.replace(/\\/g, '/');
+        os = 'win32';
+      } else {
+        os = 'posix';
+      }
+      const fn = `path.${os}.join(`;
       const message = fn + test[0].map(JSON.stringify).join(',') + ')' +
                       '\n  expect=' + JSON.stringify(expected) +
                       '\n  actual=' + JSON.stringify(actual);
@@ -424,14 +431,14 @@ resolveTests.forEach(function(test) {
   test[1].forEach(function(test) {
     const actual = resolve.apply(null, test[0]);
     let actualAlt;
+    const os = resolve === path.win32.resolve ? 'win32' : 'posix';
     if (resolve === path.win32.resolve && !common.isWindows)
       actualAlt = actual.replace(/\\/g, '/');
     else if (resolve !== path.win32.resolve && common.isWindows)
       actualAlt = actual.replace(/\//g, '\\');
+
     const expected = test[1];
-    const fn = 'path.' +
-               (resolve === path.win32.resolve ? 'win32' : 'posix') +
-               '.resolve(';
+    const fn = `path.${os}.resolve(`;
     const message = fn + test[0].map(JSON.stringify).join(',') + ')' +
                     '\n  expect=' + JSON.stringify(expected) +
                     '\n  actual=' + JSON.stringify(actual);
@@ -518,9 +525,8 @@ relativeTests.forEach(function(test) {
   test[1].forEach(function(test) {
     const actual = relative(test[0], test[1]);
     const expected = test[2];
-    const fn = 'path.' +
-               (relative === path.win32.relative ? 'win32' : 'posix') +
-               '.relative(';
+    const os = relative === path.win32.relative ? 'win32' : 'posix';
+    const fn = `path.${os}.relative(`;
     const message = fn +
                     test.slice(0, 2).map(JSON.stringify).join(',') +
                     ')' +

diff --git a/test/parallel/test-readline-undefined-columns.js b/test/parallel/test-readline-undefined-columns.js
@@ -28,8 +28,8 @@ oStream.on('data', function(data) {
 
 oStream.on('end', function() {
   const expect = 'process.stdout\r\n' +
-    'process.stdin\r\n' +
-    'process.stderr';
+                 'process.stdin\r\n' +
+                 'process.stderr';
   assert(new RegExp(expect).test(output));
 });