Skip to content

[v9.x backport] This is backporting multiple commits that were requested #19244

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

[v9.x backport] This is backporting multiple commits that were requested #19244

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5fc201b
test: refactor assert test
BridgeAR Feb 6, 2018
9a063f9
test: remove assert.doesNotThrow()
BridgeAR Feb 9, 2018
9e9f331
test: minor refactoring
BridgeAR Feb 10, 2018
3b0db45
tools: add assert.doesNotThrow eslint rule
BridgeAR Feb 12, 2018
a60b423
tools: enable no-unsafe-finally
BridgeAR Feb 13, 2018
01e5624
doc: update buffer examples
BridgeAR Feb 12, 2018
433497e
tools: enable eslint no-undef-init rule
BridgeAR Feb 17, 2018
dcf01b5
tools: enable eslint strict key-spacing
BridgeAR Feb 17, 2018
6a262d1
tools: enable eslint one-var rule
BridgeAR Feb 17, 2018
c2a3b9b
doc: enable eslint prefer-template rule
BridgeAR Feb 17, 2018
cc63116
errors: implement new error handling
BridgeAR Feb 19, 2018
c491b28
errors: update all internal errors
BridgeAR Feb 19, 2018
d115284
console: port errors to new system
BridgeAR Feb 19, 2018
cabe547
errors: add comments about falsy error types
BridgeAR Feb 19, 2018
976823c
repl: upper case comments first char
BridgeAR Dec 30, 2017
6086e71
repl: refactor code for readability
BridgeAR Dec 30, 2017
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
Prev Previous commit
repl: refactor code for readability 
PR-URL: #17919
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Khaidi Chu <i@2333.moe>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Lance Ball <lball@redhat.com>
  • Loading branch information
@BridgeAR
BridgeAR committed Mar 21, 2018
commit 6086e718035d7806c70cb769f5a2c6ab0483641d
83 changes: 26 additions & 57 deletions lib/repl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,15 +320,10 @@ function REPLServer(prompt,
// Use stdin and stdout as the default streams if none were given
stream = process;
}
if (stream.stdin && stream.stdout) {
// We're given custom object with 2 streams, or the `process` object
input = stream.stdin;
output = stream.stdout;
} else {
// We're given a duplex readable/writable Stream, like a `net.Socket`
input = stream;
output = stream;
}
// We're given a duplex readable/writable Stream, like a `net.Socket`
// or a custom object with 2 streams, or the `process` object
input = stream.stdin || stream;
output = stream.stdout || stream;
}

self.inputStream = input;
Expand Down Expand Up @@ -663,7 +658,7 @@ REPLServer.prototype.createContext = function() {
Object.defineProperty(context, 'console', {
configurable: true,
enumerable: true,
get: () => _console
value: _console
});

var names = Object.getOwnPropertyNames(global);
Expand Down Expand Up @@ -1035,19 +1030,16 @@ function complete(line, callback) {
break;
}
}
} catch (e) {
// console.log("completion error walking prototype chain:" + e);
}
} catch (e) {}
}

if (memberGroups.length) {
for (i = 0; i < memberGroups.length; i++) {
completionGroups.push(memberGroups[i].map(function(member) {
return expr + '.' + member;
}));
completionGroups.push(
memberGroups[i].map((member) => `${expr}.${member}`));
}
if (filter) {
filter = expr + '.' + filter;
filter = `${expr}.${filter}`;
}
}

Expand All @@ -1068,9 +1060,8 @@ function complete(line, callback) {
if (completionGroups.length && filter) {
var newCompletionGroups = [];
for (i = 0; i < completionGroups.length; i++) {
group = completionGroups[i].filter(function(elem) {
return elem.indexOf(filter) === 0;
});
group = completionGroups[i]
.filter((elem) => elem.indexOf(filter) === 0);
if (group.length) {
newCompletionGroups.push(group);
}
Expand Down Expand Up @@ -1400,55 +1391,33 @@ function isCodeRecoverable(code) {

if (previous === '\\' && (stringLiteral || isRegExpLiteral)) {
current = null;
continue;
}

if (stringLiteral) {
} else if (stringLiteral) {
if (stringLiteral === current) {
stringLiteral = null;
}
continue;
} else {
if (isRegExpLiteral && current === '/') {
isRegExpLiteral = false;
continue;
}

if (isBlockComment && previous === '*' && current === '/') {
isBlockComment = false;
continue;
}

if (isSingleComment && current === '\n') {
isSingleComment = false;
continue;
}

if (isBlockComment || isRegExpLiteral || isSingleComment) continue;

} else if (isRegExpLiteral && current === '/') {
isRegExpLiteral = false;
} else if (isBlockComment && previous === '*' && current === '/') {
isBlockComment = false;
} else if (isSingleComment && current === '\n') {
isSingleComment = false;
} else if (!isBlockComment && !isRegExpLiteral && !isSingleComment) {
if (current === '/' && previous === '/') {
isSingleComment = true;
continue;
}

if (previous === '/') {
} else if (previous === '/') {
if (current === '*') {
isBlockComment = true;
} else if (
// Distinguish between a division operator and the start of a regex
// by examining the non-whitespace character that precedes the /
[null, '(', '[', '{', '}', ';'].includes(prevTokenChar)
) {
} else if ([null, '(', '[', '{', '}', ';'].includes(prevTokenChar)) {
isRegExpLiteral = true;
}
continue;
} else {
if (current.trim()) prevTokenChar = current;
if (current === '\'' || current === '"') {
stringLiteral = current;
}
}

if (current.trim()) prevTokenChar = current;
}

if (current === '\'' || current === '"') {
stringLiteral = current;
}
}

Expand Down