1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

repl: fix multi-line input

Browse Source 
The refactor in 3ae0b17c broke the multiline input's visual appearence.
While actually switching to this mode, the `...` prefix is not
displayed.

Additionally, account only SyntaxErrors that are happening at the parse
time, everything else should not be switching repl to the multiline
mode.

Signed-off-by: Fedor Indutny <fedor@indutny.com>
This commit is contained in:
Fedor Indutny 2014-06-06 23:00:55 -07:00
parent 7fa4a9697d
commit b5175003bc
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/repl.js
View File

@ -120,8 +120,11 @@ function REPLServer(prompt, stream, eval_, useGlobal, ignoreUndefined) {
displayErrors: false displayErrors: false
}); });
} catch (e) { } catch (e) {
err = e;
debug('parse error %j', code, e); debug('parse error %j', code, e);
if (isRecoverableError(e))
err = new Recoverable(e);
else
err = e;
} }
if (!err) { if (!err) {
@ -294,7 +297,7 @@ function REPLServer(prompt, stream, eval_, useGlobal, ignoreUndefined) {
// If error was SyntaxError and not JSON.parse error // If error was SyntaxError and not JSON.parse error
if (e) { if (e) {
if (isRecoverableError(e)) { if (e instanceof Recoverable) {
// Start buffering data like that: // Start buffering data like that:
// { // {
// ... x: 1 // ... x: 1
@ -386,15 +389,16 @@ REPLServer.prototype.resetContext = function() {
}; };
REPLServer.prototype.displayPrompt = function(preserveCursor) { REPLServer.prototype.displayPrompt = function(preserveCursor) {
var prompt = this._prompt; var initial = this._prompt;
var prompt = initial;
if (this.bufferedCommand.length) { if (this.bufferedCommand.length) {
prompt = '...'; prompt = '...';
var levelInd = new Array(this.lines.level.length).join('..'); var levelInd = new Array(this.lines.level.length).join('..');
prompt += levelInd + ' '; prompt += levelInd + ' ';
} else {
this.setPrompt(prompt);
} }
this.setPrompt(prompt);
this.prompt(preserveCursor); this.prompt(preserveCursor);
this.setPrompt(initial);
}; };
// A stream to push an array into a REPL // A stream to push an array into a REPL
@ -940,5 +944,10 @@ REPLServer.prototype.convertToContext = function(cmd) {
function isRecoverableError(e) { function isRecoverableError(e) {
return e && return e &&
e.name === 'SyntaxError' && e.name === 'SyntaxError' &&
/^Unexpected end of input/.test(e.message); /^(Unexpected end of input|Unexpected token :)/.test(e.message);
} }
function Recoverable(err) {
this.err = err;
}
inherits(Recoverable, SyntaxError);