Skip to content

repl: skip EmptyStatements and return result with TLA #40194

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
wants to merge 3 commits into from
Closed

repl: skip EmptyStatements and return result with TLA #40194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2560b98
repl: skip EmptyStatements and return result with TLA
Mesteery Sep 23, 2021
ea886a3
Update await.js
Mesteery Sep 23, 2021
8908c30
Update test-repl-preprocess-top-level-await.js
Mesteery Sep 24, 2021
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
36 changes: 20 additions & 16 deletions lib/internal/repl/await.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,22 +221,26 @@ function processTopLevelAwait(src) {
return null;
}

const last = body.body[body.body.length - 1];
if (last.type === 'ExpressionStatement') {
// For an expression statement of the form
// ( expr ) ;
// ^^^^^^^^^^ // last
// ^^^^ // last.expression
//
// We do not want the left parenthesis before the `return` keyword;
// therefore we prepend the `return (` to `last`.
//
// On the other hand, we do not want the right parenthesis after the
// semicolon. Since there can only be more right parentheses between
// last.expression.end and the semicolon, appending one more to
// last.expression should be fine.
state.prepend(last, 'return (');
state.append(last.expression, ')');
for (let i = body.body.length - 1; i >= 0; i--) {
const node = body.body[i];
if (node.type === 'EmptyStatement') continue;
if (node.type === 'ExpressionStatement') {
// For an expression statement of the form
// ( expr ) ;
// ^^^^^^^^^^ // node
// ^^^^ // node.expression
//
// We do not want the left parenthesis before the `return` keyword;
// therefore we prepend the `return (` to `node`.
//
// On the other hand, we do not want the right parenthesis after the
// semicolon. Since there can only be more right parentheses between
// node.expression.end and the semicolon, appending one more to
// node.expression should be fine.
state.prepend(node, 'return (');
state.append(node.expression, ')');
}
break;
}

return (
Expand Down
2 changes: 2 additions & 0 deletions test/parallel/test-repl-preprocess-top-level-await.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ const testCases = [
`(async () => { return (await ${surrogate}) })()` ],
[ 'await 0;',
'(async () => { return (await 0); })()' ],
[ 'await 0;;;',
'(async () => { return (await 0);;; })()' ],
[ `await ${surrogate};`,
`(async () => { return (await ${surrogate}); })()` ],
[ `await ${surrogate};`,
Expand Down