Skip to content
Browse files

repl: add a 'useColors' option to the repl

This should only be minimally used, since the `terminal` value will usually be
what you are expecting. This option is specifically for the case where `terminal`
is false, but you still want colors to be output (or vice-versa).
  • Loading branch information...
1 parent a33d1c9 commit 208b2307440f95946b232c6a23e2547b7dd94e89 @TooTallNate committed
Showing with 22 additions and 7 deletions.
  1. +4 −0 doc/api/repl.markdown
  2. +6 −3 lib/_debugger.js
  3. +6 −4 lib/repl.js
  4. +3 −0 src/node.js
  5. +3 −0 test/simple/test-repl-options.js
View
4 doc/api/repl.markdown
@@ -47,6 +47,10 @@ takes the following values:
- `eval` - function that will be used to eval each given line. Defaults to
an async wrapper for `eval()`. See below for an example of a custom `eval`.
+ - `useColors` - a boolean which specifies whether or not the `writer` function
+ should output colors. If a different `writer` function is set then this does
+ nothing. Defaults to the repl's `terminal` value.
+
- `useGlobal` - if set to `true`, then the repl will use the `global` object,
instead of running scripts in a separate context. Defaults to `false`.
View
9 lib/_debugger.js
@@ -690,14 +690,14 @@ var helpMessage = 'Commands: ' + commands.map(function(group) {
}).join(',\n');
-function SourceUnderline(sourceText, position, tty) {
+function SourceUnderline(sourceText, position, repl) {
if (!sourceText) return '';
var head = sourceText.slice(0, position),
tail = sourceText.slice(position);
// Colourize char if stdout supports colours
- if (tty && !repl.disableColors) {
+ if (repl.useColors) {
tail = tail.replace(/(.+?)([^\w]|$)/, '\033[32m$1\033[39m$2');
}
@@ -758,6 +758,9 @@ function Interface(stdin, stdout, args) {
if (parseInt(process.env['NODE_NO_READLINE'], 10)) {
opts.terminal = false;
}
+ if (parseInt(process.env['NODE_DISABLE_COLORS'], 10)) {
+ opts.useColors = false;
+ }
this.repl = repl.start(opts);
// Do not print useless warning
@@ -1134,7 +1137,7 @@ Interface.prototype.list = function(delta) {
if (current) {
line = SourceUnderline(lines[i],
client.currentSourceColumn,
- self.stdout.isTTY);
+ self.repl);
} else {
line = lines[i];
}
View
10 lib/repl.js
@@ -58,8 +58,6 @@ function hasOwnProperty(obj, prop) {
var context;
-exports.disableColors = process.env.NODE_DISABLE_COLORS ? true : false;
-
// hack for require.resolve("./relative") to work properly.
module.filename = path.resolve('repl');
@@ -163,8 +161,12 @@ function REPLServer(prompt, stream, eval, useGlobal, ignoreUndefined) {
// figure out which "writer" function to use
self.writer = options.writer || exports.writer;
- if (rli.terminal && !exports.disableColors &&
- self.writer === util.inspect) {
+ if (typeof options.useColors === 'undefined') {
+ options.useColors = rli.terminal;
+ }
+ self.useColors = !!options.useColors;
+
+ if (self.useColors && self.writer === util.inspect) {
// Turn on ANSI coloring.
self.writer = function(obj, showHidden, depth) {
return util.inspect(obj, showHidden, depth, true);
View
3 src/node.js
@@ -107,6 +107,9 @@
if (parseInt(process.env['NODE_NO_READLINE'], 10)) {
opts.terminal = false;
}
+ if (parseInt(process.env['NODE_DISABLE_COLORS'], 10)) {
+ opts.useColors = false;
+ }
var repl = Module.requireRepl().start(opts);
repl.on('exit', function() {
process.exit();
View
3 test/simple/test-repl-options.js
@@ -40,6 +40,7 @@ assert.equal(r1.rli.output, stream);
assert.equal(r1.rli.input, r1.inputStream);
assert.equal(r1.rli.output, r1.outputStream);
assert.equal(r1.rli.terminal, true);
+assert.equal(r1.useColors, r1.rli.terminal);
assert.equal(r1.useGlobal, false);
assert.equal(r1.ignoreUndefined, false);
@@ -50,6 +51,7 @@ var r2 = repl.start({
input: stream,
output: stream,
terminal: false,
+ useColors: true,
useGlobal: true,
ignoreUndefined: true,
eval: evaler,
@@ -60,6 +62,7 @@ assert.equal(r2.rli.output, stream);
assert.equal(r2.rli.input, r2.inputStream);
assert.equal(r2.rli.output, r2.outputStream);
assert.equal(r2.rli.terminal, false);
+assert.equal(r2.useColors, true);
assert.equal(r2.useGlobal, true);
assert.equal(r2.ignoreUndefined, true);
assert.equal(r2.eval, evaler);

0 comments on commit 208b230

Please sign in to comment.
Something went wrong with that request. Please try again.