Skip to content

async_hooks: replace string concatenation with template literals #15968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
radelmann wants to merge 1 commit into from
Closed

async_hooks: replace string concatenation with template literals #15968

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions test/async-hooks/init-hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,49 +65,52 @@ class ActivityCollector {
}

const violations = [];
let tempActivityString;
Copy link
Contributor

@charmander charmander Oct 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason this is scoped outside the loop?


function v(msg) { violations.push(msg); }
for (const a of this._activities.values()) {
tempActivityString = activityString(a);
if (types != null && !types.includes(a.type)) continue;

if (a.init && a.init.length > 1) {
v('Activity inited twice\n' + activityString(a) +
v(`Activity inited twice\n${tempActivityString}` +
'\nExpected "init" to be called at most once');
}
if (a.destroy && a.destroy.length > 1) {
v('Activity destroyed twice\n' + activityString(a) +
v(`Activity destroyed twice\n${tempActivityString}` +
'\nExpected "destroy" to be called at most once');
}
if (a.before && a.after) {
if (a.before.length < a.after.length) {
v('Activity called "after" without calling "before"\n' +
activityString(a) +
`${tempActivityString}` +
Copy link
Contributor

@charmander charmander Oct 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Equivalent to tempActivityString?

'\nExpected no "after" call without a "before"');
}
if (a.before.some((x, idx) => x > a.after[idx])) {
v('Activity had an instance where "after" ' +
'was invoked before "before"\n' +
activityString(a) +
`${tempActivityString}` +
'\nExpected "after" to be called after "before"');
}
}
if (a.before && a.destroy) {
if (a.before.some((x, idx) => x > a.destroy[idx])) {
v('Activity had an instance where "destroy" ' +
'was invoked before "before"\n' +
activityString(a) +
`${tempActivityString}` +
'\nExpected "destroy" to be called after "before"');
}
}
if (a.after && a.destroy) {
if (a.after.some((x, idx) => x > a.destroy[idx])) {
v('Activity had an instance where "destroy" ' +
'was invoked before "after"\n' +
activityString(a) +
`${tempActivityString}` +
'\nExpected "destroy" to be called after "after"');
}
}
if (!a.handleIsObject) {
v('No resource object\n' + activityString(a) +
v(`No resource object\n${tempActivityString}` +
'\nExpected "init" to be called with a resource object');
}
}
Expand All @@ -125,7 +128,7 @@ class ActivityCollector {
Array.from(this._activities.values()) :
this.activitiesOfTypes(types);

if (stage != null) console.log('\n%s', stage);
if (stage != null) console.log(`\n${stage}`);
console.log(util.inspect(activities, false, depth, true));
}

Expand Down Expand Up @@ -206,7 +209,7 @@ class ActivityCollector {
_maybeLog(uid, type, name) {
if (this._logid &&
(type == null || this._logtype == null || this._logtype === type)) {
print(this._logid + '.' + name + '.uid-' + uid);
print(`${this._logid}.${name}.uid-${uid}`);
}
}
}
Expand Down