Commit ceeae4b
tools,test: make argument linting more stringent
The custom linting rule for argument alignment in multi-line function
calls previously ignored template strings in an effort to avoid false
positives. This isn't really necessary. Enforce for template strings and
adjust whitespace in three tests to abide. (Insert "The test abides"
joke of your choosing here.)
PR-URL: #6720
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>1 parent 6d1527b commit ceeae4b
4 files changed
Lines changed: 16 additions & 17 deletions
File tree
- test/parallel
- tools/eslint-rules
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -376,7 +376,7 @@ try { | |||
| 376 | 376 | } catch (e) { | |
| 377 | 377 | threw = true; | |
| 378 | 378 | assert(e instanceof AnotherErrorType, | |
| 379 | - `expected AnotherErrorType, received ${e}`); | ||
| 379 | + `expected AnotherErrorType, received ${e}`); | ||
| 380 | 380 | } | |
| 381 | 381 | ||
| 382 | 382 | assert.ok(threw); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -45,7 +45,7 @@ var notSocketClient = net.createConnection(emptyTxt, function() { | |||
| 45 | 45 | ||
| 46 | 46 | notSocketClient.on('error', function(err) { | |
| 47 | 47 | assert(err.code === 'ENOTSOCK' || err.code === 'ECONNREFUSED', | |
| 48 | - `received ${err.code} instead of ENOTSOCK or ECONNREFUSED`); | ||
| 48 | + `received ${err.code} instead of ENOTSOCK or ECONNREFUSED`); | ||
| 49 | 49 | notSocketErrorFired = true; | |
| 50 | 50 | }); | |
| 51 | 51 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,14 +19,14 @@ process.chdir(common.tmpDir); | |||
| 19 | 19 | // Unknown checked for to prevent flakiness, if pattern is not found, | |
| 20 | 20 | // then a large number of unknown ticks should be present | |
| 21 | 21 | runTest(/LazyCompile.*\[eval\]:1|.*% UNKNOWN/, | |
| 22 | - `function f() { | ||
| 23 | - for (var i = 0; i < 1000000; i++) { | ||
| 24 | - i++; | ||
| 25 | - } | ||
| 26 | - setImmediate(function() { f(); }); | ||
| 27 | - }; | ||
| 28 | - setTimeout(function() { process.exit(0); }, 2000); | ||
| 29 | - f();`); | ||
| 22 | + `function f() { | ||
| 23 | + for (var i = 0; i < 1000000; i++) { | ||
| 24 | + i++; | ||
| 25 | + } | ||
| 26 | + setImmediate(function() { f(); }); | ||
| 27 | + }; | ||
| 28 | + setTimeout(function() { process.exit(0); }, 2000); | ||
| 29 | + f();`); | ||
| 30 | 30 | if (common.isWindows || | |
| 31 | 31 | common.isSunOS || | |
| 32 | 32 | common.isAix || | |
@@ -36,12 +36,12 @@ if (common.isWindows || | |||
| 36 | 36 | return; | |
| 37 | 37 | } | |
| 38 | 38 | runTest(/RunInDebugContext/, | |
| 39 | - `function f() { | ||
| 40 | - require(\'vm\').runInDebugContext(\'Debug\'); | ||
| 41 | - setImmediate(function() { f(); }); | ||
| 42 | - }; | ||
| 43 | - setTimeout(function() { process.exit(0); }, 2000); | ||
| 44 | - f();`); | ||
| 39 | + `function f() { | ||
| 40 | + require(\'vm\').runInDebugContext(\'Debug\'); | ||
| 41 | + setImmediate(function() { f(); }); | ||
| 42 | + }; | ||
| 43 | + setTimeout(function() { process.exit(0); }, 2000); | ||
| 44 | + f();`); | ||
| 45 | 45 | ||
| 46 | 46 | function runTest(pattern, code) { | |
| 47 | 47 | cp.execFileSync(process.execPath, ['-prof', '-pe', code]); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,6 @@ function checkArgumentAlignment(context, node) { | |||
| 33 | 33 | 'CallExpression', | |
| 34 | 34 | 'FunctionExpression', | |
| 35 | 35 | 'ObjectExpression', | |
| 36 | - 'TemplateLiteral' | ||
| 37 | 36 | ]; | |
| 38 | 37 | ||
| 39 | 38 | const args = node.arguments; | |
0 commit comments