Skip to content
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

fix(cli/repl): interpret object literals as expressions #7591

Merged
merged 8 commits into from
Sep 21, 2020
Merged

fix(cli/repl): interpret object literals as expressions #7591

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0a34603
fix(cli/repl): interpret object literals as expressions
caspervonb Sep 20, 2020
1fc75d3
Expand a lil bit on the note
caspervonb Sep 20, 2020
fce0785
Remove trim
caspervonb Sep 20, 2020
7f0c9f4
Retry without preprocessing on compile error
caspervonb Sep 21, 2020
913d9e1
Interpret as block if ends with ;
caspervonb Sep 21, 2020
27b81a2
Only retry if the code actually changed
caspervonb Sep 21, 2020
20bf66e
More tests
caspervonb Sep 21, 2020
e28d224
Format
caspervonb Sep 21, 2020
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
7 changes: 7 additions & 0 deletions cli/rt/40_repl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
// Returns true if code is consumed (no error/irrecoverable error).
// Returns false if error is recoverable
function evaluate(code) {
// It is a bit unexpected that { "foo": "bar" } is interpreted as a block
// statement rather than an object literal so we interpret it as an expression statement
// to match the behavior found in a typical prompt including browser developer tools.
if (code.startsWith("{") && code.endsWith("}")) {
code = `(${code.trim()})`;
}
caspervonb marked this conversation as resolved.
Show resolved Hide resolved

// each evalContext is a separate function body, and we want strict mode to
// work, so we should ensure that the code starts with "use strict"
const [result, errInfo] = core.evalContext(`"use strict";\n\n${code}`);
Expand Down
13 changes: 13 additions & 0 deletions cli/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,19 @@ fn repl_test_console_log() {
assert!(err.is_empty());
}

#[test]
fn repl_test_object_literal() {
let (out, err) = util::run_and_collect_output(
true,
"repl",
Some(vec!["{ foo: 'bar' }"]),
Some(vec![("NO_COLOR".to_owned(), "1".to_owned())]),
false,
);
assert!(out.ends_with("{ foo: \"bar\" }\n"));
assert!(err.is_empty());
}

#[test]
fn repl_cwd() {
let (_out, err) = util::run_and_collect_output(
Expand Down