This repository has been archived by the owner on Apr 22, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7.3k
REPL: Fix for multiline input when using custom eval function #25587
Closed
Closed
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -82,7 +82,7 @@ function REPLServer(prompt, stream, eval_, useGlobal, ignoreUndefined) { | |
return new REPLServer(prompt, stream, eval_, useGlobal, ignoreUndefined); | ||
} | ||
|
||
var options, input, output, dom; | ||
var options, input, output, dom, recoverableCheck; | ||
if (util.isObject(prompt)) { | ||
// an options object was given | ||
options = prompt; | ||
|
@@ -94,6 +94,7 @@ function REPLServer(prompt, stream, eval_, useGlobal, ignoreUndefined) { | |
ignoreUndefined = options.ignoreUndefined; | ||
prompt = options.prompt; | ||
dom = options.domain; | ||
recoverableCheck = options.recoverable || isRecoverableError; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This would be better as a ternary based on whether |
||
} else if (!util.isString(prompt)) { | ||
throw new Error('An options Object, or a prompt String are required'); | ||
} else { | ||
|
@@ -298,7 +299,7 @@ function REPLServer(prompt, stream, eval_, useGlobal, ignoreUndefined) { | |
|
||
// If error was SyntaxError and not JSON.parse error | ||
if (e) { | ||
if (e instanceof Recoverable) { | ||
if (recoverableCheck(e)) { | ||
// Start buffering data like that: | ||
// { | ||
// ... x: 1 | ||
|
@@ -952,9 +953,4 @@ function isRecoverableError(e) { | |
return e && | ||
e.name === 'SyntaxError' && | ||
/^(Unexpected end of input|Unexpected token)/.test(e.message); | ||
} | ||
|
||
function Recoverable(err) { | ||
this.err = err; | ||
} | ||
inherits(Recoverable, SyntaxError); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,6 +58,7 @@ assert.equal(r1.useColors, r1.rli.terminal); | |
// 2 | ||
function writer() {} | ||
function evaler() {} | ||
function recoverTester() {} | ||
var r2 = repl.start({ | ||
input: stream, | ||
output: stream, | ||
|
@@ -66,6 +67,7 @@ var r2 = repl.start({ | |
useGlobal: true, | ||
ignoreUndefined: true, | ||
eval: evaler, | ||
recoverable: recoverTester, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think this is really enough testing for a new feature. |
||
writer: writer | ||
}); | ||
assert.equal(r2.input, stream); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should read non-standard rather than none standard.