Skip to content

Commit

Permalink
tools,lib,test: enable ESLint no-regex-spaces rule
Browse files Browse the repository at this point in the history
PR-URL: #41463
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
  • Loading branch information
Trott authored and danielleadams committed Feb 1, 2022
1 parent 12ea18d commit 5d70195
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 22 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ module.exports = {
'no-path-concat': 'error',
'no-proto': 'error',
'no-redeclare': ['error', { 'builtinGlobals': false }],
'no-regex-spaces': 'error',
'no-restricted-modules': ['error', 'sys'],
/* eslint-disable max-len */
'no-restricted-properties': [
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/util/inspect.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const strEscapeSequencesReplacerSingle = /[\x00-\x1f\x5c\x7f-\x9f]|[\ud800-\udbf
const keyStrRegExp = /^[a-zA-Z_][a-zA-Z_0-9]*$/;
const numberRegExp = /^(0|[1-9][0-9]*)$/;

const coreModuleRegExp = /^ at (?:[^/\\(]+ \(|)node:(.+):\d+:\d+\)?$/;
const coreModuleRegExp = /^ {4}at (?:[^/\\(]+ \(|)node:(.+):\d+:\d+\)?$/;
const nodeModulesRegExp = /[/\\]node_modules[/\\](.+?)(?=[/\\])/g;

const classRegExp = /^(\s+[^(]*?)\s*{/;
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-assert-deep.js
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ assert.throws(
{
code: 'ERR_ASSERTION',
name: 'AssertionError',
message: /a: \[Getter: 5]\n- a: \[Getter: 6]\n /
message: /a: \[Getter: 5]\n- {3}a: \[Getter: 6]\n {2}/
}
);

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ assert.throws(
assert.deepStrictEqual(Array(100).fill(1), 'foobar');
} catch (err) {
threw = true;
assert.match(inspect(err), /actual: \[Array],\n expected: 'foobar',/);
assert.match(inspect(err), /actual: \[Array],\n {2}expected: 'foobar',/);
}
assert(threw);
}
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-debugger-address.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function launchTarget(...args) {
.then(() => {
assert.match(
cli.output,
/> 3 \+\+x;/,
/> 3 {3}\+\+x;/,
'marks the 3rd line');
})
.then(() => cleanup())
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-events-uncaught-exception-stack.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ process.on('uncaughtException', common.mustCall((err) => {
const lines = err.stack.split('\n');
assert.strictEqual(lines[0], 'Error');
lines.slice(1).forEach((line) => {
assert.match(line, /^ at/);
assert.match(line, /^ {4}at/);
});
}));

Expand Down
6 changes: 3 additions & 3 deletions test/parallel/test-http2-stream-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ server.on('stream', common.mustCall((stream) => {
assert.strictEqual(stream.aborted, false);
const insp = util.inspect(stream);
assert.match(insp, /Http2Stream {/);
assert.match(insp, / state:/);
assert.match(insp, / readableState:/);
assert.match(insp, / writableState:/);
assert.match(insp, / {2}state:/);
assert.match(insp, / {2}readableState:/);
assert.match(insp, / {2}writableState:/);
stream.end('ok');
}));
server.listen(0, common.mustCall(() => {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-repl-definecommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ r.defineCommand('say2', function() {
});

inputStream.write('.help\n');
assert.match(output, /\n\.say1 help for say1\n/);
assert.match(output, /\n\.say1 {5}help for say1\n/);
assert.match(output, /\n\.say2\n/);
inputStream.write('.say1 node developer\n');
assert.ok(output.startsWith('hello node developer\n'),
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-repl-underscore.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function testError() {
// The sync error, with individual property echoes
/^Uncaught Error: ENOENT: no such file or directory, scandir '.*nonexistent\?'/,
/Object\.readdirSync/,
/^ errno: -(2|4058),$/,
/^ {2}errno: -(2|4058),$/,
" syscall: 'scandir',",
" code: 'ENOENT',",
" path: '/nonexistent?'",
Expand Down
20 changes: 10 additions & 10 deletions test/parallel/test-repl.js
Original file line number Diff line number Diff line change
Expand Up @@ -566,10 +566,10 @@ const errorTests = [
/^Uncaught Error: Cannot find module 'internal\/repl'/,
/^Require stack:/,
/^- <repl>/,
/^ at .*/,
/^ at .*/,
/^ at .*/,
/^ at .*/,
/^ {4}at .*/,
/^ {4}at .*/,
/^ {4}at .*/,
/^ {4}at .*/,
" code: 'MODULE_NOT_FOUND',",
" requireStack: [ '<repl>' ]",
'}',
Expand Down Expand Up @@ -771,12 +771,12 @@ const errorTests = [
' group: [Function: group],',
' groupEnd: [Function: groupEnd],',
' table: [Function: table],',
/ debug: \[Function: (debug|log)],/,
/ info: \[Function: (info|log)],/,
/ dirxml: \[Function: (dirxml|log)],/,
/ error: \[Function: (error|warn)],/,
/ groupCollapsed: \[Function: (groupCollapsed|group)],/,
/ Console: \[Function: Console],?/,
/ {2}debug: \[Function: (debug|log)],/,
/ {2}info: \[Function: (info|log)],/,
/ {2}dirxml: \[Function: (dirxml|log)],/,
/ {2}error: \[Function: (error|warn)],/,
/ {2}groupCollapsed: \[Function: (groupCollapsed|group)],/,
/ {2}Console: \[Function: Console],?/,
...process.features.inspector ? [
' profile: [Function: profile],',
' profileEnd: [Function: profileEnd],',
Expand Down
2 changes: 1 addition & 1 deletion test/sequential/test-debugger-pid.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function launchTarget(...args) {
.then(() => {
assert.match(
cli.output,
/> 3 \+\+x;/,
/> 3 {3}\+\+x;/,
'marks the 3rd line');
})
.then(() => cleanup())
Expand Down
2 changes: 1 addition & 1 deletion test/tick-processor/test-tick-processor-unknown.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const base = require('./tick-processor-base.js');
// Unknown checked for to prevent flakiness, if pattern is not found,
// then a large number of unknown ticks should be present
base.runTest({
pattern: /LazyCompile.*\[eval]:1|.*% UNKNOWN/,
pattern: /LazyCompile.*\[eval]:1|.*% {2}UNKNOWN/,
code: `function f() {
for (let i = 0; i < 1000000; i++) {
i++;
Expand Down

0 comments on commit 5d70195

Please sign in to comment.